Add estimator type to CFMultiplicities table for task lookup

Author: EmilGorm

PWGCF/DataModel/CorrelationsDerived.h

@@ -58,8 +58,20 @@ using CFMcParticle = CFMcParticles::iterator;
 namespace cfmultiplicity
 {
 DECLARE_SOA_COLUMN(Multiplicity, multiplicity, float);
-}
-DECLARE_SOA_TABLE(CFMultiplicities, "AOD", "CFMULTIPLICITY", cfmultiplicity::Multiplicity);
+DECLARE_SOA_COLUMN(Estimator, multiplicityEstimator, uint8_t); //! Source used for the multiplicity value
+enum EstimatorType : uint8_t {
+  Tracks,
+  FT0M,
+  FT0C,
+  FT0CVariant1,
+  FT0CVariant2,
+  FT0A,
+  CentNGlobal,
+  Run2V0M,
+  MCParticles,
+};
+} // namespace cfmultiplicity
+DECLARE_SOA_TABLE(CFMultiplicities, "AOD", "CFMULTIPLICITY", cfmultiplicity::Multiplicity, cfmultiplicity::Estimator);
 
 using CFMultiplicity = CFMultiplicities::iterator;
 

PWGCF/TableProducer/filterCorrelations.cxx

@@ -339,6 +339,9 @@ struct FilterCF {
   template <bool applyDCA, typename TCollision, typename TTracks>
   float getCorrectedMultiplicity(const TCollision& collision, const TTracks& tracks, uint64_t timestamp)
   {
+    if (collision.multiplicityEstimator() != aod::cfmultiplicity::Tracks) {
+      LOGF(fatal, "Efficiency-corrected multiplicity requires MultiplicitySelector::processTracks, but estimator type %u was configured", static_cast<unsigned int>(collision.multiplicityEstimator()));
+    }
     auto* efficiency = loadMultiplicityEfficiency(timestamp);
     double correctedMultiplicity = 0.;
     for (const auto& track : tracks) {
@@ -719,69 +722,69 @@ struct MultiplicitySelector {
 
   void processTracks(aod::Collision const&, soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection>> const& tracks)
   {
-    output(tracks.size());
+    output(tracks.size(), aod::cfmultiplicity::Tracks);
   }
   PROCESS_SWITCH(MultiplicitySelector, processTracks, "Select track count as multiplicity", false);
 
   void processFT0M(aod::CentFT0Ms const& centralities)
   {
     for (auto& c : centralities) {
-      output(c.centFT0M());
+      output(c.centFT0M(), aod::cfmultiplicity::FT0M);
     }
   }
   PROCESS_SWITCH(MultiplicitySelector, processFT0M, "Select FT0M centrality as multiplicity", false);
 
   void processFT0C(aod::CentFT0Cs const& centralities)
   {
     for (auto& c : centralities) {
-      output(c.centFT0C());
+      output(c.centFT0C(), aod::cfmultiplicity::FT0C);
     }
   }
   PROCESS_SWITCH(MultiplicitySelector, processFT0C, "Select FT0C centrality as multiplicity", false);
 
   void processFT0CVariant1(aod::CentFT0CVariant1s const& centralities)
   {
     for (auto& c : centralities) {
-      output(c.centFT0CVariant1());
+      output(c.centFT0CVariant1(), aod::cfmultiplicity::FT0CVariant1);
     }
   }
   PROCESS_SWITCH(MultiplicitySelector, processFT0CVariant1, "Select FT0CVariant1 centrality as multiplicity", false);
 
   void processFT0CVariant2(aod::CentFT0CVariant2s const& centralities)
   {
     for (auto& c : centralities) {
-      output(c.centFT0CVariant2());
+      output(c.centFT0CVariant2(), aod::cfmultiplicity::FT0CVariant2);
     }
   }
   PROCESS_SWITCH(MultiplicitySelector, processFT0CVariant2, "Select FT0CVariant2 centrality as multiplicity", false);
 
   void processFT0A(aod::CentFT0As const& centralities)
   {
     for (auto& c : centralities) {
-      output(c.centFT0A());
+      output(c.centFT0A(), aod::cfmultiplicity::FT0A);
     }
   }
   PROCESS_SWITCH(MultiplicitySelector, processFT0A, "Select FT0A centrality as multiplicity", false);
 
   void processCentNGlobal(aod::CentNGlobals const& centralities)
   {
     for (auto& c : centralities) {
-      output(c.centNGlobal());
+      output(c.centNGlobal(), aod::cfmultiplicity::CentNGlobal);
     }
   }
   PROCESS_SWITCH(MultiplicitySelector, processCentNGlobal, "Select CentNGlobal centrality as multiplicity", false);
 
   void processRun2V0M(aod::CentRun2V0Ms const& centralities)
   {
     for (auto& c : centralities) {
-      output(c.centRun2V0M());
+      output(c.centRun2V0M(), aod::cfmultiplicity::Run2V0M);
     }
   }
   PROCESS_SWITCH(MultiplicitySelector, processRun2V0M, "Select V0M centrality as multiplicity", true);
 
   void processMCGen(aod::McCollision const&, aod::McParticles const& particles)
   {
-    output(particles.size());
+    output(particles.size(), aod::cfmultiplicity::MCParticles);
   }
   PROCESS_SWITCH(MultiplicitySelector, processMCGen, "Select MC particle count as multiplicity", false);
 };