ALICE3: make the PV finder run

Author: mpuccio

Detectors/Upgrades/ALICE3/GlobalReconstruction/workflow/CMakeLists.txt

@@ -13,12 +13,14 @@ o2_add_library(ALICE3GlobalReconstructionWorkflow
                TARGETVARNAME targetName
                SOURCES src/TrackerSpec.cxx
                        src/TrackWriterSpec.cxx
+                       src/MagneticFieldHelper.cxx
                        src/PrimaryVertexingSpec.cxx
                        src/PrimaryVertexWriterSpec.cxx
                        src/RecoWorkflow.cxx
                PUBLIC_LINK_LIBRARIES O2::Framework
                                      O2::CommonConstants
                                      O2::CommonDataFormat
+                                     O2::Field
                                      O2::GPUWorkflow
                                      O2::SimConfig
                                      O2::DataFormatsITSMFT

Detectors/Upgrades/ALICE3/GlobalReconstruction/workflow/include/ALICE3GlobalReconstructionWorkflow/PrimaryVertexingSpec.h

@@ -17,7 +17,7 @@
 namespace o2::trk
 {
 
-framework::DataProcessorSpec getPrimaryVertexingSpec(bool useMC, bool skip);
+framework::DataProcessorSpec getPrimaryVertexingSpec(bool useMC, bool skip, float bz);
 
 } // namespace o2::trk
 

Detectors/Upgrades/ALICE3/GlobalReconstruction/workflow/src/PrimaryVertexingSpec.cxx

@@ -13,11 +13,13 @@
 
 #include "ALICE3GlobalReconstructionWorkflow/PrimaryVertexingSpec.h"
 
+#include "ALICE3GlobalReconstructionWorkflow/MagneticFieldHelper.h"
 #include "CommonConstants/LHCConstants.h"
 #include "CommonDataFormat/BunchFilling.h"
 #include "CommonUtils/ConfigurableParam.h"
 #include "CommonUtils/NameConf.h"
 #include "DataFormatsITS/TrackITS.h"
+#include "DetectorsBase/Propagator.h"
 #include "DetectorsVertexing/PVertexer.h"
 #include "DetectorsVertexing/PVertexerHelpers.h"
 #include "Framework/ConfigParamRegistry.h"
@@ -48,22 +50,24 @@ using VtxTrackIndex = o2::dataformats::VtxTrackIndex;
 class PrimaryVertexingSpec final : public Task
 {
  public:
-  PrimaryVertexingSpec(bool useMC, bool skip) : mUseMC(useMC), mSkip(skip) {}
+  PrimaryVertexingSpec(bool useMC, bool skip, float bz) : mUseMC(useMC), mSkip(skip), mBz(bz) {}
 
   void init(InitContext& ic) final
   {
     mTimer.Stop();
     mTimer.Reset();
     mVertexer.setPoolDumpDirectory(ic.options().get<std::string>("pool-dumps-directory"));
     mVertexer.setTrackSources(GTrackID::getSourceMask(GTrackID::ITS));
+    mVertexer.setMatCorrType(o2::base::Propagator::MatCorrType::USEMatCorrNONE);
     mVertexer.setITSROFrameLength(ic.options().get<float>("alice3-pv-rof-length-bc") * o2::constants::lhc::LHCBunchSpacingMUS);
+    ensureAlice3Field(mBz);
     o2::BunchFilling bunchFilling;
     for (int bc = 0; bc < o2::constants::lhc::LHCMaxBunches; ++bc) {
       bunchFilling.setBC(bc);
     }
     mVertexer.setBunchFilling(bunchFilling);
     mVertexer.init();
-    mVertexer.setBz(ic.options().get<float>("alice3-pv-bz"));
+    mVertexer.setBz(mBz);
   }
 
   void run(ProcessingContext& pc) final
@@ -150,13 +154,14 @@ class PrimaryVertexingSpec final : public Task
  private:
   bool mUseMC{false};
   bool mSkip{false};
+  float mBz{5.f};
   o2::vertexing::PVertexer mVertexer;
   TStopwatch mTimer;
 };
 
 } // namespace
 
-DataProcessorSpec getPrimaryVertexingSpec(bool useMC, bool skip)
+DataProcessorSpec getPrimaryVertexingSpec(bool useMC, bool skip, float bz)
 {
   std::vector<InputSpec> inputs;
   inputs.emplace_back("tracks", "TRK", "TRACKS", 0, Lifetime::Timeframe);
@@ -176,9 +181,8 @@ DataProcessorSpec getPrimaryVertexingSpec(bool useMC, bool skip)
     "alice3-primary-vertexing",
     inputs,
     outputs,
-    AlgorithmSpec{adaptFromTask<PrimaryVertexingSpec>(useMC, skip)},
+    AlgorithmSpec{adaptFromTask<PrimaryVertexingSpec>(useMC, skip, bz)},
     Options{{"pool-dumps-directory", VariantType::String, "", {"Destination directory for the tracks pool dumps"}},
-            {"alice3-pv-bz", VariantType::Float, 5.f, {"Nominal ALICE3 Bz field in kG for primary vertex refits"}},
             {"alice3-pv-rof-length-bc", VariantType::Float, 1.f, {"Effective TRK readout length in BC used by pvertexer time clustering"}}}};
 }
 

Detectors/Upgrades/ALICE3/GlobalReconstruction/workflow/src/RecoWorkflow.cxx

@@ -16,9 +16,23 @@
 #include "ALICE3GlobalReconstructionWorkflow/PrimaryVertexWriterSpec.h"
 #include "Framework/Logger.h"
 
+#include <fstream>
+#include <nlohmann/json.hpp>
+
 namespace o2::trk::global_reco_workflow
 {
 
+namespace
+{
+float getBzFromConfig(const std::string& hitRecoConfig, const std::string& clusterRecoConfig)
+{
+  const auto& configPath = !hitRecoConfig.empty() ? hitRecoConfig : clusterRecoConfig;
+  std::ifstream configFile(configPath);
+  const auto config = nlohmann::json::parse(configFile);
+  return config["geometry"]["bz"].get<float>();
+}
+} // namespace
+
 framework::WorkflowSpec getWorkflow(bool useMC,
                                     const std::string& hitRecoConfig,
                                     const std::string& clusterRecoConfig,
@@ -34,7 +48,7 @@ framework::WorkflowSpec getWorkflow(bool useMC,
     LOG_IF(info, !clusterRecoConfig.empty()) << "Using cluster reco config from file " << clusterRecoConfig;
     specs.emplace_back(o2::trk::getTrackerSpec(useMC, hitRecoConfig, clusterRecoConfig, dtype));
     if (enablePrimaryVertexing) {
-      specs.emplace_back(o2::trk::getPrimaryVertexingSpec(useMC, skipPrimaryVertexing));
+      specs.emplace_back(o2::trk::getPrimaryVertexingSpec(useMC, skipPrimaryVertexing, getBzFromConfig(hitRecoConfig, clusterRecoConfig)));
     }
     if (!disableRootOutput) {
       specs.emplace_back(o2::trk::getTrackWriterSpec(useMC));

Detectors/Upgrades/ALICE3/GlobalReconstruction/workflow/src/TrackerSpec.cxx

@@ -16,13 +16,12 @@
 #include <format>
 #include <fstream>
 
+#include "ALICE3GlobalReconstructionWorkflow/MagneticFieldHelper.h"
 #include "DataFormatsTRK/Cluster.h"
 #include "DataFormatsTRK/ROFRecord.h"
 #include "DetectorsBase/GeometryManager.h"
 #include "ITStracking/TimeFrame.h"
 #include "ITStracking/Configuration.h"
-#include "Field/MagneticField.h"
-#include "Field/MagFieldParam.h"
 #include "Framework/ControlService.h"
 #include "Framework/ConfigParamRegistry.h"
 #include "Framework/CCDBParamSpec.h"
@@ -40,7 +39,6 @@
 #include "ITStrackingGPU/TrackerTraitsGPU.h"
 #endif
 #include "ALICE3GlobalReconstructionWorkflow/TrackerSpec.h"
-#include <TGeoGlobalMagField.h>
 
 #ifdef O2_WITH_ACTS
 #include "ALICE3GlobalReconstruction/TrackerACTS.h"
@@ -298,9 +296,7 @@ void TrackerDPL::run(ProcessingContext& pc)
       LOGP(info, "Starting {} reconstruction from hits for {} events", trackerTraits.getName(), nEvents);
 
       trackerTraits.setBz(mHitRecoConfig["geometry"]["bz"].get<float>());
-      auto field = new field::MagneticField("ALICE3Mag", "ALICE 3 Magnetic Field", mHitRecoConfig["geometry"]["bz"].get<float>() / 5.f, 0.0, o2::field::MagFieldParam::k5kGUniform);
-      TGeoGlobalMagField::Instance()->SetField(field);
-      TGeoGlobalMagField::Instance()->Lock();
+      ensureAlice3Field(mHitRecoConfig["geometry"]["bz"].get<float>());
 
       nRofs = timeFrame.loadROFsFromHitTree(hitsTree, gman, mHitRecoConfig);
       const int inROFpileup{mHitRecoConfig.contains("inROFpileup") ? mHitRecoConfig["inROFpileup"].get<int>() : 1};
@@ -312,9 +308,7 @@ void TrackerDPL::run(ProcessingContext& pc)
       o2::trk::GeometryTGeo::Instance();
 
       trackerTraits.setBz(mClusterRecoConfig["geometry"]["bz"].get<float>());
-      auto field = new field::MagneticField("ALICE3Mag", "ALICE 3 Magnetic Field", mClusterRecoConfig["geometry"]["bz"].get<float>() / 5.f, 0.0, o2::field::MagFieldParam::k5kGUniform);
-      TGeoGlobalMagField::Instance()->SetField(field);
-      TGeoGlobalMagField::Instance()->Lock();
+      ensureAlice3Field(mClusterRecoConfig["geometry"]["bz"].get<float>());
 
       constexpr int nLayers{11};
       std::array<gsl::span<const o2::trk::Cluster>, nLayers> layerClusters;