Skip to content

[WIP] Switch to new GBL API in ITS3 alignment #16021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shahor02 wants to merge 1 commit into
base: dev
Choose a base branch
from
+8 −3
Open

[WIP] Switch to new GBL API in ITS3 alignment #16021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Detectors/Upgrades/ITS3/alignment/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ o2_add_library(ITS3Align
O2::DataFormatsGlobalTracking
O2::DetectorsVertexing
nlohmann_json::nlohmann_json
GBL::GBL)
GBL::GBL
Mille::Mille2)
if (OpenMP_CXX_FOUND)
target_compile_definitions(${targetName} PRIVATE WITH_OPENMP)
target_link_libraries(${targetName} PRIVATE OpenMP::OpenMP_CXX)
Expand Down
4 changes: 2 additions & 2 deletions Detectors/Upgrades/ITS3/alignment/src/AlignmentSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <GblData.h>
#include <GblPoint.h>
#include <GblMeasurement.h>
#include <MilleBinary.h>
#include <Mille/MilleFactory.h>
#include <nlohmann/json.hpp>

#include "Framework/ConfigParamRegistry.h"
Expand Down Expand Up @@ -466,7 +466,7 @@ void AlignmentSpec::process()
LOGP(info, "\t\tGBL LostWeight = {}", lostWeightSum);
LOGP(info, "Streaming results to output");
if (mOutOpt[OutputOpt::MilleData]) {
gbl::MilleBinary mille(mParams->milleBinFile, true);
auto mille = Mille::spawnMilleRecord(mParams->milleBinFile, true);
for (auto& slot : gblTrajSlots) {
for (auto& traj : slot) {
traj.milleOut(mille);
Expand Down
4 changes: 4 additions & 0 deletions dependencies/O2Dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,10 @@ if(NOT TARGET Eigen3::Eigen)
)
endif()

find_package(Mille CONFIG REQUIRED)
if(NOT TARGET Mille::Mille2)
add_library(Mille::Mille2 ALIAS Mille2)
endif()
find_package(GBL)
set_package_properties(GBL PROPERTIES TYPE REQUIRED)
if(GBL_FOUND AND NOT TARGET GBL::GBL)
Expand Down
Loading