Create and pass v0 flag to AOD (#12443)

shahor02 · chiarazampolli · commit ead09a6fbe43 · 2023-12-13T18:00:15.000+01:00
* Flag standalone and photon V0s in the V0Index

* Pass v0 flags to AOD

* Set v0s_002 as default

---------

Co-authored-by: shahoian &lt;ruben.shahoyan@cern.ch&gt;
diff --git a/DataFormats/Reconstruction/include/ReconstructionDataFormats/DecayNBodyIndex.h b/DataFormats/Reconstruction/include/ReconstructionDataFormats/DecayNBodyIndex.h
@@ -36,20 +36,31 @@ class DecayNBodyIndex
   void setProngID(int i, GIndex gid) { mProngIDs[i] = gid; }
   int getVertexID() const { return mVertexID; }
   void setVertexID(int id) { mVertexID = id; }
+  uint8_t getBits() const { return mBits; }
+  bool testBit(int i) const { return (mBits & (0x1 << i)) != 0; }
+  void setBit(int i) { mBits |= (0x1 << i); }
+  void resetBit(int i) { mBits &= ~(0x1 << i); }
+
   const std::array<GIndex, N>& getProngs() const { return mProngIDs; }
   static constexpr int getNProngs() { return N; }
 
  protected:
   int mVertexID = -1;                // id of parent vertex
   std::array<GIndex, N> mProngIDs{}; // global IDs of prongs
-  ClassDefNV(DecayNBodyIndex, 1);
+  uint8_t mBits = 0;                 // user defined bits
+
+  ClassDefNV(DecayNBodyIndex, 2);
 };
 
 class V0Index : public DecayNBodyIndex<2>
 {
  public:
   using DecayNBodyIndex<2>::DecayNBodyIndex;
   V0Index(int v, GIndex p, GIndex n) : DecayNBodyIndex<2>(v, {p, n}) {}
+  bool isStandaloneV0() const { return testBit(0); }
+  bool isPhotonOnly() const { return testBit(1); }
+  void setStandaloneV0() { setBit(0); }
+  void setPhotonOnly() { setBit(1); }
   ClassDefNV(V0Index, 1);
 };
 
diff --git a/Detectors/AOD/src/AODProducerWorkflowSpec.cxx b/Detectors/AOD/src/AODProducerWorkflowSpec.cxx
@@ -1156,6 +1156,7 @@ void AODProducerWorkflowDPL::fillSecondaryVertices(const o2::globaltracking::Rec
     const auto& v0 = v0s[iv0];
     auto trPosID = v0.getProngID(0);
     auto trNegID = v0.getProngID(1);
+    uint8_t v0flags = v0.getBits();
     int posTableIdx = -1, negTableIdx = -1, collID = -1;
     auto item = mGIDToTableID.find(trPosID);
     if (item != mGIDToTableID.end()) {
@@ -1176,7 +1177,7 @@ void AODProducerWorkflowDPL::fillSecondaryVertices(const o2::globaltracking::Rec
       collID = itemV->second;
     }
     if (posTableIdx != -1 and negTableIdx != -1 and collID != -1) {
-      v0Cursor(collID, posTableIdx, negTableIdx);
+      v0Cursor(collID, posTableIdx, negTableIdx, v0flags);
       mV0ToTableID[int(iv0)] = mTableV0ID++;
     }
   }
diff --git a/Detectors/Vertexing/src/SVertexer.cxx b/Detectors/Vertexing/src/SVertexer.cxx
@@ -659,9 +659,9 @@ bool SVertexer::checkV0(const TrackCand& seedP, const TrackCand& seedN, int iP,
   // apply mass selections
   float p2Pos = pP[0] * pP[0] + pP[1] * pP[1] + pP[2] * pP[2], p2Neg = pN[0] * pN[0] + pN[1] * pN[1] + pN[2] * pN[2];
 
-  bool goodHyp = false;
+  bool goodHyp = false, photonOnly = mSVParams->mTPCTrackPhotonTune && isTPConly;
   std::array<bool, NHypV0> hypCheckStatus{};
-  int nPID = (mSVParams->mTPCTrackPhotonTune && isTPConly) ? (Photon + 1) : NHypV0;
+  int nPID = photonOnly ? (Photon + 1) : NHypV0;
   for (int ipid = 0; (ipid < nPID) && mSVParams->checkV0Hypothesis; ipid++) {
     if (mV0Hyps[ipid].check(p2Pos, p2Neg, p2V0, ptV0)) {
       goodHyp = hypCheckStatus[ipid] = true;
@@ -851,6 +851,13 @@ bool SVertexer::checkV0(const TrackCand& seedP, const TrackCand& seedN, int iP,
 
   if (nV0Used || !rejectIfNotCascade) { // need to add this v0
     mV0sIdxTmp[ithread].push_back(v0Idxnew);
+    if (!rejectIfNotCascade) {
+      mV0sIdxTmp[ithread].back().setStandaloneV0();
+    }
+    if (photonOnly) {
+      mV0sIdxTmp[ithread].back().setPhotonOnly();
+    }
+
     if (mSVParams->createFullV0s) {
       mV0sTmp[ithread].push_back(v0new);
     }
diff --git a/Framework/Core/include/Framework/AnalysisDataModel.h b/Framework/Core/include/Framework/AnalysisDataModel.h
@@ -1271,7 +1271,7 @@ DECLARE_SOA_TABLE_VERSIONED(V0s_002, "AOD", "V0", 2, //! Run 3 V0 table (version
                             v0::IsStandardV0<v0::V0Type>,
                             v0::IsPhotonV0<v0::V0Type>);
 
-using V0s = V0s_001; //! this defines the current default version
+using V0s = V0s_002; //! this defines the current default version
 using V0 = V0s::iterator;
 
 namespace cascade

Original file line number	Diff line number	Diff line change
`@@ -1156,6 +1156,7 @@ void AODProducerWorkflowDPL::fillSecondaryVertices(const o2::globaltracking::Rec`
`1156`	`1156`	`const auto& v0 = v0s[iv0];`
`1157`	`1157`	`auto trPosID = v0.getProngID(0);`
`1158`	`1158`	`auto trNegID = v0.getProngID(1);`
	`1159`	`+ uint8_t v0flags = v0.getBits();`
`1159`	`1160`	`int posTableIdx = -1, negTableIdx = -1, collID = -1;`
`1160`	`1161`	`auto item = mGIDToTableID.find(trPosID);`
`1161`	`1162`	`if (item != mGIDToTableID.end()) {`
`@@ -1176,7 +1177,7 @@ void AODProducerWorkflowDPL::fillSecondaryVertices(const o2::globaltracking::Rec`
`1176`	`1177`	`collID = itemV->second;`
`1177`	`1178`	`}`
`1178`	`1179`	`if (posTableIdx != -1 and negTableIdx != -1 and collID != -1) {`
`1179`		`- v0Cursor(collID, posTableIdx, negTableIdx);`
	`1180`	`+ v0Cursor(collID, posTableIdx, negTableIdx, v0flags);`
`1180`	`1181`	`mV0ToTableID[int(iv0)] = mTableV0ID++;`
`1181`	`1182`	`}`
`1182`	`1183`	`}`