NucleiTask - Fix bugs in mult dependent histos

Author: giovannimalfattore

PWGLF/Tasks/Nuspex/CMakeLists.txt

@@ -10,7 +10,7 @@
 # or submit itself to any jurisdiction.
 
 o2physics_add_dpl_workflow(nuclei-batask
-    SOURCES lfNucleiBATask.cxx
+    SOURCES LFNucleiBATask.cxx
     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2Physics::EventFilteringUtils
     COMPONENT_NAME Analysis)
 

PWGLF/Tasks/Nuspex/lfNucleiBATask.cxx PWGLF/Tasks/Nuspex/LFNucleiBATask.cxxPWGLF/Tasks/Nuspex/lfNucleiBATask.cxx renamed to PWGLF/Tasks/Nuspex/LFNucleiBATask.cxx

@@ -10,7 +10,7 @@
 // or submit itself to any jurisdiction.
 
 ///
-/// \file lfNucleiBATask.cxx
+/// \file LFNucleiBATask.cxx
 ///
 /// \brief  Analysis task for the measurement of the coalescence parameter B2/B3 in pp collisions for (anti)deuteron/(anti)helium-3
 ///
@@ -53,7 +53,7 @@ using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 
-struct lfNucleiBATask {
+struct LFNucleiBATask {
   Service<o2::ccdb::BasicCCDBManager> ccdb;
 
   Zorro zorro;
@@ -2085,7 +2085,7 @@ struct lfNucleiBATask {
     }
     // To be optimised
     if (!doprocessMCGen && !doprocessMCReco && !doprocessMCRecoLfPid && !doprocessMCRecoFiltered && !doprocessMCRecoFilteredLight) {
-      LOG(info) << "Histograms of lfNucleiBATask:";
+      LOG(info) << "Histograms of LFNucleiBATask:";
       histos.print();
       return;
     }
@@ -2208,7 +2208,7 @@ struct lfNucleiBATask {
       spectraGen.add("alpha/histGenPtantiAlSec", "generated particles", HistType::kTH1F, {ptAxis});
       spectraGen.add("alpha/histSecTransportPtantiAl", "generated particles", HistType::kTH1F, {ptAxis});
     }
-    LOG(info) << "Histograms of lfNucleiBATask:";
+    LOG(info) << "Histograms of LFNucleiBATask:";
     histos.print();
     if (doprocessMCGen)
       spectraGen.print();
@@ -5970,7 +5970,7 @@ struct lfNucleiBATask {
   {
     fillHistograms<false /*MC*/, false /*Filtered*/>(event, tracks, true /*dummy*/);
   }
-  PROCESS_SWITCH(lfNucleiBATask, processData, "process data", true);
+  PROCESS_SWITCH(LFNucleiBATask, processData, "process data", true);
 
   // Process function that runs on the original AO2D
   void processDataLfPid(EventCandidates::iterator const& event,
@@ -5979,7 +5979,7 @@ struct lfNucleiBATask {
   {
     fillHistograms<false /*MC*/, false /*Filtered*/>(event, tracks, true /*dummy*/);
   }
-  PROCESS_SWITCH(lfNucleiBATask, processDataLfPid, "process data with LF PID", false);
+  PROCESS_SWITCH(LFNucleiBATask, processDataLfPid, "process data with LF PID", false);
 
   // Process function that runs on the filtered data
   void processDataFiltered(o2::aod::LfNuclEvents::iterator const& event,
@@ -5990,7 +5990,7 @@ struct lfNucleiBATask {
     // Takes as input full AO2Ds
     fillHistograms<false /*MC*/, true /*Filtered*/>(event, tracks, true /*dummy*/);
   }
-  PROCESS_SWITCH(lfNucleiBATask, processDataFiltered, "process data on the filtered data", false);
+  PROCESS_SWITCH(LFNucleiBATask, processDataFiltered, "process data on the filtered data", false);
 
   void processDataLight(o2::aod::LfNuclEvents::iterator const& event,
                         o2::aod::LfCandNucleusDummy const& tracks,
@@ -6000,7 +6000,7 @@ struct lfNucleiBATask {
     // Takes as input derived trees
     fillHistograms<false /*MC*/, true /*Filtered*/>(event, tracks, true /*dummy*/);
   }
-  PROCESS_SWITCH(lfNucleiBATask, processDataLight, "process data on the derived trees", false);
+  PROCESS_SWITCH(LFNucleiBATask, processDataLight, "process data on the derived trees", false);
 
   /////////////
   // MC Reco //
@@ -6019,7 +6019,7 @@ struct lfNucleiBATask {
     }
     fillHistograms<true /*MC*/, false /*Filtered*/>(event, tracks, mcParticles);
   } // CLOSING PROCESS MC RECO
-  PROCESS_SWITCH(lfNucleiBATask, processMCReco, "process mc reco", false);
+  PROCESS_SWITCH(LFNucleiBATask, processMCReco, "process mc reco", false);
 
   // Process function that runs on the original AO2D (for the MC) with the LfPIDcalibration
   void processMCRecoLfPid(EventCandidatesMC::iterator const& event,
@@ -6034,7 +6034,7 @@ struct lfNucleiBATask {
     }
     fillHistograms<true /*MC*/, false /*Filtered*/>(event, tracks, mcParticles);
   } // CLOSING PROCESS MC RECO
-  PROCESS_SWITCH(lfNucleiBATask, processMCRecoLfPid, "process mc reco with LfPid", false);
+  PROCESS_SWITCH(LFNucleiBATask, processMCRecoLfPid, "process mc reco with LfPid", false);
 
   Preslice<aod::McParticles> perMCCol = aod::mcparticle::mcCollisionId;
   SliceCache cache;
@@ -6148,7 +6148,7 @@ struct lfNucleiBATask {
     }
   }
   // CLOSING PROCESS MC RECO
-  PROCESS_SWITCH(lfNucleiBATask, processMCRecoLfPidEv, "process mc reco with LfPid w/ Event", false);
+  PROCESS_SWITCH(LFNucleiBATask, processMCRecoLfPidEv, "process mc reco with LfPid w/ Event", false);
 
   // Process function that runs on the filtered AO2D (for the MC)
   void processMCRecoFiltered(o2::aod::LfNuclEvents::iterator const& event,
@@ -6157,15 +6157,15 @@ struct lfNucleiBATask {
   {
     fillHistograms<true /*MC*/, true /*Filtered*/>(event, tracks, true /*dummy*/);
   } // CLOSING PROCESS MC RECO ON FILTERED DATA
-  PROCESS_SWITCH(lfNucleiBATask, processMCRecoFiltered, "process mc reco on the filtered data", false);
+  PROCESS_SWITCH(LFNucleiBATask, processMCRecoFiltered, "process mc reco on the filtered data", false);
 
   void processMCRecoFilteredLight(o2::aod::LfNuclEvents::iterator const& event,
                                   soa::Join<o2::aod::LfCandNucleusDummy, o2::aod::LfCandNucleusMC> const& tracks,
                                   o2::aod::BCsWithTimestamps const&)
   {
     fillHistograms<true /*MC*/, true /*Filtered*/>(event, tracks, true /*dummy*/);
   } // CLOSING PROCESS MC RECO ON FILTERED DATA
-  PROCESS_SWITCH(lfNucleiBATask, processMCRecoFilteredLight, "process mc reco on the derived trees", false);
+  PROCESS_SWITCH(LFNucleiBATask, processMCRecoFilteredLight, "process mc reco on the derived trees", false);
 
   ////////////
   // MC Gen //
@@ -6424,7 +6424,7 @@ struct lfNucleiBATask {
       }
     }
   } // Close processMCGen
-  PROCESS_SWITCH(lfNucleiBATask, processMCGen, "process MC Generated", true);
+  PROCESS_SWITCH(LFNucleiBATask, processMCGen, "process MC Generated", true);
 
   void processEvSgLossMC(soa::Join<aod::McCollisions, aod::McCentFT0Ms>::iterator const& mcCollision,
                          aod::McParticles const& mcParticles,
@@ -6510,10 +6510,10 @@ struct lfNucleiBATask {
       }
     }
   }
-  PROCESS_SWITCH(lfNucleiBATask, processEvSgLossMC, "process MC SignLoss", false);
+  PROCESS_SWITCH(LFNucleiBATask, processEvSgLossMC, "process MC SignLoss", false);
 };
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
-  return WorkflowSpec{adaptAnalysisTask<lfNucleiBATask>(cfgc)};
+  return WorkflowSpec{adaptAnalysisTask<LFNucleiBATask>(cfgc)};
 }