updated files for resonance selection

The partitions for particle selection in pair-task and debug-task were
changed due to change in the way of how FDParticles is filled inside the
producer task. The task was renamed and no longer needed files are
removed.

Author: Christopher Klumm

PWGCF/DataModel/FemtoDerived.h

@@ -8,7 +8,6 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-
 #ifndef PWGCF_DATAMODEL_FEMTODERIVED_H_
 #define PWGCF_DATAMODEL_FEMTODERIVED_H_
 
@@ -98,15 +97,15 @@ enum ParticleType {
   kReso,                       //! Resonances (phi)
   kResoChild,                  // Child track of a Resonance
   kV0Child,                    //! Child track of a V0
-  kPhiPosdaughTPC_NegdaughTPC, /// cases for Phi-daughters for TPC or TOF combinations
-  kPhiPosdaughTPC_NegdaughTOF,
-  kPhiPosdaughTOF_NegdaughTPC,
-  kPhiPosdaughTOF_NegdaughTOF,
   kCascade, //! Cascade
   kCascadeV0,
   kCascadeV0Child,
   kCascadeBachelor, //! Bachelor track of a cascade
   kCharmHadron,     //! Bachelor track of a cascade
+  kPhiPosdaughTPC_NegdaughTPC, /// cases for Phi-daughters for TPC or TOF combinations
+  kPhiPosdaughTPC_NegdaughTOF,
+  kPhiPosdaughTOF_NegdaughTPC,
+  kPhiPosdaughTOF_NegdaughTOF,
   kNParticleTypes   //! Number of particle types
 };
 

PWGCF/FemtoDream/Core/femtoDreamContainer.h

@@ -235,7 +235,7 @@ class FemtoDreamContainer
     if (extendedplots) {
       mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/relPairkstarmTPtPart1PtPart2MultPercentile"), femtoObs, mT, part1.pt(), part2.pt(), multPercentile);
 
-      if constexpr (std::is_same_v<T1, FDParticle> && std::is_same_v<T2, FDParticle>) {
+      if constexpr (requires { part1.mLambda(); part2.mLambda(); }) {
         mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/pT1pT2kstarinvMassPart1invMassPart2"), part1.pt(), part2.pt(), femtoObs, part1.mLambda(), part2.mLambda());
       }
     }

PWGCF/FemtoDream/Core/femtoDreamResoSelection.h

@@ -272,7 +272,7 @@ void FemtoDreamResoSelection::setDaughterCuts(femtoDreamResoSelection::Daughtert
 {
   if (daugh == femtoDreamResoSelection::kPosdaugh) {
     PosDaughTrack.setSelection(selVal, selVar, selType);
-  };
+  }
   if (daugh == femtoDreamResoSelection::kNegdaugh) {
     NegDaughTrack.setSelection(selVal, selVar, selType);
   }
@@ -346,25 +346,23 @@ template <typename cutContainerType, typename V>
 std::array<cutContainerType, 5> FemtoDreamResoSelection::getCutContainer(V const& track1, V const& track2, float sign)
 {
   cutContainerType outputSign = 0;
+  cutContainerType outputPID = 0;
   size_t counter = 0;
   for (auto& sel : mSelections) { /// it should just be a 1D vector with sign
     const auto selVariable = sel.getSelectionVariable();
     if (selVariable == femtoDreamResoSelection::kResoSign) {
       sel.checkSelectionSetBit(sign, outputSign, counter, nullptr);
     }
   }
-  cutContainerType outputPID = 0;
 
   const auto DCA1 = std::sqrt(track1.dcaXY() * track1.dcaXY() + track1.dcaZ() * track1.dcaZ());
   const auto DCA2 = std::sqrt(track2.dcaXY() * track2.dcaXY() + track2.dcaZ() * track2.dcaZ());
 
   auto outputPosTrack = PosDaughTrack.getCutContainer<false, cutContainerType>(track1, track1.pt(), track1.eta(), DCA1); // false for useItsPid
   auto outputNegTrack = NegDaughTrack.getCutContainer<false, cutContainerType>(track2, track2.pt(), track2.eta(), DCA2);
 
-  const auto shiftvalue = numBitsUsed(outputNegTrack.at(femtoDreamTrackSelection::TrackContainerPosition::kPID));
-  outputPID = (outputPosTrack.at(femtoDreamTrackSelection::TrackContainerPosition::kPID) << shiftvalue) | outputNegTrack.at(femtoDreamTrackSelection::TrackContainerPosition::kPID);
-  /// combine both outputs
-  outputPID = (outputPID << counter) | outputSign;
+  const auto shiftvalue = numBitsUsed(outputSign);
+  outputPID = (outputNegTrack.at(femtoDreamTrackSelection::TrackContainerPosition::kPID) << shiftvalue) | outputSign;
 
   std::array<cutContainerType, 5> bitmask = {outputPID,
                                              outputPosTrack.at(femtoDreamTrackSelection::TrackContainerPosition::kCuts),