Update efficiency estimation + multiplicity classifier

Author: abmodak

PWGCF/TwoParticleCorrelations/Tasks/longrangeCorrelation.cxx

@@ -92,12 +92,15 @@ enum KindOfCorrType {
 
 enum {
   kSpeciesbegin = 0,
-  kSpPion = 1,
+  kSpPrimary = 1,
+  kSpRecoAll,
+  kSpRecoPrimary,
+  kSpPion,
   kSpKaon,
   kSpProton,
-  kBkg,
+  kSpOther,
   kSpNotPrimary,
-  kSpAll,
+  kSpFake,
   kSpeciesend
 };
 
@@ -870,7 +873,7 @@ struct LongrangeCorrelation {
       if (!isGenTrackSelected(particle)) {
         continue;
       }
-      histos.fill(HIST("hmcgendndpt"), particle.eta(), particle.pt(), static_cast<double>(kSpAll), multiplicity, mcCollision.posZ());
+      histos.fill(HIST("hmcgendndpt"), particle.eta(), particle.pt(), static_cast<double>(kSpPrimary), multiplicity, mcCollision.posZ());
       int pid = 0;
       switch (std::abs(particle.pdgCode())) {
         case PDG_t::kPiPlus:
@@ -882,6 +885,9 @@ struct LongrangeCorrelation {
         case PDG_t::kProton:
           pid = kSpProton;
           break;
+	default:
+          pid = kSpOther;
+          break;
       }
       histos.fill(HIST("hmcgendndpt"), particle.eta(), particle.pt(), static_cast<double>(pid), multiplicity, mcCollision.posZ());
     } // track (mcgen) loop
@@ -891,13 +897,13 @@ struct LongrangeCorrelation {
         continue;
       }
       auto recTracksPart = RecTracks.sliceBy(perColMC, RecCol.globalIndex());
-      std::vector<int> mclabels;
       for (const auto& Rectrack : recTracksPart) {
         if (Rectrack.has_mcParticle()) {
-          int pid = kBkg;
-          auto mcpart = Rectrack.template mcParticle_as<aod::McParticles>();
+          int pid = 0;
+	  auto mcpart = Rectrack.mcParticle();
+	  histos.fill(HIST("hmcrecdndpt"), mcpart.eta(), mcpart.pt(), static_cast<double>(kSpRecoAll), multiplicity, mcCollision.posZ()); 
           if (mcpart.isPhysicalPrimary()) {
-            histos.fill(HIST("hmcrecdndpt"), mcpart.eta(), mcpart.pt(), static_cast<double>(kSpAll), multiplicity, mcCollision.posZ());
+            histos.fill(HIST("hmcrecdndpt"), mcpart.eta(), mcpart.pt(), static_cast<double>(kSpRecoPrimary), multiplicity, mcCollision.posZ());
             switch (std::abs(mcpart.pdgCode())) {
               case PDG_t::kPiPlus:
                 pid = kSpPion;
@@ -908,17 +914,16 @@ struct LongrangeCorrelation {
               case PDG_t::kProton:
                 pid = kSpProton;
                 break;
+	      default:
+		pid = kSpOther;
+		break;
             }
           } else {
             pid = kSpNotPrimary;
           }
-          if (find(mclabels.begin(), mclabels.end(), Rectrack.mcParticleId()) != mclabels.end()) {
-            pid = kBkg;
-          }
-          mclabels.push_back(Rectrack.mcParticleId());
-          histos.fill(HIST("hmcrecdndpt"), mcpart.eta(), mcpart.pt(), static_cast<double>(pid), multiplicity, mcCollision.posZ());
+	  histos.fill(HIST("hmcrecdndpt"), mcpart.eta(), mcpart.pt(), static_cast<double>(pid), multiplicity, mcCollision.posZ());
         } else {
-          histos.fill(HIST("hmcrecdndpt"), Rectrack.eta(), Rectrack.pt(), static_cast<double>(kBkg), multiplicity, mcCollision.posZ());
+          histos.fill(HIST("hmcrecdndpt"), Rectrack.eta(), Rectrack.pt(), static_cast<double>(kSpFake), multiplicity, mcCollision.posZ());
         }
       } // track (mcrec) loop
     } // rec collision
@@ -944,6 +949,7 @@ struct MultiplicityClassifier {
   Configurable<float> dcaZ{"dcaZ", 0.2f, "Custom DCA Z cut (ignored if negative)"};
   Configurable<float> cfgPtCutMin{"cfgPtCutMin", 0.2f, "minimum accepted track pT"};
   Configurable<float> cfgPtCutMax{"cfgPtCutMax", 3.0f, "maximum accepted track pT"};
+  HistogramRegistry histos{"histos", {}, OutputObjHandlingPolicy::AnalysisObject};
 
   Filter fTrackSelectionITS = ncheckbit(aod::track::v001::detectorMap, (uint8_t)o2::aod::track::ITS) &&
                               ncheckbit(aod::track::trackCutFlag, TrackSelectionIts);
@@ -958,15 +964,20 @@ struct MultiplicityClassifier {
   {
     int enabledFunctions = 0;
     if (doprocessTracks) {
+      histos.add("htrackPt", "htrackPt", {HistType::kTH1F, {{10, 0., 10.}}});
+      histos.add("htrackMult", "htrackMult", {HistType::kTH1F, {{500, 0., 500.}}});
       enabledFunctions++;
     }
     if (doprocessFT0C) {
+      histos.add("hCentFt0c", "hCentFt0c", {HistType::kTH1F, {{100, 0., 100.}}});
       enabledFunctions++;
     }
     if (doprocessFV0A) {
+      histos.add("hCentFv0a", "hCentFv0a", {HistType::kTH1F, {{100, 0., 100.}}});
       enabledFunctions++;
     }
     if (doprocessFT0M) {
+      histos.add("hCentFt0m", "hCentFt0m", {HistType::kTH1F, {{100, 0., 100.}}});
       enabledFunctions++;
     }
     if (enabledFunctions != 1) {
@@ -977,26 +988,32 @@ struct MultiplicityClassifier {
   void processTracks(aod::Collision const&, soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection>> const& tracks)
   {
     multvalue(tracks.size());
+    histos.fill(HIST("htrackMult"), tracks.size());
+    for (auto const& iTrk : tracks)
+      histos.fill(HIST("htrackPt"), iTrk.pt());
   }
 
   void processFT0C(aod::CentFT0Cs const& centralities)
   {
     for (auto const& c : centralities) {
       multvalue(c.centFT0C());
+      histos.fill(HIST("hCentFt0c"), c.centFT0C());
     }
   }
 
   void processFV0A(aod::CentFV0As const& centralities)
   {
     for (auto const& c : centralities) {
       multvalue(c.centFV0A());
+      histos.fill(HIST("hCentFv0a"), c.centFV0A());
     }
   }
 
   void processFT0M(aod::CentFT0Ms const& centralities)
   {
     for (auto const& c : centralities) {
       multvalue(c.centFT0M());
+      histos.fill(HIST("hCentFt0m"), c.centFT0M());
     }
   }