Multiplicity set output from FilterCF

Author: jaelpark

PWGCF/DataModel/CorrelationsDerived.h

@@ -91,7 +91,7 @@ namespace cfmultiplicityset
 {
 DECLARE_SOA_COLUMN(Multiplicities, multiplicities, std::vector<float>); //! List of auxiliary multiplicities
 }
-DECLARE_SOA_TABLE(CFMultiplicitySets, "AOD", "CFMULTSET", cfmultiplicityset::Multiplicities); //! Auxilary multiplicity set table
+DECLARE_SOA_TABLE(CFMultiplicitySets, "AOD", "CFMULTIPLICITYSET", cfmultiplicityset::Multiplicities); //! Auxilary multiplicity set table
 
 using CFMultiplicitySet = CFMultiplicitySets::iterator;
 

PWGCF/TableProducer/filterCorrelations.cxx

@@ -64,6 +64,13 @@ struct FilterCF {
     kPIDProton = BIT(1)
   };
 
+  enum MultiplicityEstimators : uint8_t {
+    kCentFT0C = BIT(0),
+    kMultFV0A = BIT(1),
+    kMultNTracksPV = BIT(2),
+    kMultNTracksGlobal = BIT(3),
+  };
+
   // Configuration
   O2_DEFINE_CONFIGURABLE(cfgCutVertex, float, 7.0f, "Accepted z-vertex range")
   O2_DEFINE_CONFIGURABLE(cfgCutPt, float, 0.5f, "Minimal pT for tracks")
@@ -90,6 +97,7 @@ struct FilterCF {
   O2_DEFINE_CONFIGURABLE(tpcnclusters, int, 50, "minimum number of TPC clusters found")
   O2_DEFINE_CONFIGURABLE(chi2pertpccluster, float, 2.5, "maximum Chi2 / cluster for the TPC track segment")
   O2_DEFINE_CONFIGURABLE(chi2peritscluster, float, 36, "maximum Chi2 / cluster for the ITS track segment")
+  O2_DEFINE_CONFIGURABLE(cfgEstimatorBitMask, uint16_t, 0, "BitMask for multiplicity estimators to be included in the CFMultiplicitySet tables.");
 
   // Filters and input definitions
   Filter collisionZVtxFilter = nabs(aod::collision::posZ) < cfgCutVertex;
@@ -117,6 +125,9 @@ struct FilterCF {
   Produces<aod::CFTrackRefs> outputTrackRefs;
   Produces<aod::CFMcParticleRefs> outputMcParticleRefs;
 
+  Produces<aod::CFMultiplicitySets> outputMultSets;
+  std::vector<float> multiplicities{};
+
   // persistent caches
   std::vector<bool> mcReconstructedCache;
   std::vector<int> mcParticleLabelsCache;
@@ -238,6 +249,9 @@ struct FilterCF {
     return 0;
   }
 
+  template <class T>
+  using HasMultTables = decltype(std::declval<T&>().multNTracksPV());
+
   /// \brief Templetized process data for a given collision and its associated tracks
   /// \param collision The collision object containing information about the collision
   /// \param tracks The collection of tracks associated with the collision
@@ -255,6 +269,19 @@ struct FilterCF {
     auto bc = collision.template bc_as<aod::BCsWithTimestamps>();
     outputCollisions(bc.runNumber(), collision.posZ(), collision.multiplicity(), bc.timestamp());
 
+    if constexpr (std::experimental::is_detected<HasMultTables, typename T1::iterator>::value) {
+      multiplicities.clear();
+      if (cfgEstimatorBitMask & kCentFT0C)
+        multiplicities.push_back(collision.centFT0C());
+      if (cfgEstimatorBitMask & kMultFV0A)
+        multiplicities.push_back(collision.multFV0A());
+      if (cfgEstimatorBitMask & kMultNTracksPV)
+        multiplicities.push_back(collision.multNTracksPV());
+      if (cfgEstimatorBitMask & kMultNTracksGlobal)
+        multiplicities.push_back(collision.multNTracksGlobal());
+      outputMultSets(multiplicities);
+    }
+
     if (cfgTransientTables)
       outputCollRefs(collision.globalIndex());
     for (auto& track : tracks) {
@@ -283,6 +310,12 @@ struct FilterCF {
   }
   PROCESS_SWITCH(FilterCF, processDataPid, "Process data with PID", false);
 
+  void processDataMults(soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CFMultiplicities, aod::CentFT0Cs, aod::PVMults, aod::FV0Mults, aod::MultsGlobal>>::iterator const& collision, aod::BCsWithTimestamps const&, soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::TracksDCA>> const& tracks)
+  {
+    processDataT(collision, tracks);
+  }
+  PROCESS_SWITCH(FilterCF, processDataMults, "Process data with multiplicity sets", false);
+
   /// \brief Process MC data for a given set of MC collisions and associated particles and tracks
   /// \param mcCollisions The collection of MC collisions
   /// \param allParticles The collection of all MC particles
@@ -548,43 +581,9 @@ struct MultiplicitySelector {
   PROCESS_SWITCH(MultiplicitySelector, processMCGen, "Select MC particle count as multiplicity", false);
 };
 
-struct MultiplicitySetBuilder {
-  Produces<aod::CFMultiplicitySets> output;
-  std::vector<float> multiplicities{};
-
-  enum MultiplicityEstimators : uint8_t {
-    kCentFT0C = BIT(0),
-    kMultFV0A = BIT(1),
-    kMultNTracksPV = BIT(2),
-    kMultNTracksGlobal = BIT(3),
-  };
-
-  O2_DEFINE_CONFIGURABLE(cfgEstimatorBitMask, uint16_t, 0, "BitMask for multiplicity estimators to be included in the CFMultiplicitySet tables.");
-
-  using CollisionWithCents = soa::Join<aod::Collisions, aod::CentFT0Cs, aod::PVMults, aod::FV0Mults, aod::MultsGlobal>;
-  void processEstimators([[maybe_unused]] CollisionWithCents const& cents, aod::CFCollRefs const& cfcollisions)
-  {
-    for (const auto& cfcollision : cfcollisions) {
-      const auto& collision = cfcollision.collision_as<CollisionWithCents>();
-      multiplicities.clear();
-      if (cfgEstimatorBitMask & kCentFT0C)
-        multiplicities.push_back(collision.centFT0C());
-      if (cfgEstimatorBitMask & kMultFV0A)
-        multiplicities.push_back(collision.multFV0A());
-      if (cfgEstimatorBitMask & kMultNTracksPV)
-        multiplicities.push_back(collision.multNTracksPV());
-      if (cfgEstimatorBitMask & kMultNTracksGlobal)
-        multiplicities.push_back(collision.multNTracksGlobal());
-      output(multiplicities);
-    }
-  }
-  PROCESS_SWITCH(MultiplicitySetBuilder, processEstimators, "Process auxiliary multiplicity/centrality estimators", false);
-};
-
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
     adaptAnalysisTask<FilterCF>(cfgc),
-    adaptAnalysisTask<MultiplicitySelector>(cfgc),
-    adaptAnalysisTask<MultiplicitySetBuilder>(cfgc)};
+    adaptAnalysisTask<MultiplicitySelector>(cfgc)};
 }