Merge branch 'AliceO2Group:master' into master

Author: cnkoster

Common/Tools/PID/pidTPCModule.h

@@ -127,6 +127,7 @@ struct pidTPCConfigurables : o2::framework::ConfigurableGroup {
   o2::framework::Configurable<int> useNetworkHe{"useNetworkHe", 1, {"Switch for applying neural network on the helium3 mass hypothesis (if network enabled) (set to 0 to disable)"}};
   o2::framework::Configurable<int> useNetworkAl{"useNetworkAl", 1, {"Switch for applying neural network on the alpha mass hypothesis (if network enabled) (set to 0 to disable)"}};
   o2::framework::Configurable<float> networkBetaGammaCutoff{"networkBetaGammaCutoff", 0.45, {"Lower value of beta-gamma to override the NN application"}};
+  o2::framework::Configurable<std::string> irSource{"irSource", "ZNC hadronic", "Estimator of the interaction rate (Recommended: pp --> T0VTX, Pb-Pb --> ZNC hadronic)"};
 };
 
 // helper getter - FIXME should be separate
@@ -432,6 +433,8 @@ class pidTPCModule
     // Filling a std::vector<float> to be evaluated by the network
     // Evaluation on single tracks brings huge overhead: Thus evaluation is done on one large vector
     for (int i = 0; i < 9; i++) { // Loop over particle number for which network correction is used
+      float hadronicRate = 0.;
+      uint64_t timeStamp_bcOld = 0;
       for (auto const& trk : tracks) {
         if (!trk.hasTPC()) {
           continue;
@@ -450,6 +453,19 @@ class pidTPCModule
         if (input_dimensions == 7 && networkVersion == "2") {
           track_properties[counter_track_props + 6] = trk.has_collision() ? collisions.iteratorAt(trk.collisionId()).ft0cOccupancyInTimeRange() / 60000. : 1.;
         }
+        if (input_dimensions == 8 && networkVersion == "3") {
+          track_properties[counter_track_props + 6] = trk.has_collision() ? collisions.iteratorAt(trk.collisionId()).ft0cOccupancyInTimeRange() / 60000. : 1.;
+          if (trk.has_collision()) {
+            auto trk_bc = (collisions.iteratorAt(trk.collisionId())).template bc_as<B>();
+            if (trk_bc.timestamp() != timeStamp_bcOld) {
+              hadronicRate = mRateFetcher.fetch(ccdb.service, trk_bc.timestamp(), trk_bc.runNumber(), pidTPCopts.irSource.value) * 1.e-3;
+            }
+            timeStamp_bcOld = trk_bc.timestamp();
+            track_properties[counter_track_props + 7] = hadronicRate / 50.;
+          } else {
+            track_properties[counter_track_props + 7] = 1;
+          }
+        }
         counter_track_props += input_dimensions;
       }
 

DPG/Tasks/AOTTrack/CMakeLists.txt

@@ -80,6 +80,11 @@ o2physics_add_dpl_workflow(qa-tracksplitting
     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
     COMPONENT_NAME Analysis)
 
+o2physics_add_dpl_workflow(unit-test-for-reconstruction
+    SOURCES unitTestForReconstruction.cxx
+    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+    COMPONENT_NAME Analysis)
+
 o2physics_add_dpl_workflow(tag-and-probe-dmesons
     SOURCES tagAndProbeDmesons.cxx
     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DetectorsVertexing O2Physics::MLCore

DPG/Tasks/AOTTrack/unitTestForReconstruction.cxx

@@ -0,0 +1,102 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+///
+/// \file unitTestForReconstruction.cxx
+///
+/// \brief Unit test for validating the reconstruction software
+/// \author Alberto Caliva (alberto.caliva@cern.ch), Catalin-Lucian Ristea (catalin.ristea@cern.ch)
+/// \since September 9, 2025
+
+#include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataTypes.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/Logger.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/DCA.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include <cmath>
+#include <memory>
+#include <random>
+#include <string>
+#include <unordered_set>
+#include <vector>
+
+using namespace o2::soa;
+using namespace o2::aod;
+using namespace o2::framework;
+using namespace o2::framework::expressions;
+using namespace o2::constants::physics;
+using namespace o2::constants::math;
+
+struct UnitTestForReconstruction {
+
+  // Histogram registry
+  HistogramRegistry registryData{"registryData", {}, OutputObjHandlingPolicy::AnalysisObject, true, true};
+
+  // global IDs of events to be inspected
+  Configurable<std::vector<int>> eventNr{"eventNr", {1, 5, 12, 44, 76, 99, 102, 115, 180, 220}, "eventNr"};
+  std::unordered_set<int> eventSet;
+
+  void init(InitContext const&)
+  {
+    // Define histogram to monitor event counts at different selection stages
+    registryData.add("eventCounter", "eventCounter", HistType::kTH1F, {{10, 0, 10, ""}});
+
+    // Define histogram for the transverse momentum spectrum of reconstructed charged tracks
+    registryData.add("ptChargedTracks", "ptChargedTracks", HistType::kTH2F, {{11, 0, 11, "event"}, {1000, 0, 10, "#it{p}_{T} (GeV/#it{c})"}});
+
+    // Fast lookup set from configurable event list
+    eventSet = std::unordered_set<int>(eventNr->begin(), eventNr->end());
+  }
+
+  // Process Data
+  void processData(o2::aod::Collisions const& collisions, o2::aod::Tracks const& tracks)
+  {
+    // Event index
+    int eventIndex = 0;
+    static constexpr int indexAllEvts = 0;
+
+    // Loop over reconstructed events
+    for (const auto& collision : collisions) {
+
+      // Event counter: before event selection
+      registryData.fill(HIST("eventCounter"), 0.5);
+
+      // Check if event global index is in the list of events to process
+      int ev = collision.globalIndex();
+      if (eventSet.count(ev)) {
+
+        // Increment event index
+        eventIndex++;
+
+        // Fill event counter
+        registryData.fill(HIST("eventCounter"), 1.5);
+
+        // Loop over reconstructed tracks
+        for (auto const& track : tracks) {
+          registryData.fill(HIST("ptChargedTracks"), indexAllEvts, track.pt());
+          registryData.fill(HIST("ptChargedTracks"), eventIndex, track.pt());
+        }
+      }
+    }
+  }
+  PROCESS_SWITCH(UnitTestForReconstruction, processData, "Process Data", true);
+};
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  return WorkflowSpec{adaptAnalysisTask<UnitTestForReconstruction>(cfgc)};
+}

PWGCF/DataModel/FemtoDerived.h

@@ -245,14 +245,14 @@ DECLARE_SOA_COLUMN(Prong2Eta, prong2Eta, float);                    //! Track et
 DECLARE_SOA_COLUMN(Prong0Phi, prong0Phi, float);                    //! Track phi of charm hadron prong0
 DECLARE_SOA_COLUMN(Prong1Phi, prong1Phi, float);                    //! Track phi of charm hadron prong1
 DECLARE_SOA_COLUMN(Prong2Phi, prong2Phi, float);                    //! Track phi of charm hadron prong2
-DECLARE_SOA_COLUMN(CandidateSelFlag, candidateSelFlag, int8_t);     //! Selection of mass hypothesis for charm hadron (1 for Lc -> pkpi, 2 for Lc -> pikp, 4 for D+ -> pikpi)
+DECLARE_SOA_COLUMN(CandidateSelFlag, candidateSelFlag, int);        //! Selection of mass hypothesis for charm hadron (1 for Lc -> pkpi, 2 for Lc -> pikp, 4 for D+ -> pikpi)
 DECLARE_SOA_COLUMN(BDTBkg, bdtBkg, float);                          //! Background score using Boosted Decision Tree for charm hadron
 DECLARE_SOA_COLUMN(BDTPrompt, bdtPrompt, float);                    //! Prompt signal score using Boosted Decision Tree for charm hadron
 DECLARE_SOA_COLUMN(BDTFD, bdtFD, float);                            //! Feed-down score using Boosted Decision Tree for charm hadron
-DECLARE_SOA_COLUMN(FlagMc, flagMc, int8_t);                         //! To select MC particle among charm hadrons, { DplusToPiKPi = 1, LcToPKPi = 2, DsToKKPi = 4, XicToPKP = 8, N3ProngD = 2ecays };
-DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t);               //! flag for reconstruction level matching (1 for prompt, 2 for non-prompt)
-DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t);               //! flag for generator level matching (1 for prompt, 2 for non-prompt)
-DECLARE_SOA_COLUMN(IsCandidateSwapped, isCandidateSwapped, int8_t); //! swapping of the prongs order (0 for Lc -> pkpi, 1 for Lc -> pikp)
+DECLARE_SOA_COLUMN(FlagMc, flagMc, int);                            //! To select MC particle among charm hadrons, { DplusToPiKPi = 1, LcToPKPi = 17, DsToKKPi = 6, XicToPKPi = 21, N3ProngD = 2ecays };
+DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int);                  //! flag for reconstruction level matching (1 for prompt, 2 for non-prompt)
+DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int);                  //! flag for generator level matching (1 for prompt, 2 for non-prompt)
+DECLARE_SOA_COLUMN(IsCandidateSwapped, isCandidateSwapped, int);    //! swapping of the prongs order (0 for Lc -> pkpi, 1 for Lc -> pikp)
 DECLARE_SOA_COLUMN(TrkPt, trkPt, float);                            //! Transverse momentum of associate femto particle
 DECLARE_SOA_COLUMN(TrkEta, trkEta, float);                          //! Eta of associate femto particle
 DECLARE_SOA_COLUMN(TrkPhi, trkPhi, float);                          //! Phi of associate femto particle