[PWGLF,Trigger] Omegamult: added toi mask (#11619)

lietava · web-flow · commit 1e539435884f · 2025-06-15T10:45:20.000+02:00
diff --git a/EventFiltering/Zorro.h b/EventFiltering/Zorro.h
@@ -9,7 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-// Zero Obstacles Results Retriever for Offline trigger selections
+
+///
+/// \file Zorro.h
+/// \brief Zero Obstacles Results Retriever for Offline trigger selections
+/// \author M Puccio
+///
 
 #ifndef EVENTFILTERING_ZORRO_H_
 #define EVENTFILTERING_ZORRO_H_
@@ -54,6 +59,7 @@ class Zorro
   std::vector<int> getTOIcounters() const { return mTOIcounts; }
   std::vector<bool> getTriggerOfInterestResults(uint64_t bcGlobalId, uint64_t tolerance = 100);
   std::vector<bool> getTriggerOfInterestResults() const;
+  int getNTOIs() const { return mTOIs.size(); }
 
   void setCCDBpath(std::string path) { mBaseCCDBPath = path; }
   void setBaseCCDBPath(std::string path) { mBaseCCDBPath = path; }
diff --git a/PWGLF/DataModel/LFNonPromptCascadeTables.h b/PWGLF/DataModel/LFNonPromptCascadeTables.h
@@ -119,6 +119,7 @@ DECLARE_SOA_COLUMN(MultFT0M, multFT0M, float);
 DECLARE_SOA_COLUMN(CentFT0C, centFT0C, float);
 DECLARE_SOA_COLUMN(CentFT0A, centFT0A, float);
 DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float);
+DECLARE_SOA_COLUMN(ToiMask, toiMask, uint32_t);
 
 } // namespace NPCascadeTable
 DECLARE_SOA_TABLE(NPCascTable, "AOD", "NPCASCTABLE",
@@ -183,7 +184,8 @@ DECLARE_SOA_TABLE(NPCascTable, "AOD", "NPCASCTABLE",
                   NPCascadeTable::MultFT0M,
                   NPCascadeTable::CentFT0C,
                   NPCascadeTable::CentFT0A,
-                  NPCascadeTable::CentFT0M)
+                  NPCascadeTable::CentFT0M,
+                  NPCascadeTable::ToiMask)
 
 DECLARE_SOA_TABLE(NPCascTableNT, "AOD", "NPCASCTABLENT",
                   NPCascadeTable::MatchingChi2,
@@ -247,7 +249,8 @@ DECLARE_SOA_TABLE(NPCascTableNT, "AOD", "NPCASCTABLENT",
                   NPCascadeTable::MultFT0M,
                   NPCascadeTable::CentFT0C,
                   NPCascadeTable::CentFT0A,
-                  NPCascadeTable::CentFT0M)
+                  NPCascadeTable::CentFT0M,
+                  NPCascadeTable::ToiMask)
 
 DECLARE_SOA_TABLE(NPCascTableMC, "AOD", "NPCASCTABLEMC",
                   NPCascadeTable::MatchingChi2,
@@ -330,7 +333,8 @@ DECLARE_SOA_TABLE(NPCascTableMC, "AOD", "NPCASCTABLEMC",
                   NPCascadeTable::DCAzMC,
                   NPCascadeTable::MCcollisionMatch,
                   NPCascadeTable::HasFakeReassociation,
-                  NPCascadeTable::MotherDecayDaughters)
+                  NPCascadeTable::MotherDecayDaughters,
+                  NPCascadeTable::ToiMask)
 
 DECLARE_SOA_TABLE(NPCascTableMCNT, "AOD", "NPCASCTABLEMCNT",
                   NPCascadeTable::MatchingChi2,
@@ -413,7 +417,8 @@ DECLARE_SOA_TABLE(NPCascTableMCNT, "AOD", "NPCASCTABLEMCNT",
                   NPCascadeTable::DCAzMC,
                   NPCascadeTable::MCcollisionMatch,
                   NPCascadeTable::HasFakeReassociation,
-                  NPCascadeTable::MotherDecayDaughters)
+                  NPCascadeTable::MotherDecayDaughters,
+                  NPCascadeTable::ToiMask)
 
 DECLARE_SOA_TABLE(NPCascTableGen, "AOD", "NPCASCTABLEGen",
                   NPCascadeTable::gPt,
diff --git a/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx b/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx
@@ -125,6 +125,7 @@ struct NPCascCandidate {
   float centFT0C;
   float centFT0A;
   float centFT0M;
+  uint32_t toiMask;
 };
 std::array<bool, 2> isFromHF(auto& particle)
 {
@@ -287,23 +288,34 @@ struct NonPromptCascadeTask {
     return true;
   }
 
-  void zorroAccounting(const auto& collisions)
+  void zorroAccounting(const auto& collisions, auto& toiMap)
   {
     if (cfgSkimmedProcessing) {
       int runNumber{-1};
       for (const auto& coll : collisions) {
         auto bc = coll.template bc_as<aod::BCsWithTimestamps>();
         if (runNumber != bc.runNumber()) {
           mZorro.initCCDB(mCCDB.service, bc.runNumber(), bc.timestamp(), cfgTriggersOfInterest.value);
+          if (mZorro.getNTOIs() > 32) {
+            LOG(fatal) << "N TOIs:" << mZorro.getNTOIs() << " Max 32 TOIs possible.";
+          }
           mZorro.populateHistRegistry(mRegistry, bc.runNumber());
           runNumber = bc.runNumber();
         }
-        mZorro.isSelected(bc.globalBC()); /// Just let Zorro do the accounting
+        bool sel = mZorro.isSelected(bc.globalBC()); /// Just let Zorro do the accounting
+        if (sel) {
+          std::vector<bool> toivect = mZorro.getTriggerOfInterestResults();
+          uint32_t toiMask = 0;
+          for (size_t i{0}; i < toivect.size(); i++) {
+            toiMask += toivect[i] << i;
+          }
+          toiMap[bc.globalBC()] = toiMask;
+        }
       }
     }
   }
   template <typename TrackType, typename CollisionType>
-  void fillCandidatesVector(CollisionType const&, TrackType const& tracks, auto const& cascades, auto& candidates)
+  void fillCandidatesVector(CollisionType const&, TrackType const& tracks, auto const& cascades, auto& candidates, std::map<uint64_t, uint32_t> toiMap = {})
   {
 
     const auto& getCascade = [](auto const& candidate) {
@@ -507,6 +519,10 @@ struct NonPromptCascadeTask {
       } else {
         o2::base::Propagator::Instance()->propagateToDCA(primaryVertex, ntCascadeTrack, mBz, 2.f, matCorr, &motherDCA);
       }
+      uint32_t toiMask = 0x0;
+      if (toiMap.count(bc.globalBC())) {
+        toiMask = toiMap[bc.globalBC()];
+      }
       candidates.emplace_back(NPCascCandidate{mcParticleID, trackedCascGlobalIndex, itsTrackGlobalIndex, candidate.collisionId(), matchingChi2, deltaPtITSCascade, deltaPtCascade, cascITSclsSize, hasReassociatedClusters, hasFakeReassociation, isGoodMatch, isGoodCascade, pdgCodeMom, itsTrackPDG, fromHF[0], fromHF[1],
                                               collision.numContrib(), cascPVContribs, collision.collisionTimeRes(), primaryVertex.getX(), primaryVertex.getY(), primaryVertex.getZ(),
                                               cascadeLvector.pt(), cascadeLvector.eta(), cascadeLvector.phi(),
@@ -517,7 +533,7 @@ struct NonPromptCascadeTask {
                                               cascITSclusters, protonTrack.itsNCls(), pionTrack.itsNCls(), bachelor.itsNCls(), protonTrack.tpcNClsFound(), pionTrack.tpcNClsFound(), bachelor.tpcNClsFound(),
                                               protonTrack.tpcNSigmaPr(), pionTrack.tpcNSigmaPi(), bachelor.tpcNSigmaKa(), bachelor.tpcNSigmaPi(),
                                               protonTrack.hasTOF(), pionTrack.hasTOF(), bachelor.hasTOF(),
-                                              protonTrack.tofNSigmaPr(), pionTrack.tofNSigmaPi(), bachelor.tofNSigmaKa(), bachelor.tofNSigmaPi(), collision.sel8(), collision.multFT0C(), collision.multFT0A(), collision.multFT0M(), collision.centFT0C(), collision.centFT0A(), collision.centFT0M()});
+                                              protonTrack.tofNSigmaPr(), pionTrack.tofNSigmaPi(), bachelor.tofNSigmaKa(), bachelor.tofNSigmaPi(), collision.sel8(), collision.multFT0C(), collision.multFT0A(), collision.multFT0M(), collision.centFT0C(), collision.centFT0A(), collision.centFT0M(), toiMask});
     }
   }
 
@@ -537,7 +553,7 @@ struct NonPromptCascadeTask {
                                   c.protonTPCNSigma, c.pionTPCNSigma, c.bachKaonTPCNSigma, c.bachPionTPCNSigma,
                                   c.protonHasTOF, c.pionHasTOF, c.bachHasTOF,
                                   c.protonTOFNSigma, c.pionTOFNSigma, c.bachKaonTOFNSigma, c.bachPionTOFNSigma,
-                                  c.sel8, c.multFT0C, c.multFT0A, c.multFT0M, c.centFT0C, c.centFT0A, c.centFT0M);
+                                  c.sel8, c.multFT0C, c.multFT0A, c.multFT0M, c.centFT0C, c.centFT0A, c.centFT0M, c.toiMask);
     }
   }
 
@@ -576,7 +592,7 @@ struct NonPromptCascadeTask {
                                 c.sel8, c.multFT0C, c.multFT0A, c.multFT0M, c.centFT0C, c.centFT0A, c.centFT0M,
                                 particle.pt(), particle.eta(), particle.phi(), mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(),
                                 particle.pdgCode(), mcCollision.posX() - particle.vx(), mcCollision.posY() - particle.vy(),
-                                mcCollision.posZ() - particle.vz(), mcCollision.globalIndex() == recCollision.mcCollisionId(), c.hasFakeReassociation, motherDecayDaughters);
+                                mcCollision.posZ() - particle.vz(), mcCollision.globalIndex() == recCollision.mcCollisionId(), c.hasFakeReassociation, motherDecayDaughters, c.toiMask);
     }
   }
 
@@ -653,8 +669,9 @@ struct NonPromptCascadeTask {
                                   aod::V0s const& /*v0s*/, TracksExtData const& tracks,
                                   aod::BCsWithTimestamps const&)
   {
-    zorroAccounting(collisions);
-    fillCandidatesVector<TracksExtData>(collisions, tracks, trackedCascades, gCandidates);
+    std::map<uint64_t, uint32_t> toiMap;
+    zorroAccounting(collisions, toiMap);
+    fillCandidatesVector<TracksExtData>(collisions, tracks, trackedCascades, gCandidates, toiMap);
     fillDataTable<aod::AssignedTrackedCascades>(gCandidates);
   }
   PROCESS_SWITCH(NonPromptCascadeTask, processTrackedCascadesData, "process cascades from strangeness tracking: Data analysis", false);
@@ -663,8 +680,9 @@ struct NonPromptCascadeTask {
                            aod::V0s const& /*v0s*/, TracksExtData const& tracks,
                            aod::BCsWithTimestamps const&)
   {
-    zorroAccounting(collisions);
-    fillCandidatesVector<TracksExtData>(collisions, tracks, cascades, gCandidatesNT);
+    std::map<uint64_t, uint32_t> toiMap;
+    zorroAccounting(collisions, toiMap);
+    fillCandidatesVector<TracksExtData>(collisions, tracks, cascades, gCandidatesNT, toiMap);
     fillDataTable<aod::Cascades>(gCandidatesNT);
   }
   PROCESS_SWITCH(NonPromptCascadeTask, processCascadesData, "process cascades: Data analysis", false);

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,7 @@ struct NPCascCandidate {`
`125`	`125`	`float centFT0C;`
`126`	`126`	`float centFT0A;`
`127`	`127`	`float centFT0M;`
	`128`	`+ uint32_t toiMask;`
`128`	`129`	`};`
`129`	`130`	`std::array<bool, 2> isFromHF(auto& particle)`
`130`	`131`	`{`
`@@ -287,23 +288,34 @@ struct NonPromptCascadeTask {`
`287`	`288`	`return true;`
`288`	`289`	`}`
`289`	`290`
`290`		`- void zorroAccounting(const auto& collisions)`
	`291`	`+ void zorroAccounting(const auto& collisions, auto& toiMap)`
`291`	`292`	`{`
`292`	`293`	`if (cfgSkimmedProcessing) {`
`293`	`294`	`int runNumber{-1};`
`294`	`295`	`for (const auto& coll : collisions) {`
`295`	`296`	`auto bc = coll.template bc_as<aod::BCsWithTimestamps>();`
`296`	`297`	`if (runNumber != bc.runNumber()) {`
`297`	`298`	`mZorro.initCCDB(mCCDB.service, bc.runNumber(), bc.timestamp(), cfgTriggersOfInterest.value);`
	`299`	`+ if (mZorro.getNTOIs() > 32) {`
	`300`	`+ LOG(fatal) << "N TOIs:" << mZorro.getNTOIs() << " Max 32 TOIs possible.";`
	`301`	`+ }`
`298`	`302`	`mZorro.populateHistRegistry(mRegistry, bc.runNumber());`
`299`	`303`	`runNumber = bc.runNumber();`
`300`	`304`	`}`
`301`		`- mZorro.isSelected(bc.globalBC()); /// Just let Zorro do the accounting`
	`305`	`+ bool sel = mZorro.isSelected(bc.globalBC()); /// Just let Zorro do the accounting`
	`306`	`+ if (sel) {`
	`307`	`+ std::vector<bool> toivect = mZorro.getTriggerOfInterestResults();`
	`308`	`+ uint32_t toiMask = 0;`
	`309`	`+ for (size_t i{0}; i < toivect.size(); i++) {`
	`310`	`+ toiMask += toivect[i] << i;`
	`311`	`+ }`
	`312`	`+ toiMap[bc.globalBC()] = toiMask;`
	`313`	`+ }`
`302`	`314`	`}`
`303`	`315`	`}`
`304`	`316`	`}`
`305`	`317`	`template <typename TrackType, typename CollisionType>`
`306`		`- void fillCandidatesVector(CollisionType const&, TrackType const& tracks, auto const& cascades, auto& candidates)`
	`318`	`+ void fillCandidatesVector(CollisionType const&, TrackType const& tracks, auto const& cascades, auto& candidates, std::map<uint64_t, uint32_t> toiMap = {})`
`307`	`319`	`{`
`308`	`320`
`309`	`321`	`const auto& getCascade = [](auto const& candidate) {`
`@@ -507,6 +519,10 @@ struct NonPromptCascadeTask {`
`507`	`519`	`} else {`
`508`	`520`	`o2::base::Propagator::Instance()->propagateToDCA(primaryVertex, ntCascadeTrack, mBz, 2.f, matCorr, &motherDCA);`
`509`	`521`	`}`
	`522`	`+ uint32_t toiMask = 0x0;`
	`523`	`+ if (toiMap.count(bc.globalBC())) {`
	`524`	`+ toiMask = toiMap[bc.globalBC()];`
	`525`	`+ }`
`510`	`526`	`candidates.emplace_back(NPCascCandidate{mcParticleID, trackedCascGlobalIndex, itsTrackGlobalIndex, candidate.collisionId(), matchingChi2, deltaPtITSCascade, deltaPtCascade, cascITSclsSize, hasReassociatedClusters, hasFakeReassociation, isGoodMatch, isGoodCascade, pdgCodeMom, itsTrackPDG, fromHF[0], fromHF[1],`
`511`	`527`	`collision.numContrib(), cascPVContribs, collision.collisionTimeRes(), primaryVertex.getX(), primaryVertex.getY(), primaryVertex.getZ(),`
`512`	`528`	`cascadeLvector.pt(), cascadeLvector.eta(), cascadeLvector.phi(),`
`@@ -517,7 +533,7 @@ struct NonPromptCascadeTask {`
`517`	`533`	`cascITSclusters, protonTrack.itsNCls(), pionTrack.itsNCls(), bachelor.itsNCls(), protonTrack.tpcNClsFound(), pionTrack.tpcNClsFound(), bachelor.tpcNClsFound(),`
`518`	`534`	`protonTrack.tpcNSigmaPr(), pionTrack.tpcNSigmaPi(), bachelor.tpcNSigmaKa(), bachelor.tpcNSigmaPi(),`
`519`	`535`	`protonTrack.hasTOF(), pionTrack.hasTOF(), bachelor.hasTOF(),`
`520`		`- protonTrack.tofNSigmaPr(), pionTrack.tofNSigmaPi(), bachelor.tofNSigmaKa(), bachelor.tofNSigmaPi(), collision.sel8(), collision.multFT0C(), collision.multFT0A(), collision.multFT0M(), collision.centFT0C(), collision.centFT0A(), collision.centFT0M()});`
	`536`	`+ protonTrack.tofNSigmaPr(), pionTrack.tofNSigmaPi(), bachelor.tofNSigmaKa(), bachelor.tofNSigmaPi(), collision.sel8(), collision.multFT0C(), collision.multFT0A(), collision.multFT0M(), collision.centFT0C(), collision.centFT0A(), collision.centFT0M(), toiMask});`
`521`	`537`	`}`
`522`	`538`	`}`
`523`	`539`
`@@ -537,7 +553,7 @@ struct NonPromptCascadeTask {`
`537`	`553`	`c.protonTPCNSigma, c.pionTPCNSigma, c.bachKaonTPCNSigma, c.bachPionTPCNSigma,`
`538`	`554`	`c.protonHasTOF, c.pionHasTOF, c.bachHasTOF,`
`539`	`555`	`c.protonTOFNSigma, c.pionTOFNSigma, c.bachKaonTOFNSigma, c.bachPionTOFNSigma,`
`540`		`- c.sel8, c.multFT0C, c.multFT0A, c.multFT0M, c.centFT0C, c.centFT0A, c.centFT0M);`
	`556`	`+ c.sel8, c.multFT0C, c.multFT0A, c.multFT0M, c.centFT0C, c.centFT0A, c.centFT0M, c.toiMask);`
`541`	`557`	`}`
`542`	`558`	`}`
`543`	`559`
`@@ -576,7 +592,7 @@ struct NonPromptCascadeTask {`
`576`	`592`	`c.sel8, c.multFT0C, c.multFT0A, c.multFT0M, c.centFT0C, c.centFT0A, c.centFT0M,`
`577`	`593`	`particle.pt(), particle.eta(), particle.phi(), mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(),`
`578`	`594`	`particle.pdgCode(), mcCollision.posX() - particle.vx(), mcCollision.posY() - particle.vy(),`
`579`		`- mcCollision.posZ() - particle.vz(), mcCollision.globalIndex() == recCollision.mcCollisionId(), c.hasFakeReassociation, motherDecayDaughters);`
	`595`	`+ mcCollision.posZ() - particle.vz(), mcCollision.globalIndex() == recCollision.mcCollisionId(), c.hasFakeReassociation, motherDecayDaughters, c.toiMask);`
`580`	`596`	`}`
`581`	`597`	`}`
`582`	`598`
`@@ -653,8 +669,9 @@ struct NonPromptCascadeTask {`
`653`	`669`	`aod::V0s const& /v0s/, TracksExtData const& tracks,`
`654`	`670`	`aod::BCsWithTimestamps const&)`
`655`	`671`	`{`
`656`		`- zorroAccounting(collisions);`
`657`		`- fillCandidatesVector<TracksExtData>(collisions, tracks, trackedCascades, gCandidates);`
	`672`	`+ std::map<uint64_t, uint32_t> toiMap;`
	`673`	`+ zorroAccounting(collisions, toiMap);`
	`674`	`+ fillCandidatesVector<TracksExtData>(collisions, tracks, trackedCascades, gCandidates, toiMap);`
`658`	`675`	`fillDataTable<aod::AssignedTrackedCascades>(gCandidates);`
`659`	`676`	`}`
`660`	`677`	`PROCESS_SWITCH(NonPromptCascadeTask, processTrackedCascadesData, "process cascades from strangeness tracking: Data analysis", false);`
`@@ -663,8 +680,9 @@ struct NonPromptCascadeTask {`
`663`	`680`	`aod::V0s const& /v0s/, TracksExtData const& tracks,`
`664`	`681`	`aod::BCsWithTimestamps const&)`
`665`	`682`	`{`
`666`		`- zorroAccounting(collisions);`
`667`		`- fillCandidatesVector<TracksExtData>(collisions, tracks, cascades, gCandidatesNT);`
	`683`	`+ std::map<uint64_t, uint32_t> toiMap;`
	`684`	`+ zorroAccounting(collisions, toiMap);`
	`685`	`+ fillCandidatesVector<TracksExtData>(collisions, tracks, cascades, gCandidatesNT, toiMap);`
`668`	`686`	`fillDataTable<aod::Cascades>(gCandidatesNT);`
`669`	`687`	`}`
`670`	`688`	`PROCESS_SWITCH(NonPromptCascadeTask, processCascadesData, "process cascades: Data analysis", false);`