Skip to content

Commit 342a890

Browse files
committed
Switch to new GBL API in ITS3 alignment
1 parent 946c509 commit 342a890

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

‎Detectors/Upgrades/ITS3/alignment/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ o2_add_library(ITS3Align
3131
O2::DataFormatsGlobalTracking
3232
O2::DetectorsVertexing
3333
nlohmann_json::nlohmann_json
34-
GBL::GBL)
34+
GBL::GBL
35+
Mille::Mille2)
3536
if (OpenMP_CXX_FOUND)
3637
target_compile_definitions(${targetName} PRIVATE WITH_OPENMP)
3738
target_link_libraries(${targetName} PRIVATE OpenMP::OpenMP_CXX)

‎Detectors/Upgrades/ITS3/alignment/src/AlignmentSpec.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <GblData.h>
2424
#include <GblPoint.h>
2525
#include <GblMeasurement.h>
26-
#include <MilleBinary.h>
26+
#include <Mille/MilleFactory.h>
2727
#include <nlohmann/json.hpp>
2828

2929
#include "Framework/ConfigParamRegistry.h"
@@ -466,7 +466,7 @@ void AlignmentSpec::process()
466466
LOGP(info, "\t\tGBL LostWeight = {}", lostWeightSum);
467467
LOGP(info, "Streaming results to output");
468468
if (mOutOpt[OutputOpt::MilleData]) {
469-
gbl::MilleBinary mille(mParams->milleBinFile, true);
469+
auto mille = Mille::spawnMilleRecord(mParams->milleBinFile, true);
470470
for (auto& slot : gblTrajSlots) {
471471
for (auto& traj : slot) {
472472
traj.milleOut(mille);

‎dependencies/O2Dependencies.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,10 @@ if(NOT TARGET Eigen3::Eigen)
285285
)
286286
endif()
287287

288+
find_package(Mille CONFIG REQUIRED)
289+
if(NOT TARGET Mille::Mille2)
290+
add_library(Mille::Mille2 ALIAS Mille2)
291+
endif()
288292
find_package(GBL)
289293
set_package_properties(GBL PROPERTIES TYPE REQUIRED)
290294
if(GBL_FOUND AND NOT TARGET GBL::GBL)

0 commit comments

Comments
 (0)