[PWGCF] Update producer in femto framework (AliceO2Group#13894)

ariedel-cern · web-flow · commit 4f11e57c35c1 · 2025-11-20T16:48:50.000+01:00
diff --git a/PWGCF/Femto/Core/cascadeBuilder.h b/PWGCF/Femto/Core/cascadeBuilder.h
@@ -379,26 +379,28 @@ class CascadeBuilder
     LOG(info) << "Initialization done...";
   }
 
-  template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
-  void fillCascades(T1& collisionProducts, T2& trackProducts, T3& cascadeProducts, T4 const& fullCascades, T5 const& fullTracks, T6 const& col, T7& trackBuilder, T8& indexMap)
+  template <modes::System system, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
+  void fillCascades(T1 const& col, T2& collisionBuilder, T3& collisionProducts, T4& trackProducts, T5& cascadeProducts, T6 const& fullCascades, T7 const& fullTracks, T8& trackBuilder, T9& indexMap)
   {
     if (!mFillAnyTable) {
       return;
     }
 
-    int32_t bachelorIndex = 0;
-    int32_t posDaughterIndex = 0;
-    int32_t negDaughterIndex = 0;
+    int64_t bachelorIndex = 0;
+    int64_t posDaughterIndex = 0;
+    int64_t negDaughterIndex = 0;
     for (const auto& cascade : fullCascades) {
       if (!mCascadeSelection.checkCandidate(cascade)) {
         continue;
       }
       mCascadeSelection.applySelections(cascade, fullTracks, col);
       if (mCascadeSelection.passesAllRequiredSelections()) {
 
-        auto bachelor = cascade.template bachelor_as<T5>();
-        auto posDaughter = cascade.template posTrack_as<T5>();
-        auto negDaughter = cascade.template negTrack_as<T5>();
+        auto bachelor = cascade.template bachelor_as<T7>();
+        auto posDaughter = cascade.template posTrack_as<T7>();
+        auto negDaughter = cascade.template negTrack_as<T7>();
+
+        collisionBuilder.template fillCollision<system>(collisionProducts, col);
 
         bachelorIndex = trackBuilder.template getDaughterIndex<modes::Track::kCascadeBachelor>(bachelor, trackProducts, collisionProducts, indexMap);
         posDaughterIndex = trackBuilder.template getDaughterIndex<modes::Track::kV0Daughter>(posDaughter, trackProducts, collisionProducts, indexMap);
diff --git a/PWGCF/Femto/Core/collisionBuilder.h b/PWGCF/Femto/Core/collisionBuilder.h
@@ -445,6 +445,11 @@ class CollisionBuilder
     if (!mFillAnyTable) {
       return;
     }
+
+    if (mCollisionAleadyFilled) {
+      return;
+    }
+
     if (mProducedCollisions) {
       collisionProducts.producedCollision(col.posZ(),
                                           col.multNTracksPV(),
@@ -482,10 +487,18 @@ class CollisionBuilder
         collisionProducts.producedQns(utils::qn(col));
       }
     }
+
+    mCollisionAleadyFilled = true;
+  }
+
+  void reset()
+  {
+    mCollisionAleadyFilled = false;
   }
 
  private:
   CollisionSelection<HistName> mCollisionSelection;
+  bool mCollisionAleadyFilled = false;
   Zorro mZorro;
   bool mUseTrigger = false;
   int mRunNumber = -1;
diff --git a/PWGCF/Femto/Core/kinkBuilder.h b/PWGCF/Femto/Core/kinkBuilder.h
@@ -396,8 +396,8 @@ class KinkBuilder
     LOG(info) << "Initialization done...";
   }
 
-  template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
-  void fillKinks(T1& collisionProducts, T2& trackProducts, T3& kinkProducts, T4 const& kinks, T5 const& tracks, T6& trackBuilder, T7& indexMap)
+  template <modes::System system, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
+  void fillKinks(T1 const& col, T2& collisionBuilder, T3& collisionProducts, T4& trackProducts, T5& kinkProducts, T6 const& kinks, T7 const& tracks, T8& trackBuilder, T9& indexMap)
   {
     if (!mFillAnyTable) {
       return;
@@ -420,7 +420,8 @@ class KinkBuilder
         continue;
       }
 
-      auto daughter = kink.template trackDaug_as<T5>();
+      auto daughter = kink.template trackDaug_as<T7>();
+      collisionBuilder.template fillCollision<system>(collisionProducts, col);
       daughterIndex = trackBuilder.template getDaughterIndex<modes::Track::kKinkDaughter>(daughter, trackProducts, collisionProducts, indexMap);
       if constexpr (modes::isEqual(kinkType, modes::Kink::kSigma)) {
         fillSigma(collisionProducts, kinkProducts, kink, daughterIndex);
@@ -432,7 +433,7 @@ class KinkBuilder
   }
 
   template <typename T1, typename T2, typename T3>
-  void fillSigma(T1& collisionProducts, T2& kinkProducts, T3 const& kink, int daughterIndex)
+  void fillSigma(T1& collisionProducts, T2& kinkProducts, T3 const& kink, int64_t daughterIndex)
   {
     float mass = kink.mSigmaMinus();
 
@@ -489,7 +490,7 @@ class KinkBuilder
   }
 
   template <typename T1, typename T2, typename T3>
-  void fillSigmaPlus(T1& collisionProducts, T2& kinkProducts, T3 const& kink, int daughterIndex)
+  void fillSigmaPlus(T1& collisionProducts, T2& kinkProducts, T3 const& kink, int64_t daughterIndex)
   {
     float mass = kink.mSigmaPlus();
 
diff --git a/PWGCF/Femto/Core/trackBuilder.h b/PWGCF/Femto/Core/trackBuilder.h
@@ -586,8 +586,8 @@ class TrackBuilder
     LOG(info) << "Initialization done...";
   }
 
-  template <typename T1, typename T2, typename T3, typename T4>
-  void fillTracks(T1 const& tracks, T2& trackProducts, T3& collisionProducts, T4& indexMap)
+  template <modes::System system, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
+  void fillTracks(T1 const& col, T2& collisionBuilder, T3& collisionProducts, T4 const& tracks, T5& trackProducts, T6& indexMap)
   {
     if (!mFillAnyTable) {
       return;
@@ -600,6 +600,8 @@ class TrackBuilder
       if (!mTrackSelection.passesAllRequiredSelections()) {
         continue;
       }
+
+      collisionBuilder.template fillCollision<system>(collisionProducts, col);
       this->fillTrack<modes::Track::kPrimaryTrack>(track, trackProducts, collisionProducts, indexMap);
     }
   }
diff --git a/PWGCF/Femto/Core/twoTrackResonanceBuilder.h b/PWGCF/Femto/Core/twoTrackResonanceBuilder.h
@@ -510,19 +510,19 @@ class TwoTrackResonanceBuilder
     LOG(info) << "Initialization done...";
   }
 
-  template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
-  void fillResonances(T1& collisionProducts, T2& trackProducts, T3& resonanceProducts, T4& groupPositiveTracks, T5& groupNegativeTracks, T6& trackBuilder, T7& indexMap)
+  template <modes::System system, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
+  void fillResonances(T1 const& col, T2& collisionBuilder, T3& collisionProducts, T4& trackProducts, T5& resonanceProducts, T6& groupPositiveTracks, T7& groupNegativeTracks, T8& trackBuilder, T9& indexMap)
   {
     if (!mFillAnyTable) {
       return;
     }
     for (auto const& [positiveTrack, negativeTrack] : o2::soa::combinations(o2::soa::CombinationsFullIndexPolicy(groupPositiveTracks, groupNegativeTracks))) {
-      this->fillResonance(collisionProducts, trackProducts, resonanceProducts, positiveTrack, negativeTrack, trackBuilder, indexMap);
+      this->fillResonance<system>(col, collisionBuilder, collisionProducts, trackProducts, resonanceProducts, positiveTrack, negativeTrack, trackBuilder, indexMap);
     }
   }
 
-  template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
-  void fillResonance(T1& collisionProducts, T2& trackProducts, T3& resonanceProducts, T4 const& posDaughter, T4 const& negDaughter, T5& trackBuilder, T6& indexMap)
+  template <modes::System system, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
+  void fillResonance(T1 const& col, T2& collisionBuilder, T3& collisionProducts, T4& trackProducts, T5& resonanceProducts, T6 const& posDaughter, T7 const& negDaughter, T8& trackBuilder, T9& indexMap)
   {
 
     mTwoTrackResonanceSelection.reconstructResonance(posDaughter, negDaughter);
@@ -532,6 +532,9 @@ class TwoTrackResonanceBuilder
     mTwoTrackResonanceSelection.applySelections(posDaughter, negDaughter); // for resonances selection are only applied to daughter tracks
     int64_t posDaughterIndex = 0;
     int64_t negDaughterIndex = 0;
+
+    collisionBuilder.template fillCollision<system>(collisionProducts, col);
+
     posDaughterIndex = trackBuilder.template getDaughterIndex<modes::Track::kResonanceDaughter>(posDaughter, trackProducts, collisionProducts, indexMap);
     negDaughterIndex = trackBuilder.template getDaughterIndex<modes::Track::kResonanceDaughter>(negDaughter, trackProducts, collisionProducts, indexMap);
 
diff --git a/PWGCF/Femto/Core/v0Builder.h b/PWGCF/Femto/Core/v0Builder.h
@@ -371,8 +371,8 @@ class V0Builder
     LOG(info) << "Initialization done...";
   }
 
-  template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
-  void fillV0s(T1& collisionProducts, T2& trackProducts, T3& v0products, T4 const& v0s, T5 const& tracks, T6& trackBuilder, T7& indexMap)
+  template <modes::System system, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
+  void fillV0s(T1 const& col, T2& collisionBuilder, T3& collisionProducts, T4& trackProducts, T5& v0products, T6 const& v0s, T7 const& tracks, T8& trackBuilder, T9& indexMap)
   {
     if (!mFillAnyTable) {
       return;
@@ -385,10 +385,14 @@ class V0Builder
       }
       mV0Selection.applySelections(v0, tracks);
       if (mV0Selection.passesAllRequiredSelections()) {
-        auto posDaughter = v0.template posTrack_as<T5>();
-        auto negDaughter = v0.template negTrack_as<T5>();
+        auto posDaughter = v0.template posTrack_as<T7>();
+        auto negDaughter = v0.template negTrack_as<T7>();
+
+        collisionBuilder.template fillCollision<system>(collisionProducts, col);
+
         posDaughterIndex = trackBuilder.template getDaughterIndex<modes::Track::kV0Daughter>(posDaughter, trackProducts, collisionProducts, indexMap);
         negDaughterIndex = trackBuilder.template getDaughterIndex<modes::Track::kV0Daughter>(negDaughter, trackProducts, collisionProducts, indexMap);
+
         if constexpr (modes::isEqual(v0Type, modes::V0::kLambda)) {
           fillLambda(collisionProducts, v0products, v0, 1.f, posDaughterIndex, negDaughterIndex);
         }
@@ -403,7 +407,7 @@ class V0Builder
   }
 
   template <typename T1, typename T2, typename T3>
-  void fillLambda(T1& collisionProducts, T2& v0products, T3 const& v0, float sign, int32_t posDaughterIndex, int32_t negDaughterIndex)
+  void fillLambda(T1& collisionProducts, T2& v0products, T3 const& v0, float sign, int64_t posDaughterIndex, int64_t negDaughterIndex)
   {
     float mass, massAnti;
     if (sign > 0.f) {
@@ -439,7 +443,7 @@ class V0Builder
   }
 
   template <typename T1, typename T2, typename T3>
-  void fillK0short(T1& collisionProducts, T2& v0products, T3 const& v0, int posDaughterIndex, int negDaughterIndex)
+  void fillK0short(T1& collisionProducts, T2& v0products, T3 const& v0, int64_t posDaughterIndex, int64_t negDaughterIndex)
   {
     if (mProduceK0shorts) {
       v0products.producedK0shorts(collisionProducts.producedCollision.lastIndex(),
diff --git a/PWGCF/Femto/TableProducer/femtoProducer.cxx b/PWGCF/Femto/TableProducer/femtoProducer.cxx

Original file line number	Diff line number	Diff line change
`@@ -396,8 +396,8 @@ class KinkBuilder`
`396`	`396`	`LOG(info) << "Initialization done...";`
`397`	`397`	`}`
`398`	`398`
`399`		`- template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>`
`400`		`- void fillKinks(T1& collisionProducts, T2& trackProducts, T3& kinkProducts, T4 const& kinks, T5 const& tracks, T6& trackBuilder, T7& indexMap)`
	`399`	`+ template <modes::System system, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>`
	`400`	`+ void fillKinks(T1 const& col, T2& collisionBuilder, T3& collisionProducts, T4& trackProducts, T5& kinkProducts, T6 const& kinks, T7 const& tracks, T8& trackBuilder, T9& indexMap)`
`401`	`401`	`{`
`402`	`402`	`if (!mFillAnyTable) {`
`403`	`403`	`return;`
`@@ -420,7 +420,8 @@ class KinkBuilder`
`420`	`420`	`continue;`
`421`	`421`	`}`
`422`	`422`
`423`		`- auto daughter = kink.template trackDaug_as<T5>();`
	`423`	`+ auto daughter = kink.template trackDaug_as<T7>();`
	`424`	`+ collisionBuilder.template fillCollision<system>(collisionProducts, col);`
`424`	`425`	`daughterIndex = trackBuilder.template getDaughterIndex<modes::Track::kKinkDaughter>(daughter, trackProducts, collisionProducts, indexMap);`
`425`	`426`	`if constexpr (modes::isEqual(kinkType, modes::Kink::kSigma)) {`
`426`	`427`	`fillSigma(collisionProducts, kinkProducts, kink, daughterIndex);`
`@@ -432,7 +433,7 @@ class KinkBuilder`
`432`	`433`	`}`
`433`	`434`
`434`	`435`	`template <typename T1, typename T2, typename T3>`
`435`		`- void fillSigma(T1& collisionProducts, T2& kinkProducts, T3 const& kink, int daughterIndex)`
	`436`	`+ void fillSigma(T1& collisionProducts, T2& kinkProducts, T3 const& kink, int64_t daughterIndex)`
`436`	`437`	`{`
`437`	`438`	`float mass = kink.mSigmaMinus();`
`438`	`439`
`@@ -489,7 +490,7 @@ class KinkBuilder`
`489`	`490`	`}`
`490`	`491`
`491`	`492`	`template <typename T1, typename T2, typename T3>`
`492`		`- void fillSigmaPlus(T1& collisionProducts, T2& kinkProducts, T3 const& kink, int daughterIndex)`
	`493`	`+ void fillSigmaPlus(T1& collisionProducts, T2& kinkProducts, T3 const& kink, int64_t daughterIndex)`
`493`	`494`	`{`
`494`	`495`	`float mass = kink.mSigmaPlus();`
`495`	`496`
Original file line number	Diff line number	Diff line change
`@@ -586,8 +586,8 @@ class TrackBuilder`
`586`	`586`	`LOG(info) << "Initialization done...";`
`587`	`587`	`}`
`588`	`588`
`589`		`- template <typename T1, typename T2, typename T3, typename T4>`
`590`		`- void fillTracks(T1 const& tracks, T2& trackProducts, T3& collisionProducts, T4& indexMap)`
	`589`	`+ template <modes::System system, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>`
	`590`	`+ void fillTracks(T1 const& col, T2& collisionBuilder, T3& collisionProducts, T4 const& tracks, T5& trackProducts, T6& indexMap)`
`591`	`591`	`{`
`592`	`592`	`if (!mFillAnyTable) {`
`593`	`593`	`return;`
`@@ -600,6 +600,8 @@ class TrackBuilder`
`600`	`600`	`if (!mTrackSelection.passesAllRequiredSelections()) {`
`601`	`601`	`continue;`
`602`	`602`	`}`
	`603`	`+`
	`604`	`+ collisionBuilder.template fillCollision<system>(collisionProducts, col);`
`603`	`605`	`this->fillTrack<modes::Track::kPrimaryTrack>(track, trackProducts, collisionProducts, indexMap);`
`604`	`606`	`}`
`605`	`607`	`}`
Original file line number	Diff line number	Diff line change
`@@ -510,19 +510,19 @@ class TwoTrackResonanceBuilder`
`510`	`510`	`LOG(info) << "Initialization done...";`
`511`	`511`	`}`
`512`	`512`
`513`		`- template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>`
`514`		`- void fillResonances(T1& collisionProducts, T2& trackProducts, T3& resonanceProducts, T4& groupPositiveTracks, T5& groupNegativeTracks, T6& trackBuilder, T7& indexMap)`
	`513`	`+ template <modes::System system, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>`
	`514`	`+ void fillResonances(T1 const& col, T2& collisionBuilder, T3& collisionProducts, T4& trackProducts, T5& resonanceProducts, T6& groupPositiveTracks, T7& groupNegativeTracks, T8& trackBuilder, T9& indexMap)`
`515`	`515`	`{`
`516`	`516`	`if (!mFillAnyTable) {`
`517`	`517`	`return;`
`518`	`518`	`}`
`519`	`519`	`for (auto const& [positiveTrack, negativeTrack] : o2::soa::combinations(o2::soa::CombinationsFullIndexPolicy(groupPositiveTracks, groupNegativeTracks))) {`
`520`		`- this->fillResonance(collisionProducts, trackProducts, resonanceProducts, positiveTrack, negativeTrack, trackBuilder, indexMap);`
	`520`	`+ this->fillResonance<system>(col, collisionBuilder, collisionProducts, trackProducts, resonanceProducts, positiveTrack, negativeTrack, trackBuilder, indexMap);`
`521`	`521`	`}`
`522`	`522`	`}`
`523`	`523`
`524`		`- template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>`
`525`		`- void fillResonance(T1& collisionProducts, T2& trackProducts, T3& resonanceProducts, T4 const& posDaughter, T4 const& negDaughter, T5& trackBuilder, T6& indexMap)`
	`524`	`+ template <modes::System system, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>`
	`525`	`+ void fillResonance(T1 const& col, T2& collisionBuilder, T3& collisionProducts, T4& trackProducts, T5& resonanceProducts, T6 const& posDaughter, T7 const& negDaughter, T8& trackBuilder, T9& indexMap)`
`526`	`526`	`{`
`527`	`527`
`528`	`528`	`mTwoTrackResonanceSelection.reconstructResonance(posDaughter, negDaughter);`
`@@ -532,6 +532,9 @@ class TwoTrackResonanceBuilder`
`532`	`532`	`mTwoTrackResonanceSelection.applySelections(posDaughter, negDaughter); // for resonances selection are only applied to daughter tracks`
`533`	`533`	`int64_t posDaughterIndex = 0;`
`534`	`534`	`int64_t negDaughterIndex = 0;`
	`535`	`+`
	`536`	`+ collisionBuilder.template fillCollision<system>(collisionProducts, col);`
	`537`	`+`
`535`	`538`	`posDaughterIndex = trackBuilder.template getDaughterIndex<modes::Track::kResonanceDaughter>(posDaughter, trackProducts, collisionProducts, indexMap);`
`536`	`539`	`negDaughterIndex = trackBuilder.template getDaughterIndex<modes::Track::kResonanceDaughter>(negDaughter, trackProducts, collisionProducts, indexMap);`
`537`	`540`
Original file line number	Diff line number	Diff line change
`@@ -371,8 +371,8 @@ class V0Builder`
`371`	`371`	`LOG(info) << "Initialization done...";`
`372`	`372`	`}`
`373`	`373`
`374`		`- template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>`
`375`		`- void fillV0s(T1& collisionProducts, T2& trackProducts, T3& v0products, T4 const& v0s, T5 const& tracks, T6& trackBuilder, T7& indexMap)`
	`374`	`+ template <modes::System system, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>`
	`375`	`+ void fillV0s(T1 const& col, T2& collisionBuilder, T3& collisionProducts, T4& trackProducts, T5& v0products, T6 const& v0s, T7 const& tracks, T8& trackBuilder, T9& indexMap)`
`376`	`376`	`{`
`377`	`377`	`if (!mFillAnyTable) {`
`378`	`378`	`return;`
`@@ -385,10 +385,14 @@ class V0Builder`
`385`	`385`	`}`
`386`	`386`	`mV0Selection.applySelections(v0, tracks);`
`387`	`387`	`if (mV0Selection.passesAllRequiredSelections()) {`
`388`		`- auto posDaughter = v0.template posTrack_as<T5>();`
`389`		`- auto negDaughter = v0.template negTrack_as<T5>();`
	`388`	`+ auto posDaughter = v0.template posTrack_as<T7>();`
	`389`	`+ auto negDaughter = v0.template negTrack_as<T7>();`
	`390`	`+`
	`391`	`+ collisionBuilder.template fillCollision<system>(collisionProducts, col);`
	`392`	`+`
`390`	`393`	`posDaughterIndex = trackBuilder.template getDaughterIndex<modes::Track::kV0Daughter>(posDaughter, trackProducts, collisionProducts, indexMap);`
`391`	`394`	`negDaughterIndex = trackBuilder.template getDaughterIndex<modes::Track::kV0Daughter>(negDaughter, trackProducts, collisionProducts, indexMap);`
	`395`	`+`
`392`	`396`	`if constexpr (modes::isEqual(v0Type, modes::V0::kLambda)) {`
`393`	`397`	`fillLambda(collisionProducts, v0products, v0, 1.f, posDaughterIndex, negDaughterIndex);`
`394`	`398`	`}`
`@@ -403,7 +407,7 @@ class V0Builder`
`403`	`407`	`}`
`404`	`408`
`405`	`409`	`template <typename T1, typename T2, typename T3>`
`406`		`- void fillLambda(T1& collisionProducts, T2& v0products, T3 const& v0, float sign, int32_t posDaughterIndex, int32_t negDaughterIndex)`
	`410`	`+ void fillLambda(T1& collisionProducts, T2& v0products, T3 const& v0, float sign, int64_t posDaughterIndex, int64_t negDaughterIndex)`
`407`	`411`	`{`
`408`	`412`	`float mass, massAnti;`
`409`	`413`	`if (sign > 0.f) {`
`@@ -439,7 +443,7 @@ class V0Builder`
`439`	`443`	`}`
`440`	`444`
`441`	`445`	`template <typename T1, typename T2, typename T3>`
`442`		`- void fillK0short(T1& collisionProducts, T2& v0products, T3 const& v0, int posDaughterIndex, int negDaughterIndex)`
	`446`	`+ void fillK0short(T1& collisionProducts, T2& v0products, T3 const& v0, int64_t posDaughterIndex, int64_t negDaughterIndex)`
`443`	`447`	`{`
`444`	`448`	`if (mProduceK0shorts) {`
`445`	`449`	`v0products.producedK0shorts(collisionProducts.producedCollision.lastIndex(),`