dev: adding toi mask to table

lietava · lietava · commit 23272b6280e2 · 2025-06-14T11:24:55.000+02:00
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,7 +288,7 @@ struct NonPromptCascadeTask {
     return true;
   }
 
-  void zorroAccounting(const auto& collisions)
+  void zorroAccounting(const auto& collisions, auto& toiMap)
   {
     if (cfgSkimmedProcessing) {
       int runNumber{-1};
@@ -298,12 +299,20 @@ struct NonPromptCascadeTask {
           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(uint i = 0; i < toivect.size(); i++) {
+            toiMask += 1 << 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 +516,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 +530,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 +550,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 +589,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 +666,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 +677,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,7 +288,7 @@ 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};`
`@@ -298,12 +299,20 @@ struct NonPromptCascadeTask {`
`298`	`299`	`mZorro.populateHistRegistry(mRegistry, bc.runNumber());`
`299`	`300`	`runNumber = bc.runNumber();`
`300`	`301`	`}`
`301`		`- mZorro.isSelected(bc.globalBC()); /// Just let Zorro do the accounting`
	`302`	`+ bool sel = mZorro.isSelected(bc.globalBC()); /// Just let Zorro do the accounting`
	`303`	`+ if(sel) {`
	`304`	`+ std::vector<bool> toivect = mZorro.getTriggerOfInterestResults();`
	`305`	`+ uint32_t toiMask = 0;`
	`306`	`+ for(uint i = 0; i < toivect.size(); i++) {`
	`307`	`+ toiMask += 1 << i;`
	`308`	`+ }`
	`309`	`+ toiMap[bc.globalBC()] = toiMask;`
	`310`	`+ }`
`302`	`311`	`}`
`303`	`312`	`}`
`304`	`313`	`}`
`305`	`314`	`template <typename TrackType, typename CollisionType>`
`306`		`- void fillCandidatesVector(CollisionType const&, TrackType const& tracks, auto const& cascades, auto& candidates)`
	`315`	`+ void fillCandidatesVector(CollisionType const&, TrackType const& tracks, auto const& cascades, auto& candidates, std::map<uint64_t,uint32_t> toiMap = {})`
`307`	`316`	`{`
`308`	`317`
`309`	`318`	`const auto& getCascade = [](auto const& candidate) {`
`@@ -507,6 +516,10 @@ struct NonPromptCascadeTask {`
`507`	`516`	`} else {`
`508`	`517`	`o2::base::Propagator::Instance()->propagateToDCA(primaryVertex, ntCascadeTrack, mBz, 2.f, matCorr, &motherDCA);`
`509`	`518`	`}`
	`519`	`+ uint32_t toiMask = 0x0;`
	`520`	`+ if(toiMap.count(bc.globalBC())) {`
	`521`	`+ toiMask = toiMap[bc.globalBC()];`
	`522`	`+ }`
`510`	`523`	`candidates.emplace_back(NPCascCandidate{mcParticleID, trackedCascGlobalIndex, itsTrackGlobalIndex, candidate.collisionId(), matchingChi2, deltaPtITSCascade, deltaPtCascade, cascITSclsSize, hasReassociatedClusters, hasFakeReassociation, isGoodMatch, isGoodCascade, pdgCodeMom, itsTrackPDG, fromHF[0], fromHF[1],`
`511`	`524`	`collision.numContrib(), cascPVContribs, collision.collisionTimeRes(), primaryVertex.getX(), primaryVertex.getY(), primaryVertex.getZ(),`
`512`	`525`	`cascadeLvector.pt(), cascadeLvector.eta(), cascadeLvector.phi(),`
`@@ -517,7 +530,7 @@ struct NonPromptCascadeTask {`
`517`	`530`	`cascITSclusters, protonTrack.itsNCls(), pionTrack.itsNCls(), bachelor.itsNCls(), protonTrack.tpcNClsFound(), pionTrack.tpcNClsFound(), bachelor.tpcNClsFound(),`
`518`	`531`	`protonTrack.tpcNSigmaPr(), pionTrack.tpcNSigmaPi(), bachelor.tpcNSigmaKa(), bachelor.tpcNSigmaPi(),`
`519`	`532`	`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()});`
	`533`	`+ protonTrack.tofNSigmaPr(), pionTrack.tofNSigmaPi(), bachelor.tofNSigmaKa(), bachelor.tofNSigmaPi(), collision.sel8(), collision.multFT0C(), collision.multFT0A(), collision.multFT0M(), collision.centFT0C(), collision.centFT0A(), collision.centFT0M(), toiMask});`
`521`	`534`	`}`
`522`	`535`	`}`
`523`	`536`
`@@ -537,7 +550,7 @@ struct NonPromptCascadeTask {`
`537`	`550`	`c.protonTPCNSigma, c.pionTPCNSigma, c.bachKaonTPCNSigma, c.bachPionTPCNSigma,`
`538`	`551`	`c.protonHasTOF, c.pionHasTOF, c.bachHasTOF,`
`539`	`552`	`c.protonTOFNSigma, c.pionTOFNSigma, c.bachKaonTOFNSigma, c.bachPionTOFNSigma,`
`540`		`- c.sel8, c.multFT0C, c.multFT0A, c.multFT0M, c.centFT0C, c.centFT0A, c.centFT0M);`
	`553`	`+ c.sel8, c.multFT0C, c.multFT0A, c.multFT0M, c.centFT0C, c.centFT0A, c.centFT0M, c.toiMask);`
`541`	`554`	`}`
`542`	`555`	`}`
`543`	`556`
`@@ -576,7 +589,7 @@ struct NonPromptCascadeTask {`
`576`	`589`	`c.sel8, c.multFT0C, c.multFT0A, c.multFT0M, c.centFT0C, c.centFT0A, c.centFT0M,`
`577`	`590`	`particle.pt(), particle.eta(), particle.phi(), mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(),`
`578`	`591`	`particle.pdgCode(), mcCollision.posX() - particle.vx(), mcCollision.posY() - particle.vy(),`
`579`		`- mcCollision.posZ() - particle.vz(), mcCollision.globalIndex() == recCollision.mcCollisionId(), c.hasFakeReassociation, motherDecayDaughters);`
	`592`	`+ mcCollision.posZ() - particle.vz(), mcCollision.globalIndex() == recCollision.mcCollisionId(), c.hasFakeReassociation, motherDecayDaughters,c.toiMask);`
`580`	`593`	`}`
`581`	`594`	`}`
`582`	`595`
`@@ -653,8 +666,9 @@ struct NonPromptCascadeTask {`
`653`	`666`	`aod::V0s const& /v0s/, TracksExtData const& tracks,`
`654`	`667`	`aod::BCsWithTimestamps const&)`
`655`	`668`	`{`
`656`		`- zorroAccounting(collisions);`
`657`		`- fillCandidatesVector<TracksExtData>(collisions, tracks, trackedCascades, gCandidates);`
	`669`	`+ std::map<uint64_t, uint32_t> toiMap;`
	`670`	`+ zorroAccounting(collisions, toiMap);`
	`671`	`+ fillCandidatesVector<TracksExtData>(collisions, tracks, trackedCascades, gCandidates, toiMap);`
`658`	`672`	`fillDataTable<aod::AssignedTrackedCascades>(gCandidates);`
`659`	`673`	`}`
`660`	`674`	`PROCESS_SWITCH(NonPromptCascadeTask, processTrackedCascadesData, "process cascades from strangeness tracking: Data analysis", false);`
`@@ -663,8 +677,9 @@ struct NonPromptCascadeTask {`
`663`	`677`	`aod::V0s const& /v0s/, TracksExtData const& tracks,`
`664`	`678`	`aod::BCsWithTimestamps const&)`
`665`	`679`	`{`
`666`		`- zorroAccounting(collisions);`
`667`		`- fillCandidatesVector<TracksExtData>(collisions, tracks, cascades, gCandidatesNT);`
	`680`	`+ std::map<uint64_t, uint32_t> toiMap;`
	`681`	`+ zorroAccounting(collisions, toiMap);`
	`682`	`+ fillCandidatesVector<TracksExtData>(collisions, tracks, cascades, gCandidatesNT, toiMap);`
`668`	`683`	`fillDataTable<aod::Cascades>(gCandidatesNT);`
`669`	`684`	`}`
`670`	`685`	`PROCESS_SWITCH(NonPromptCascadeTask, processCascadesData, "process cascades: Data analysis", false);`