Fix: various bug fixes

Author: ariedel-cern

PWGCF/Femto/Core/cascadeBuilder.h

@@ -669,7 +669,7 @@ class CascadeBuilder
   }
 
   template <typename T1, typename T2, typename T3, typename T4>
-  void fillCascade(T1& collisionBuilder, T2& cascadeProducts, T3 const& cascade, T4 const& col, int bachelorIndex, int posDaughterIndex, int negDaughterIndex)
+  void fillCascade(T1& collisionBuilder, T2& cascadeProducts, T3 const& cascade, T4 const& col, int64_t bachelorIndex, int64_t posDaughterIndex, int64_t negDaughterIndex)
   {
     float strangeTofBachelor = 0.f;
     float strangeTofPosDau = 0.f;

PWGCF/Femto/Core/cascadeHistManager.h

@@ -475,7 +475,7 @@ class CascadeHistManager
       this->fillAnalysis(cascadeCandidate);
     }
     if constexpr (modes::isFlagSet(mode, modes::Mode::kQa)) {
-      this->fillQa(cascadeCandidate, bachelor, negDaughter, posDaughter);
+      this->fillQa(cascadeCandidate, bachelor, posDaughter, negDaughter);
     }
     if constexpr (modes::isFlagSet(mode, modes::Mode::kMc)) {
       this->template fillMc<mode>(cascadeCandidate, col, mcParticles, mcMothers, mcPartonicMothers);

PWGCF/Femto/Core/pairBuilder.h

@@ -398,14 +398,6 @@ class PairV0V0Builder
                   << "). Overriding sameSpecies to false.";
         mSameSpecies = false;
       }
-    } else {
-      // same v0 species: both values are legitimate (e.g. lambda-lambda vs lambda-antilambda),
-      // but running as different species only makes sense if the two selections are disjoint
-      if (!mSameSpecies && confV0Selection1.sign.value == confV0Selection2.sign.value) {
-        LOG(warn) << "sameSpecies=false for identical v0 species with identical sign ("
-                  << confV0Selection1.sign.value << "). If both selections match the same "
-                  << "candidates, this produces self-pairs and double counting.";
-      }
     }
 
     mColHistManager.template init<modeSe>(registry, colHistSpec, confCollisionBinning);
@@ -1910,17 +1902,17 @@ class PairTrackCascadeBuilder
   }
 
   template <modes::Mode mode, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
-  void processMixedEvent(T1 const& cols, T2& trackTable, T3& trackPartition, T4& v0Partition, T5& cache, T6& binsVtxMult, T7& binsVtxCent, T8& binsVtxMultCent)
+  void processMixedEvent(T1 const& cols, T2& trackTable, T3& trackPartition, T4& cascadePartition, T5& cache, T6& binsVtxMult, T7& binsVtxCent, T8& binsVtxMultCent)
   {
     switch (mMixingPolicy) {
       case static_cast<int>(pairhistmanager::kVtxMult):
-        pairprocesshelpers::processMixedEvent<mode>(cols, trackPartition, v0Partition, trackTable, cache, binsVtxMult, mMixingDepth, mPairHistManagerMe, mCprMe, mPcMe);
+        pairprocesshelpers::processMixedEvent<mode>(cols, trackPartition, cascadePartition, trackTable, cache, binsVtxMult, mMixingDepth, mPairHistManagerMe, mCprMe, mPcMe);
         break;
       case static_cast<int>(pairhistmanager::kVtxCent):
-        pairprocesshelpers::processMixedEvent<mode>(cols, trackPartition, v0Partition, trackTable, cache, binsVtxCent, mMixingDepth, mPairHistManagerMe, mCprMe, mPcMe);
+        pairprocesshelpers::processMixedEvent<mode>(cols, trackPartition, cascadePartition, trackTable, cache, binsVtxCent, mMixingDepth, mPairHistManagerMe, mCprMe, mPcMe);
         break;
       case static_cast<int>(pairhistmanager::kVtxMultCent):
-        pairprocesshelpers::processMixedEvent<mode>(cols, trackPartition, v0Partition, trackTable, cache, binsVtxMultCent, mMixingDepth, mPairHistManagerMe, mCprMe, mPcMe);
+        pairprocesshelpers::processMixedEvent<mode>(cols, trackPartition, cascadePartition, trackTable, cache, binsVtxMultCent, mMixingDepth, mPairHistManagerMe, mCprMe, mPcMe);
         break;
       default:
         LOG(fatal) << "Invalid binning policiy specifed. Breaking...";

PWGCF/Femto/Core/tripletProcessHelpers.h

@@ -35,7 +35,9 @@ enum TripletOrder : uint8_t {
   kOrder123, // no swap
   kOrder213, // swap 1&2: for the case that particle 1 & 2 are the same species, particle 3 is something else
   kOrder132, // swap 2&3
-  kOrder321, // reverse: swap 1&3
+  kOrder231, // swap 1&2 & 1&3
+  kOrder312, // swap 2&3 & 1&3
+  kOrder321, // swap 1&3
 };
 
 // process same event for identical 3 particles
@@ -76,6 +78,12 @@ bool processSameEvent(T1 const& SliceParticle,
       case kOrder132:
         TripletHistManager.setTriplet(p1, p3, p2, Collision);
         break;
+      case kOrder231:
+        TripletHistManager.setTriplet(p2, p3, p1, Collision);
+        break;
+      case kOrder312:
+        TripletHistManager.setTriplet(p3, p1, p2, Collision);
+        break;
       case kOrder321:
         TripletHistManager.setTriplet(p3, p2, p1, Collision);
         break;
@@ -291,6 +299,12 @@ bool processSameEvent(T1 const& SliceParticle,
       case kOrder132:
         TripletHistManager.setTripletMc(p1, p3, p2, mcParticles, Collision, mcCollisions);
         break;
+      case kOrder231:
+        TripletHistManager.setTripletMc(p2, p3, p1, mcParticles, Collision, mcCollisions);
+        break;
+      case kOrder312:
+        TripletHistManager.setTripletMc(p3, p1, p2, mcParticles, Collision, mcCollisions);
+        break;
       case kOrder321:
         TripletHistManager.setTripletMc(p3, p2, p1, mcParticles, Collision, mcCollisions);
         break;
@@ -403,7 +417,6 @@ bool processSameEvent(T1 const& SliceParticle1,
 }
 
 // process same event for 3 different particles with mc information
-// NOTE: added `Cleaner1`, `Cleaner2`, `Cleaner3` (one per species)
 template <modes::Mode mode,
           typename T1,
           typename T2,
@@ -498,13 +511,6 @@ bool processSameEvent(T1 const& SliceParticle1,
 }
 
 // --- mc truth only (kMc without kReco): triplets of generated particles ---------------------------
-// These are named processSameEventMcTruth (not processSameEvent) on purpose: several of the reco
-// overloads have the same number of arguments and every parameter is a template type, so the call
-// would be ambiguous.
-// The particles ARE the truth, so there is no track table, no reco counterpart and no charge rescaling.
-// The close triplet rejection and the triplet cleaner take the table of mc particles where the reco
-// helpers take the track table; both ignore it in the track-track-track case.
-
 // process same event for identical 3 mc particles
 template <modes::Mode mode,
           typename T1,
@@ -548,16 +554,24 @@ bool processSameEventMcTruth(T1 const& SliceParticle,
 
     // Randomize triplet order if enabled, then compute the kinematic (Q3) for this triplet
     switch (tripletOrder) {
+      case kOrder123:
+        TripletHistManager.setTripletMcTruth(p1, p2, p3, Collision);
+        break;
       case kOrder213:
         TripletHistManager.setTripletMcTruth(p2, p1, p3, Collision);
         break;
       case kOrder132:
         TripletHistManager.setTripletMcTruth(p1, p3, p2, Collision);
         break;
+      case kOrder231:
+        TripletHistManager.setTripletMcTruth(p2, p3, p1, Collision);
+        break;
+      case kOrder312:
+        TripletHistManager.setTripletMcTruth(p3, p1, p2, Collision);
+        break;
       case kOrder321:
         TripletHistManager.setTripletMcTruth(p3, p2, p1, Collision);
         break;
-      case kOrder123:
       default:
         TripletHistManager.setTripletMcTruth(p1, p2, p3, Collision);
         break;
@@ -729,7 +743,6 @@ bool processSameEventMcTruth(T1 const& SliceParticle1,
 }
 
 // process mixed event
-// (no cleaner here — ParticleCleaner only operates on MC info, see the mc overload below)
 template <modes::Mode mode,
           typename T1,
           typename T2,
@@ -843,8 +856,6 @@ void processMixedEvent(T1 const& Collisions,
 }
 
 // process mixed event in mc
-// NOTE: added `mcMothers`, `mcPartonicMothers` (missing in the original — mixed-event mc triplets
-// were never mc-cleaned via TcManager) plus `Cleaner1`, `Cleaner2`, `Cleaner3`
 template <modes::Mode mode,
           typename T1,
           typename T2,

PWGCF/Femto/Core/twoTrackResonanceHistManager.h

@@ -216,8 +216,8 @@ class TwoTrackResonanceHistManager
         negDauPdgCodeAbs = std::abs(PDG_t::kPiMinus);
       } else {
         mPdgCode = -1 * mPdgCode;
-        posDauPdgCodeAbs = std::abs(PDG_t::kKMinus);
-        negDauPdgCodeAbs = std::abs(PDG_t::kPiPlus);
+        posDauPdgCodeAbs = std::abs(PDG_t::kPiPlus);
+        negDauPdgCodeAbs = std::abs(PDG_t::kKMinus);
       }
     } else {
       LOG(fatal) << "PDG code for TwoTrackResonance has to be either Rho, Phi or K^0*(892)";

PWGCF/Femto/Core/v0HistManager.h

@@ -618,7 +618,7 @@ class V0HistManager
       massLambda = v0candidate.massLambda();
       massAntiLambda = v0candidate.massAntiLambda();
       tofPosDau = posDau.tofNSigmaPi();
-      tofNegDau = posDau.tofNSigmaPi();
+      tofNegDau = negDau.tofNSigmaPi();
     }
 
     mHistogramRegistry->fill(HIST(v0Prefix) + HIST(QaDir) + HIST(getHistName(kMassLambda, HistTable)), massLambda);

PWGCF/Femto/DataModel/FemtoTables.h

@@ -216,11 +216,11 @@ DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt, //! transverse momentum
                            });
 DECLARE_SOA_DYNAMIC_COLUMN(Px, px, //! momentum in x
                            [](float pt, float phi) -> float {
-                             return std::fabs(pt) * std::sin(phi);
+                             return std::fabs(pt) * std::cos(phi);
                            });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, //! momentum in y
                            [](float pt, float phi) -> float {
-                             return std::fabs(pt) * std::cos(phi);
+                             return std::fabs(pt) * std::sin(phi);
                            });
 DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, //! momentum in z
                            [](float pt, float eta) -> float {