[PWGHF] taskCorrelationsEfficiencies: apply selections on generated tracks and collisions

PWGHF/HFC/TableProducer/derivedDataCreatorCorrelationsReduced.cxx

@@ -17,7 +17,6 @@
 
 #include "PWGHF/Core/CentralityEstimation.h"
 #include "PWGHF/Core/DecayChannels.h"
-#include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/AliasTables.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
@@ -33,7 +32,6 @@
 
 #include <CCDB/BasicCCDBManager.h>
 #include <CommonConstants/MathConstants.h>
-#include <CommonConstants/PhysicsConstants.h>
 #include <Framework/ASoA.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisHelpers.h>
@@ -157,7 +155,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
   void init(InitContext&)
   {
 
-    hfEvSel.addHistograms(registry); // collision monitoring
+    hfEvSel.init(registry);
+
     ccdb->setURL(ccdbUrl);
     ccdb->setCaching(true);
     ccdb->setLocalObjectValidityChecking();
@@ -176,7 +175,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
       return;
     }
 
-    hfcFlowHelper.init(ccdb, registry, classesMl, yCandMax.value);
+    hfcFlowHelper.init(classesMl, yCandMax.value);
 
     const AxisSpec axisTpcSignal = {binsTpcSignal, "TPC Signal"};
     const AxisSpec axisCent = {binsCent, "Centrality"};
@@ -209,32 +208,6 @@ struct HfDerivedDataCreatorCorrelationsReduced {
     }
   }; // end init
 
-  /// Check event selections for collision and fill the collision table
-  /// \param collision is the collision
-  template <typename Coll>
-  bool checkCollision(Coll const& collision, float& cent, float& mult)
-  {
-    o2::hf_evsel::HfCollisionRejectionMask collRejMask{};
-    if (centEstimator == CentralityEstimator::FT0A) {
-      collRejMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::FT0A, aod::BCsWithTimestamps>(collision, cent, ccdb, registry);
-      mult = collision.multFT0A();
-    } else if (centEstimator == CentralityEstimator::FT0C) {
-      collRejMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::FT0C, aod::BCsWithTimestamps>(collision, cent, ccdb, registry);
-      mult = collision.multFT0C();
-    } else if (centEstimator == CentralityEstimator::FT0M) {
-      collRejMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::FT0M, aod::BCsWithTimestamps>(collision, cent, ccdb, registry);
-      mult = collision.multFT0M();
-    } else if (centEstimator == CentralityEstimator::FV0A) {
-      collRejMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::FV0A, aod::BCsWithTimestamps>(collision, cent, ccdb, registry);
-      mult = collision.multFV0A();
-    } else {
-      LOG(fatal) << "Centrality estimator not recognized for collision selection";
-      std::abort();
-    }
-    hfEvSel.fillHistograms(collision, collRejMask, cent);
-    return collRejMask == 0;
-  }
-
   /// Checks if the trigger cand-associated track pair can be accepted for SE correlation
   /// \param assTrk is the associated track
   /// \param cand is the trigger candidate
@@ -404,7 +377,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
       return;
     }
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -421,7 +395,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
       return;
     }
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -441,7 +416,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
       return;
     }
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -461,7 +437,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
       return;
     }
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -482,7 +459,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
       return;
     }
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -502,7 +480,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
       return;
     }
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -523,7 +502,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
       return;
     }
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -543,7 +523,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
       return;
     }
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -564,7 +545,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
       return;
     }
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -582,7 +564,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
       return;
     }
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -602,7 +585,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
       return;
     }
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -622,7 +606,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
       return;
     }
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -643,7 +628,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
       return;
     }
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -663,7 +649,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
       return;
     }
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -684,7 +671,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
       return;
     }
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -704,7 +692,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
       return;
     }
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -720,7 +709,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
                                  TracksData const& tracks)
   {
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -733,7 +723,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
                                  TracksData const& tracks)
   {
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -747,7 +738,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
                                TracksMc const& tracks)
   {
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -760,7 +752,8 @@ struct HfDerivedDataCreatorCorrelationsReduced {
                                TracksMc const& tracks)
   {
     float cent{-1.}, mult{-1.};
-    if (!checkCollision(coll, cent, mult)) {
+    auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
+    if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
       return;
     }
     rowCollisions(mult, coll.numContrib(), cent, coll.posZ());
@@ -769,7 +762,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
   PROCESS_SWITCH(HfDerivedDataCreatorCorrelationsReduced, processMcHadronHadronME, "Process Mixed Event for hadron candidates", false);
 };
 
-WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+WorkflowSpec defineDataProcessing(ConfigContext const& context)
 {
-  return WorkflowSpec{adaptAnalysisTask<HfDerivedDataCreatorCorrelationsReduced>(cfgc)};
+  return WorkflowSpec{adaptAnalysisTask<HfDerivedDataCreatorCorrelationsReduced>(context)};
 }