PWGCF / FemtoUniverse : Updating the CentFT0C table in Table Producer…

… tasks (#4633) * Adding cent selection for Run3 Only * Adding CentFT0C only for Run3 * Removing CentFT0C table * Removing CentFT0C table * Removing CentFT0C table
AliceO2Group · Feb 7, 2024 · fd7d5c0 · fd7d5c0
1 parent e0122d3
commit fd7d5c0
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 23 deletions.
diff --git a/PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h b/PWGCF/FemtoUniverse/Core/FemtoUniverseCollisionSelection.h
@@ -96,20 +96,30 @@ class FemtoUniverseCollisionSelection
     if (std::abs(col.posZ()) > mZvtxMax) {
       return false;
     }
-    if (mCheckIsRun3) {
-      if (mCheckOffline && !col.sel8()) {
-        return false;
-      }
-      if ((col.centFT0C() < mCentMin) || (col.centFT0C() > mCentMax)) {
-        return false;
-      }
-    } else {
-      if (mCheckTrigger && !col.alias_bit(mTrigger)) {
-        return false;
-      }
-      if (mCheckOffline && !col.sel7()) {
-        return false;
-      }
+    if (mCheckTrigger && !col.alias_bit(mTrigger)) {
+      return false;
+    }
+    if (mCheckOffline && !col.sel7()) {
+      return false;
+    }
+    return true;
+  }
+
+  /// Check whether the collisions fulfills the specified selections for Run3
+  /// \tparam T type of the collision
+  /// \param col Collision
+  /// \return whether or not the collisions fulfills the specified selections
+  template <typename T>
+  bool isSelectedRun3(T const& col)
+  {
+    if (std::abs(col.posZ()) > mZvtxMax) {
+      return false;
+    }
+    if (mCheckOffline && !col.sel8()) {
+      return false;
+    }
+    if ((col.centFT0C() < mCentMin) || (col.centFT0C() > mCentMax)) {
+      return false;
     }
     return true;
   }

diff --git a/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerMCTruthTask.cxx b/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerMCTruthTask.cxx
@@ -47,7 +47,7 @@ using namespace o2::framework::expressions;
 namespace o2::aod
 {
 
-using FemtoFullCollisionMC = soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs, aod::McCollisionLabels>::iterator;
+using FemtoFullCollisionMC = soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::McCollisionLabels>::iterator;
 
 } // namespace o2::aod
 

diff --git a/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerReducedTask.cxx b/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerReducedTask.cxx
@@ -48,12 +48,10 @@ namespace o2::aod
 
 using FemtoFullCollision = soa::Join<aod::Collisions,
                                      aod::EvSels,
-                                     aod::Mults,
-                                     aod::CentFT0Cs>::iterator;
+                                     aod::Mults>::iterator;
 using FemtoFullCollisionMC = soa::Join<aod::Collisions,
                                        aod::EvSels,
                                        aod::Mults,
-                                       aod::CentFT0Cs,
                                        aod::McCollisionLabels>::iterator;
 
 using FemtoFullTracks = soa::Join<aod::FullTracks, aod::TracksDCA,

diff --git a/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx b/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx
@@ -55,12 +55,12 @@ namespace o2::aod
 {
 
 using FemtoFullCollision =
-  soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs>::iterator;
+  soa::Join<aod::Collisions, aod::EvSels, aod::Mults>::iterator;
 using FemtoFullCollisionCentRun2 =
-  soa::Join<aod::Collisions, aod::EvSels, aod::CentRun2V0Ms, aod::CentFT0Cs>::iterator;
+  soa::Join<aod::Collisions, aod::EvSels, aod::CentRun2V0Ms>::iterator;
 using FemtoFullCollisionCentRun3 =
   soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs>::iterator;
-using FemtoFullCollisionMC = soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs, aod::McCollisionLabels>::iterator;
+using FemtoFullCollisionMC = soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::McCollisionLabels>::iterator;
 
 using FemtoFullTracks =
   soa::Join<aod::FullTracks, aod::TracksDCA, aod::TOFSignal, aod::pidTPCEl, aod::TrackSelection,
@@ -594,7 +594,7 @@ struct femtoUniverseProducerTask {
     // in case of skimming run - don't store such collisions
     // in case of trigger run - store such collisions but don't store any
     // particle candidates for such collisions
-    if (!colCuts.isSelected(col)) {
+    if (!colCuts.isSelectedRun3(col)) {
       if (ConfIsTrigger) {
         outputCollision(vtxZ, cent, multNtr, spher, mMagField); //////
       }

diff --git a/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTaskV0Only.cxx b/PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTaskV0Only.cxx
@@ -44,7 +44,7 @@ namespace o2::aod
 {
 
 using FemtoFullCollision =
-  soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs>::iterator;
+  soa::Join<aod::Collisions, aod::EvSels, aod::Mults>::iterator;
 using FemtoFullTracks =
   soa::Join<aod::FullTracks, aod::TracksDCA, aod::TOFSignal, aod::pidTPCEl,
             aod::pidTPCMu, aod::pidTPCPi, aod::pidTPCKa, aod::pidTPCPr,