Merge branch 'AliceO2Group:master' into PID-Hadrons-in-Jets

Author: llorenc-11

PWGDQ/DataModel/ReducedTablesAlice3.h ALICE3/DataModel/ReducedTablesAlice3.hPWGDQ/DataModel/ReducedTablesAlice3.h renamed to ALICE3/DataModel/ReducedTablesAlice3.h

@@ -15,8 +15,8 @@
 ///
 /// \author Alexander Tiekoetter (atiekoet@cern.ch) University of Muenster
 
-#ifndef PWGDQ_DATAMODEL_REDUCEDTABLESALICE3_H_
-#define PWGDQ_DATAMODEL_REDUCEDTABLESALICE3_H_
+#ifndef ALICE3_DATAMODEL_REDUCEDTABLESALICE3_H_
+#define ALICE3_DATAMODEL_REDUCEDTABLESALICE3_H_
 
 #include "PWGDQ/DataModel/ReducedInfoTables.h"
 
@@ -50,7 +50,7 @@ DECLARE_SOA_COLUMN(MultMCNParticlesEta20, multMCNParticlesEta20, float);
 DECLARE_SOA_COLUMN(MultMCNParticlesEta40, multMCNParticlesEta40, float);
 } // namespace reducedeventmcalice3
 
-DECLARE_SOA_TABLE_STAGED(ReducedA3Events, "REA3EVENTS", //!   Main event information table
+DECLARE_SOA_TABLE_STAGED(ReA3Events, "REA3EVENT", //!   Main event information table
                          o2::soa::Index<>,
                          collision::PosX, collision::PosY, collision::PosZ, collision::NumContrib,
                          collision::CollisionTime, collision::CollisionTimeRes, reducedeventalice3::MultDensity);
@@ -62,19 +62,19 @@ DECLARE_SOA_TABLE(ReducedA3EventsVtxCov, "AOD", "REA3VTXCOV", //!    Event verte
 DECLARE_SOA_TABLE(ReducedA3EventsInfo, "AOD", "REA3EVENTINFO", //!   Main event index table
                   reducedevent::CollisionId);
 
-DECLARE_SOA_TABLE(ReducedA3MCEvents, "AOD", "REA3MCEVTS", //!   Event level MC truth information
+DECLARE_SOA_TABLE(ReA3MCEvents, "AOD", "REA3MCEVENT", //!   Event level MC truth information
                   o2::soa::Index<>,
                   mccollision::GeneratorsID, reducedeventalice3::MCPosX, reducedeventalice3::MCPosY, reducedeventalice3::MCPosZ,
                   mccollision::T, mccollision::Weight, mccollision::ImpactParameter);
 
-using ReducedA3MCEvent = ReducedA3MCEvents::iterator;
-using ReducedA3Event = ReducedA3Events::iterator;
+using ReducedA3MCEvent = ReA3MCEvents::iterator;
+using ReA3Event = ReA3Events::iterator;
 
 namespace reducedtrackalice3
 {
 // basic track information
-DECLARE_SOA_INDEX_COLUMN(ReducedA3Event, reduceda3event); //!
-DECLARE_SOA_INDEX_COLUMN(Track, track);                   //!
+DECLARE_SOA_INDEX_COLUMN(ReA3Event, rea3event); //!
+DECLARE_SOA_INDEX_COLUMN(Track, track);         //!
 // ----  flags reserved for storing various information during filtering
 DECLARE_SOA_BITMAP_COLUMN(FilteringFlags, filteringFlags, 64); //!
 // -----------------------------------------------------
@@ -111,8 +111,8 @@ DECLARE_SOA_DYNAMIC_COLUMN(P, p, //!
 } // namespace reducedtrackalice3
 
 // basic track information
-DECLARE_SOA_TABLE(ReducedA3Tracks, "AOD", "REA3TRACK", //!
-                  o2::soa::Index<>, reducedtrackalice3::ReducedA3EventId, reducedtrackalice3::FilteringFlags,
+DECLARE_SOA_TABLE(ReA3Tracks, "AOD", "REA3TRACK", //!
+                  o2::soa::Index<>, reducedtrackalice3::ReA3EventId, reducedtrackalice3::FilteringFlags,
                   reducedtrackalice3::Pt, reducedtrackalice3::Eta, reducedtrackalice3::Phi, reducedtrackalice3::Sign, reducedtrackalice3::IsAmbiguous,
                   reducedtrackalice3::Px<reducedtrackalice3::Pt, reducedtrackalice3::Phi>,
                   reducedtrackalice3::Py<reducedtrackalice3::Pt, reducedtrackalice3::Phi>,
@@ -126,19 +126,19 @@ DECLARE_SOA_TABLE(ReducedA3TracksBarrelCov, "AOD", "REA3BARRELCOV", //!
 
 namespace reducedA3trackMC
 {
-DECLARE_SOA_INDEX_COLUMN(ReducedA3MCEvent, reducedA3MCEvent);                                 //!
-DECLARE_SOA_COLUMN(McReducedFlags, mcReducedFlags, uint16_t);                                 //! Flags to hold compressed MC selection information
-DECLARE_SOA_SELF_INDEX_COLUMN_FULL(Mother0, mother0, int, "ReducedA3MCTracks_Mother0");       //! Track index of the first mother
-DECLARE_SOA_SELF_INDEX_COLUMN_FULL(Mother1, mother1, int, "ReducedA3MCTracks_Mother1");       //! Track index of the last mother
-DECLARE_SOA_SELF_INDEX_COLUMN_FULL(Daughter0, daughter0, int, "ReducedA3MCTracks_Daughter0"); //! Track index of the first daughter
-DECLARE_SOA_SELF_INDEX_COLUMN_FULL(Daughter1, daughter1, int, "ReducedA3MCTracks_Daughter1"); //! Track index of the last daughter
-DECLARE_SOA_SELF_ARRAY_INDEX_COLUMN(Mothers, mothers);                                        //! Mother tracks (possible empty) array. Iterate over mcParticle.mothers_as<aod::McParticles>())
-DECLARE_SOA_SELF_SLICE_INDEX_COLUMN(Daughters, daughters);                                    //! Daughter tracks (possibly empty) slice. Check for non-zero with mcParticle.has_daughters(). Iterate over mcParticle.daughters_as<aod::McParticles>())
-DECLARE_SOA_COLUMN(Pt, pt, float);                                                            //!
-DECLARE_SOA_COLUMN(Eta, eta, float);                                                          //!
-DECLARE_SOA_COLUMN(Phi, phi, float);                                                          //!
-DECLARE_SOA_COLUMN(E, e, float);                                                              //!
-DECLARE_SOA_DYNAMIC_COLUMN(Px, px,                                                            //!
+DECLARE_SOA_INDEX_COLUMN(ReA3MCEvent, reA3MCEvent);                                      //!
+DECLARE_SOA_COLUMN(McReducedFlags, mcReducedFlags, uint16_t);                            //! Flags to hold compressed MC selection information
+DECLARE_SOA_SELF_INDEX_COLUMN_FULL(Mother0, mother0, int, "ReA3MCTracks_Mother0");       //! Track index of the first mother
+DECLARE_SOA_SELF_INDEX_COLUMN_FULL(Mother1, mother1, int, "ReA3MCTracks_Mother1");       //! Track index of the last mother
+DECLARE_SOA_SELF_INDEX_COLUMN_FULL(Daughter0, daughter0, int, "ReA3MCTracks_Daughter0"); //! Track index of the first daughter
+DECLARE_SOA_SELF_INDEX_COLUMN_FULL(Daughter1, daughter1, int, "ReA3MCTracks_Daughter1"); //! Track index of the last daughter
+DECLARE_SOA_SELF_ARRAY_INDEX_COLUMN(Mothers, mothers);                                   //! Mother tracks (possible empty) array. Iterate over mcParticle.mothers_as<aod::McParticles>())
+DECLARE_SOA_SELF_SLICE_INDEX_COLUMN(Daughters, daughters);                               //! Daughter tracks (possibly empty) slice. Check for non-zero with mcParticle.has_daughters(). Iterate over mcParticle.daughters_as<aod::McParticles>())
+DECLARE_SOA_COLUMN(Pt, pt, float);                                                       //!
+DECLARE_SOA_COLUMN(Eta, eta, float);                                                     //!
+DECLARE_SOA_COLUMN(Phi, phi, float);                                                     //!
+DECLARE_SOA_COLUMN(E, e, float);                                                         //!
+DECLARE_SOA_DYNAMIC_COLUMN(Px, px,                                                       //!
                            [](float pt, float phi) -> float { return pt * std::cos(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, //!
                            [](float pt, float phi) -> float { return pt * std::sin(phi); });
@@ -159,8 +159,8 @@ DECLARE_SOA_DYNAMIC_COLUMN(Y, y, //! Particle rapidity
 
 // NOTE: This table is nearly identical to the one from Framework (except that it points to the event ID, not the BC id)
 //       This table contains all MC truth tracks (both barrel and muon)
-DECLARE_SOA_TABLE(ReducedA3MCTracks, "AOD", "REA3MCTRACK", //!  MC track information (on disk)
-                  o2::soa::Index<>, reducedA3trackMC::ReducedA3MCEventId,
+DECLARE_SOA_TABLE(ReA3MCTracks, "AOD", "REA3MCTRACK", //!  MC track information (on disk)
+                  o2::soa::Index<>, reducedA3trackMC::ReA3MCEventId,
                   mcparticle::PdgCode, mcparticle::StatusCode, mcparticle::Flags,
                   reducedA3trackMC::MothersIds, reducedA3trackMC::DaughtersIdSlice,
                   mcparticle::Weight,
@@ -179,18 +179,18 @@ DECLARE_SOA_TABLE(ReducedA3MCTracks, "AOD", "REA3MCTRACK", //!  MC track informa
                   mcparticle::GetHepMCStatusCode<mcparticle::Flags, mcparticle::StatusCode>,
                   mcparticle::IsPhysicalPrimary<mcparticle::Flags>);
 
-using ReducedA3MCTrack = ReducedA3MCTracks::iterator;
+using ReA3MCTrack = ReA3MCTracks::iterator;
 
 namespace reduceda3barreltracklabel
 {
-DECLARE_SOA_INDEX_COLUMN(ReducedA3MCTrack, reducedA3MCTrack); //!
+DECLARE_SOA_INDEX_COLUMN(ReA3MCTrack, reA3MCTrack); //!
 DECLARE_SOA_COLUMN(McMask, mcMask, uint16_t);
 } // namespace reduceda3barreltracklabel
 
 // NOTE: MC labels. This table has one entry for each reconstructed track (joinable with the track tables)
 //          The McParticleId points to the position of the MC truth track from the ReducedTracksMC table
 DECLARE_SOA_TABLE(ReducedA3TracksBarrelLabels, "AOD", "REA3BARLA", //!
-                  reduceda3barreltracklabel::ReducedA3MCTrackId, reduceda3barreltracklabel::McMask, reducedA3trackMC::McReducedFlags);
+                  reduceda3barreltracklabel::ReA3MCTrackId, reduceda3barreltracklabel::McMask, reducedA3trackMC::McReducedFlags);
 
 using ReducedA3TrackBarrelLabel = ReducedA3TracksBarrelLabels::iterator;
 
@@ -206,31 +206,31 @@ DECLARE_SOA_TABLE(ReducedA3TracksBarrel, "AOD", "REA3BARREL",
 DECLARE_SOA_TABLE(ReducedA3TracksBarrelInfo, "AOD", "REA3BARRELINFO",
                   reducedtrackalice3::CollisionId, collision::PosX, collision::PosY, collision::PosZ, reducedtrackalice3::TrackId);
 
-using ReducedA3Track = ReducedA3Tracks::iterator;
+using ReducedA3Track = ReA3Tracks::iterator;
 using ReducedA3TrackBarrel = ReducedA3TracksBarrel::iterator;
 using ReducedA3TrackBarrelCov = ReducedA3TracksBarrelCov::iterator;
 using ReducedA3TrackBarrelInfo = ReducedA3TracksBarrelInfo::iterator;
 
 namespace reducedeventlabela3
 {
-DECLARE_SOA_INDEX_COLUMN(ReducedA3MCEvent, reducedA3MCEvent); //! MC collision
-DECLARE_SOA_COLUMN(McMask, mcMask, uint16_t);                 //! Bit mask to indicate collision mismatches (bit ON means mismatch). Bit 15: indicates negative label
+DECLARE_SOA_INDEX_COLUMN(ReA3MCEvent, reA3MCEvent); //! MC collision
+DECLARE_SOA_COLUMN(McMask, mcMask, uint16_t);       //! Bit mask to indicate collision mismatches (bit ON means mismatch). Bit 15: indicates negative label
 } // namespace reducedeventlabela3
 
 DECLARE_SOA_TABLE(ReducedA3MCEventLabels, "AOD", "REA3MCCOLLBL", //! Table joined to the ReducedEvents table containing the MC index
-                  reducedeventlabela3::ReducedA3MCEventId, reducedeventlabela3::McMask);
+                  reducedeventlabela3::ReA3MCEventId, reducedeventlabela3::McMask);
 
 using ReducedA3MCEventLabel = ReducedA3MCEventLabels::iterator;
 
 namespace reducedA3track_association
 {
-DECLARE_SOA_INDEX_COLUMN(ReducedA3Event, reducedA3event); //! ReducedEvent index
-DECLARE_SOA_INDEX_COLUMN(ReducedA3Track, reducedA3track); //! ReducedTrack index
+DECLARE_SOA_INDEX_COLUMN(ReA3Event, reA3event); //! ReducedEvent index
+DECLARE_SOA_INDEX_COLUMN(ReA3Track, reA3track); //! ReducedTrack index
 } // namespace reducedA3track_association
 
 DECLARE_SOA_TABLE(ReducedA3TracksAssoc, "AOD", "REA3ASSOC", //! Table for reducedtrack-to-reducedcollision association
-                  reducedA3track_association::ReducedA3EventId,
-                  reducedA3track_association::ReducedA3TrackId);
+                  reducedA3track_association::ReA3EventId,
+                  reducedA3track_association::ReA3TrackId);
 
 DECLARE_SOA_TABLE(ReducedA3PIDTOF, "AOD", "REA3PIDTOF",
                   upgrade_tof::TOFEventTime,
@@ -332,4 +332,4 @@ DECLARE_SOA_TABLE(ReducedA3PIDOT, "AOD", "REA3PIDOT",
 
 } // namespace o2::aod
 
-#endif // PWGDQ_DATAMODEL_REDUCEDTABLESALICE3_H_
+#endif // ALICE3_DATAMODEL_REDUCEDTABLESALICE3_H_

ALICE3/TableProducer/CMakeLists.txt

@@ -62,7 +62,7 @@ o2physics_add_dpl_workflow(alice3-tracking-translator
                     COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(alice3-dq-table-maker
-                    SOURCES alice3-dq-table-maker.cxx
+                    SOURCES alice3DqTableMaker.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::PWGDQCore
                     COMPONENT_NAME Analysis)
 

ALICE3/TableProducer/OTF/onTheFlyTracker.cxx

@@ -211,6 +211,7 @@ struct OnTheFlyTracker {
 
   struct : ConfigurableGroup {
     std::string prefix = "fastPrimaryTrackerSettings";
+    Configurable<bool> fastTrackShortLivedParticles{"fastTrackShortLivedParticles", false, "Use fasttracker for short lived tracks"};
     Configurable<bool> fastTrackPrimaries{"fastTrackPrimaries", false, "Use fasttracker for primary tracks. Enable with care"};
     Configurable<int> minSiliconHits{"minSiliconHits", 4, "minimum number of silicon hits to accept track"};
     Configurable<bool> applyZacceptance{"applyZacceptance", false, "apply z limits to detector layers or not"};
@@ -348,15 +349,20 @@ struct OnTheFlyTracker {
   v0candidate thisV0;
   // Constants
   static constexpr int kv0Prongs = 2;
-  static constexpr std::array<int, 3> v0PDGs = {kK0Short,
-                                                kLambda0,
-                                                kLambda0Bar};
+  static constexpr std::array<int, 3> v0PDGs = {PDG_t::kK0Short,
+                                                PDG_t::kLambda0,
+                                                PDG_t::kLambda0Bar};
 
-  static constexpr std::array<int, 5> longLivedHandledPDGs = {kElectron,
-                                                              kMuonMinus,
-                                                              kPiPlus,
-                                                              kKPlus,
-                                                              kProton};
+  static constexpr std::array<int, 5> longLivedHandledPDGs = {PDG_t::kElectron,
+                                                              PDG_t::kMuonMinus,
+                                                              PDG_t::kPiPlus,
+                                                              PDG_t::kKPlus,
+                                                              PDG_t::kProton};
+
+  static constexpr std::array<int, 5> shortLivedHandledPDGs = {PDG_t::kSigmaPlus,
+                                                               PDG_t::kSigmaMinus,
+                                                               PDG_t::kXiMinus,
+                                                               PDG_t::kOmegaMinus};
 
   static constexpr std::array<int, 4> nucleiPDGs = {o2::constants::physics::kDeuteron,
                                                     o2::constants::physics::kTriton,
@@ -760,6 +766,10 @@ struct OnTheFlyTracker {
       return o2::track::PID::Proton;
     } else if (std::abs(pdgCode) == PDG_t::kLambda0) {
       return o2::track::PID::Lambda;
+    } else if (std::abs(pdgCode) == PDG_t::kSigmaPlus) {
+      return o2::track::PID::XiMinus; // Close enough
+    } else if (std::abs(pdgCode) == PDG_t::kSigmaMinus) {
+      return o2::track::PID::XiMinus; // Close enough
     } else if (std::abs(pdgCode) == PDG_t::kXiMinus) {
       return o2::track::PID::XiMinus;
     } else if (std::abs(pdgCode) == PDG_t::kOmegaMinus) {
@@ -1875,12 +1885,14 @@ struct OnTheFlyTracker {
 
       const bool isCascadeToDecay = (mcParticle.pdgCode() == kXiMinus) && cascadeDecaySettings.decayXi;
       const bool isV0ToDecay = std::find(v0PDGs.begin(), v0PDGs.end(), mcParticle.pdgCode()) != v0PDGs.end() && v0DecaySettings.decayV0;
-
       const bool longLivedToBeHandled = std::find(longLivedHandledPDGs.begin(), longLivedHandledPDGs.end(), std::abs(mcParticle.pdgCode())) != longLivedHandledPDGs.end();
+      const bool shortLivedToBeHandled = std::find(shortLivedHandledPDGs.begin(), shortLivedHandledPDGs.end(), std::abs(mcParticle.pdgCode())) != shortLivedHandledPDGs.end();
       const bool nucleiToBeHandled = std::find(nucleiPDGs.begin(), nucleiPDGs.end(), std::abs(mcParticle.pdgCode())) != nucleiPDGs.end();
       const bool pdgsToBeHandled = longLivedToBeHandled ||
                                    (enableNucleiSmearing && nucleiToBeHandled) ||
-                                   (isCascadeToDecay) || (isV0ToDecay);
+                                   (isCascadeToDecay) || (isV0ToDecay) ||
+                                   (shortLivedToBeHandled && fastPrimaryTrackerSettings.fastTrackShortLivedParticles);
+
       if (!pdgsToBeHandled) {
         continue;
       }
@@ -1902,7 +1914,7 @@ struct OnTheFlyTracker {
       bool reconstructed = true;
       int nTrkHits = 0;
       if (enablePrimarySmearing) {
-        if (fastPrimaryTrackerSettings.fastTrackPrimaries) {
+        if (fastPrimaryTrackerSettings.fastTrackPrimaries || fastPrimaryTrackerSettings.fastTrackShortLivedParticles) {
           o2::track::TrackParCov perfectTrackParCov;
           o2::upgrade::convertMCParticleToO2Track(mcParticle, perfectTrackParCov, pdgDB);
           perfectTrackParCov.setPID(pdgCodeToPID(mcParticle.pdgCode()));
@@ -2052,8 +2064,10 @@ struct OnTheFlyTracker {
     // Now that the multiplicity is known, we can process the particles to smear them
     for (const auto& mcParticle : mcParticles) {
       const bool longLivedToBeHandled = std::find(longLivedHandledPDGs.begin(), longLivedHandledPDGs.end(), std::abs(mcParticle.pdgCode())) != longLivedHandledPDGs.end();
+      const bool shortLivedToBeHandled = std::find(shortLivedHandledPDGs.begin(), shortLivedHandledPDGs.end(), std::abs(mcParticle.pdgCode())) != shortLivedHandledPDGs.end();
       const bool nucleiToBeHandled = std::find(nucleiPDGs.begin(), nucleiPDGs.end(), std::abs(mcParticle.pdgCode())) != nucleiPDGs.end();
-      const bool pdgsToBeHandled = longLivedToBeHandled || (enableNucleiSmearing && nucleiToBeHandled);
+      const bool pdgsToBeHandled = longLivedToBeHandled || (enableNucleiSmearing && nucleiToBeHandled) ||
+                                   (shortLivedToBeHandled && fastPrimaryTrackerSettings.fastTrackShortLivedParticles);
 
       o2::upgrade::OTFParticle otfParticle(mcParticle);
       otfParticle.setBits(mcParticle.decayerBits_raw());
@@ -2099,10 +2113,21 @@ struct OnTheFlyTracker {
       bool reconstructed = false;
       int nTrkHits = 0;
       const bool isSecondary = !otfParticle.isPrimary() && otfParticle.checkBit(o2::upgrade::DecayerBits::ProducedByDecayer) && otfParticle.isAlive();
-      if (enablePrimarySmearing && otfParticle.isPrimary()) {
+      if (enablePrimarySmearing && longLivedToBeHandled && otfParticle.isPrimary()) {
         o2::upgrade::convertMCParticleToO2Track(mcParticle, trackParCov, pdgDB);
         computeBremsstrahlungLoss(icfg, mcParticle, trackParCov);
         reconstructed = mSmearer[icfg]->smearTrack(trackParCov, mcParticle.pdgCode(), dNdEta);
+      } else if (shortLivedToBeHandled && fastPrimaryTrackerSettings.fastTrackShortLivedParticles) {
+        o2::track::TrackParCov perfectTrackParCov;
+        o2::upgrade::convertMCParticleToO2Track(mcParticle, perfectTrackParCov, pdgDB);
+        perfectTrackParCov.setPID(pdgCodeToPID(mcParticle.pdgCode()));
+        computeBremsstrahlungLoss(icfg, mcParticle, perfectTrackParCov);
+        nTrkHits = fastTracker[icfg]->FastTrack(perfectTrackParCov, trackParCov, dNdEta);
+        if (nTrkHits < fastPrimaryTrackerSettings.minSiliconHits) {
+          reconstructed = false;
+        } else {
+          reconstructed = true;
+        }
       } else if (enableSecondarySmearing && isSecondary) {
         o2::track::TrackParCov perfectTrackParCov;
         o2::upgrade::convertMCParticleToO2Track(mcParticle, perfectTrackParCov, pdgDB);