[PWGLF] Fixed logic in MCReco Collisions + Renamed analysis task (#9150)

scannito · web-flow · commit 8eda9e8e7761 · 2024-12-30T11:58:58.000+01:00
diff --git a/PWGLF/Tasks/Strangeness/CMakeLists.txt b/PWGLF/Tasks/Strangeness/CMakeLists.txt
@@ -85,7 +85,7 @@ o2physics_add_dpl_workflow(sigmaanalysis
     COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(phik0shortanalysis
-    SOURCES phik0sanalysis.cxx
+    SOURCES phik0shortanalysis.cxx
     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
     COMPONENT_NAME Analysis)
 
diff --git a/PWGLF/Tasks/Strangeness/phik0shortanalysis.cxx b/PWGLF/Tasks/Strangeness/phik0shortanalysis.cxx
@@ -9,7 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 ///
-/// \file phik0sanalysis.cxx
+/// \file phik0shortanalysis.cxx
 /// \brief Analysis task for the Phi and K0S rapidity correlations analysis
 /// \author Stefano Cannito (stefano.cannito@cern.ch)
 
@@ -53,7 +53,7 @@ using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 
-struct phik0shortanalysis {
+struct Phik0shortanalysis {
   // Histograms are defined with HistogramRegistry
   HistogramRegistry dataEventHist{"dataEventHist", {}, OutputObjHandlingPolicy::AnalysisObject, true, true};
   HistogramRegistry mcEventHist{"mcEventHist", {}, OutputObjHandlingPolicy::AnalysisObject, true, true};
@@ -722,7 +722,7 @@ struct phik0shortanalysis {
     }
   }
 
-  PROCESS_SWITCH(phik0shortanalysis, processQAPurity, "Process for QA and Phi Purities", true);
+  PROCESS_SWITCH(Phik0shortanalysis, processQAPurity, "Process for QA and Phi Purities", true);
 
   void processSEPhiK0S(soa::Filtered<SelCollisions>::iterator const& collision, FullTracks const&, FullV0s const& V0s, V0DauTracks const&)
   {
@@ -795,7 +795,7 @@ struct phik0shortanalysis {
     }
   }
 
-  PROCESS_SWITCH(phik0shortanalysis, processSEPhiK0S, "Process Same Event for Phi-K0S Analysis", false);
+  PROCESS_SWITCH(Phik0shortanalysis, processSEPhiK0S, "Process Same Event for Phi-K0S Analysis", false);
 
   void processSEPhiPion(soa::Filtered<SelCollisions>::iterator const& collision, FullTracks const& fullTracks)
   {
@@ -866,7 +866,7 @@ struct phik0shortanalysis {
     }
   }
 
-  PROCESS_SWITCH(phik0shortanalysis, processSEPhiPion, "Process Same Event for Phi-Pion Analysis", false);
+  PROCESS_SWITCH(Phik0shortanalysis, processSEPhiPion, "Process Same Event for Phi-Pion Analysis", false);
 
   void processRecMCPhiQA(SimCollisions::iterator const& collision, FullMCTracks const& fullMCTracks, FullMCV0s const& V0s, V0DauMCTracks const&, MCCollisions const&, aod::McParticles const&)
   {
@@ -1021,16 +1021,16 @@ struct phik0shortanalysis {
     }
   }
 
-  PROCESS_SWITCH(phik0shortanalysis, processRecMCPhiQA, "Process for ReCMCQA and Phi in RecMC", false);
+  PROCESS_SWITCH(Phik0shortanalysis, processRecMCPhiQA, "Process for ReCMCQA and Phi in RecMC", false);
 
   void processRecMCPhiK0S(SimCollisions const& collisions, FullMCTracks const&, FullMCV0s const& V0s, V0DauMCTracks const&, MCCollisions const&, aod::McParticles const& mcParticles)
   {
     for (const auto& collision : collisions) {
       if (!acceptEventQA<true>(collision, false))
-        return;
+        continue;
 
       if (!collision.has_mcCollision())
-        return;
+        continue;
 
       const auto& mcCollision = collision.mcCollision_as<MCCollisions>();
       float genmultiplicity = mcCollision.centFT0M();
@@ -1104,16 +1104,16 @@ struct phik0shortanalysis {
     }
   }
 
-  PROCESS_SWITCH(phik0shortanalysis, processRecMCPhiK0S, "Process RecMC for Phi-K0S Analysis", false);
+  PROCESS_SWITCH(Phik0shortanalysis, processRecMCPhiK0S, "Process RecMC for Phi-K0S Analysis", false);
 
   void processRecMCPhiPion(SimCollisions const& collisions, FullMCTracks const& fullMCTracks, MCCollisions const&, aod::McParticles const& mcParticles)
   {
     for (const auto& collision : collisions) {
       if (!acceptEventQA<true>(collision, false))
-        return;
+        continue;
 
       if (!collision.has_mcCollision())
-        return;
+        continue;
 
       const auto& mcCollision = collision.mcCollision_as<MCCollisions>();
       float genmultiplicity = mcCollision.centFT0M();
@@ -1126,7 +1126,6 @@ struct phik0shortanalysis {
 
       // Loop over all primary pion candidates
       for (const auto& track : mcTracksThisColl) {
-
         if (!track.has_mcParticle())
           continue;
 
@@ -1189,7 +1188,7 @@ struct phik0shortanalysis {
     }
   }
 
-  PROCESS_SWITCH(phik0shortanalysis, processRecMCPhiPion, "Process RecMC for Phi-Pion Analysis", false);
+  PROCESS_SWITCH(Phik0shortanalysis, processRecMCPhiPion, "Process RecMC for Phi-Pion Analysis", false);
 
   void processRecMCClosurePhiQA(SimCollisions::iterator const& collision, FullMCTracks const& fullMCTracks, FullV0s const& V0s, V0DauMCTracks const&, MCCollisions const&)
   {
@@ -1299,7 +1298,7 @@ struct phik0shortanalysis {
     }
   }
 
-  PROCESS_SWITCH(phik0shortanalysis, processRecMCClosurePhiQA, "Process for ReCMCQA and Phi in RecMCClosure", false);
+  PROCESS_SWITCH(Phik0shortanalysis, processRecMCClosurePhiQA, "Process for ReCMCQA and Phi in RecMCClosure", false);
 
   void processRecMCClosurePhiK0S(SimCollisions::iterator const& collision, FullMCTracks const&, FullV0s const& V0s, V0DauMCTracks const&, MCCollisions const&)
   {
@@ -1372,7 +1371,7 @@ struct phik0shortanalysis {
     }
   }
 
-  PROCESS_SWITCH(phik0shortanalysis, processRecMCClosurePhiK0S, "Process RecMC for MCClosure Phi-K0S Analysis", false);
+  PROCESS_SWITCH(Phik0shortanalysis, processRecMCClosurePhiK0S, "Process RecMC for MCClosure Phi-K0S Analysis", false);
 
   void processRecMCClosurePhiPion(SimCollisions::iterator const& collision, FullMCTracks const& fullMCTracks, MCCollisions const&)
   {
@@ -1444,7 +1443,7 @@ struct phik0shortanalysis {
     }
   }
 
-  PROCESS_SWITCH(phik0shortanalysis, processRecMCClosurePhiPion, "Process RecMC for MCClosure Phi-Pion Analysis", false);
+  PROCESS_SWITCH(Phik0shortanalysis, processRecMCClosurePhiPion, "Process RecMC for MCClosure Phi-Pion Analysis", false);
 
   void processGenMCPhiQA(MCCollisions::iterator const& mcCollision, soa::SmallGroups<SimCollisions> const& collisions, aod::McParticles const& mcParticles)
   {
@@ -1581,7 +1580,7 @@ struct phik0shortanalysis {
     }
   }
 
-  PROCESS_SWITCH(phik0shortanalysis, processGenMCPhiQA, "Process for ReCMCQA and Phi in RecMC", false);
+  PROCESS_SWITCH(Phik0shortanalysis, processGenMCPhiQA, "Process for ReCMCQA and Phi in RecMC", false);
 
   void processGenMCPhiK0S(MCCollisions::iterator const& mcCollision, soa::SmallGroups<SimCollisions> const& collisions, aod::McParticles const& mcParticles)
   {
@@ -1671,7 +1670,7 @@ struct phik0shortanalysis {
     }
   }
 
-  PROCESS_SWITCH(phik0shortanalysis, processGenMCPhiK0S, "Process GenMC for Phi-K0S Analysis", false);
+  PROCESS_SWITCH(Phik0shortanalysis, processGenMCPhiK0S, "Process GenMC for Phi-K0S Analysis", false);
 
   void processGenMCPhiPion(MCCollisions::iterator const& mcCollision, soa::SmallGroups<SimCollisions> const& collisions, aod::McParticles const& mcParticles)
   {
@@ -1749,11 +1748,11 @@ struct phik0shortanalysis {
     }
   }
 
-  PROCESS_SWITCH(phik0shortanalysis, processGenMCPhiPion, "Process GenMC for Phi-Pion Analysis", false);
+  PROCESS_SWITCH(Phik0shortanalysis, processGenMCPhiPion, "Process GenMC for Phi-Pion Analysis", false);
 };
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
-    adaptAnalysisTask<phik0shortanalysis>(cfgc)};
+    adaptAnalysisTask<Phik0shortanalysis>(cfgc)};
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`// granted to it by virtue of its status as an Intergovernmental Organization`
`10`	`10`	`// or submit itself to any jurisdiction.`
`11`	`11`	`///`
`12`		`-/// \file phik0sanalysis.cxx`
	`12`	`+/// \file phik0shortanalysis.cxx`
`13`	`13`	`/// \brief Analysis task for the Phi and K0S rapidity correlations analysis`
`14`	`14`	`/// \author Stefano Cannito (stefano.cannito@cern.ch)`
`15`	`15`
`@@ -53,7 +53,7 @@ using namespace o2;`
`53`	`53`	`using namespace o2::framework;`
`54`	`54`	`using namespace o2::framework::expressions;`
`55`	`55`
`56`		`-struct phik0shortanalysis {`
	`56`	`+struct Phik0shortanalysis {`
`57`	`57`	`// Histograms are defined with HistogramRegistry`
`58`	`58`	`HistogramRegistry dataEventHist{"dataEventHist", {}, OutputObjHandlingPolicy::AnalysisObject, true, true};`
`59`	`59`	`HistogramRegistry mcEventHist{"mcEventHist", {}, OutputObjHandlingPolicy::AnalysisObject, true, true};`
`@@ -722,7 +722,7 @@ struct phik0shortanalysis {`
`722`	`722`	`}`
`723`	`723`	`}`
`724`	`724`
`725`		`- PROCESS_SWITCH(phik0shortanalysis, processQAPurity, "Process for QA and Phi Purities", true);`
	`725`	`+ PROCESS_SWITCH(Phik0shortanalysis, processQAPurity, "Process for QA and Phi Purities", true);`
`726`	`726`
`727`	`727`	`void processSEPhiK0S(soa::Filtered<SelCollisions>::iterator const& collision, FullTracks const&, FullV0s const& V0s, V0DauTracks const&)`
`728`	`728`	`{`
`@@ -795,7 +795,7 @@ struct phik0shortanalysis {`
`795`	`795`	`}`
`796`	`796`	`}`
`797`	`797`
`798`		`- PROCESS_SWITCH(phik0shortanalysis, processSEPhiK0S, "Process Same Event for Phi-K0S Analysis", false);`
	`798`	`+ PROCESS_SWITCH(Phik0shortanalysis, processSEPhiK0S, "Process Same Event for Phi-K0S Analysis", false);`
`799`	`799`
`800`	`800`	`void processSEPhiPion(soa::Filtered<SelCollisions>::iterator const& collision, FullTracks const& fullTracks)`
`801`	`801`	`{`
`@@ -866,7 +866,7 @@ struct phik0shortanalysis {`
`866`	`866`	`}`
`867`	`867`	`}`
`868`	`868`
`869`		`- PROCESS_SWITCH(phik0shortanalysis, processSEPhiPion, "Process Same Event for Phi-Pion Analysis", false);`
	`869`	`+ PROCESS_SWITCH(Phik0shortanalysis, processSEPhiPion, "Process Same Event for Phi-Pion Analysis", false);`
`870`	`870`
`871`	`871`	`void processRecMCPhiQA(SimCollisions::iterator const& collision, FullMCTracks const& fullMCTracks, FullMCV0s const& V0s, V0DauMCTracks const&, MCCollisions const&, aod::McParticles const&)`
`872`	`872`	`{`
`@@ -1021,16 +1021,16 @@ struct phik0shortanalysis {`
`1021`	`1021`	`}`
`1022`	`1022`	`}`
`1023`	`1023`
`1024`		`- PROCESS_SWITCH(phik0shortanalysis, processRecMCPhiQA, "Process for ReCMCQA and Phi in RecMC", false);`
	`1024`	`+ PROCESS_SWITCH(Phik0shortanalysis, processRecMCPhiQA, "Process for ReCMCQA and Phi in RecMC", false);`
`1025`	`1025`
`1026`	`1026`	`void processRecMCPhiK0S(SimCollisions const& collisions, FullMCTracks const&, FullMCV0s const& V0s, V0DauMCTracks const&, MCCollisions const&, aod::McParticles const& mcParticles)`
`1027`	`1027`	`{`
`1028`	`1028`	`for (const auto& collision : collisions) {`
`1029`	`1029`	`if (!acceptEventQA<true>(collision, false))`
`1030`		`- return;`
	`1030`	`+ continue;`
`1031`	`1031`
`1032`	`1032`	`if (!collision.has_mcCollision())`
`1033`		`- return;`
	`1033`	`+ continue;`
`1034`	`1034`
`1035`	`1035`	`const auto& mcCollision = collision.mcCollision_as<MCCollisions>();`
`1036`	`1036`	`float genmultiplicity = mcCollision.centFT0M();`
`@@ -1104,16 +1104,16 @@ struct phik0shortanalysis {`
`1104`	`1104`	`}`
`1105`	`1105`	`}`
`1106`	`1106`
`1107`		`- PROCESS_SWITCH(phik0shortanalysis, processRecMCPhiK0S, "Process RecMC for Phi-K0S Analysis", false);`
	`1107`	`+ PROCESS_SWITCH(Phik0shortanalysis, processRecMCPhiK0S, "Process RecMC for Phi-K0S Analysis", false);`
`1108`	`1108`
`1109`	`1109`	`void processRecMCPhiPion(SimCollisions const& collisions, FullMCTracks const& fullMCTracks, MCCollisions const&, aod::McParticles const& mcParticles)`
`1110`	`1110`	`{`
`1111`	`1111`	`for (const auto& collision : collisions) {`
`1112`	`1112`	`if (!acceptEventQA<true>(collision, false))`
`1113`		`- return;`
	`1113`	`+ continue;`
`1114`	`1114`
`1115`	`1115`	`if (!collision.has_mcCollision())`
`1116`		`- return;`
	`1116`	`+ continue;`
`1117`	`1117`
`1118`	`1118`	`const auto& mcCollision = collision.mcCollision_as<MCCollisions>();`
`1119`	`1119`	`float genmultiplicity = mcCollision.centFT0M();`
`@@ -1126,7 +1126,6 @@ struct phik0shortanalysis {`
`1126`	`1126`
`1127`	`1127`	`// Loop over all primary pion candidates`
`1128`	`1128`	`for (const auto& track : mcTracksThisColl) {`
`1129`		`-`
`1130`	`1129`	`if (!track.has_mcParticle())`
`1131`	`1130`	`continue;`
`1132`	`1131`
`@@ -1189,7 +1188,7 @@ struct phik0shortanalysis {`
`1189`	`1188`	`}`
`1190`	`1189`	`}`
`1191`	`1190`
`1192`		`- PROCESS_SWITCH(phik0shortanalysis, processRecMCPhiPion, "Process RecMC for Phi-Pion Analysis", false);`
	`1191`	`+ PROCESS_SWITCH(Phik0shortanalysis, processRecMCPhiPion, "Process RecMC for Phi-Pion Analysis", false);`
`1193`	`1192`
`1194`	`1193`	`void processRecMCClosurePhiQA(SimCollisions::iterator const& collision, FullMCTracks const& fullMCTracks, FullV0s const& V0s, V0DauMCTracks const&, MCCollisions const&)`
`1195`	`1194`	`{`
`@@ -1299,7 +1298,7 @@ struct phik0shortanalysis {`
`1299`	`1298`	`}`
`1300`	`1299`	`}`
`1301`	`1300`
`1302`		`- PROCESS_SWITCH(phik0shortanalysis, processRecMCClosurePhiQA, "Process for ReCMCQA and Phi in RecMCClosure", false);`
	`1301`	`+ PROCESS_SWITCH(Phik0shortanalysis, processRecMCClosurePhiQA, "Process for ReCMCQA and Phi in RecMCClosure", false);`
`1303`	`1302`
`1304`	`1303`	`void processRecMCClosurePhiK0S(SimCollisions::iterator const& collision, FullMCTracks const&, FullV0s const& V0s, V0DauMCTracks const&, MCCollisions const&)`
`1305`	`1304`	`{`
`@@ -1372,7 +1371,7 @@ struct phik0shortanalysis {`
`1372`	`1371`	`}`
`1373`	`1372`	`}`
`1374`	`1373`
`1375`		`- PROCESS_SWITCH(phik0shortanalysis, processRecMCClosurePhiK0S, "Process RecMC for MCClosure Phi-K0S Analysis", false);`
	`1374`	`+ PROCESS_SWITCH(Phik0shortanalysis, processRecMCClosurePhiK0S, "Process RecMC for MCClosure Phi-K0S Analysis", false);`
`1376`	`1375`
`1377`	`1376`	`void processRecMCClosurePhiPion(SimCollisions::iterator const& collision, FullMCTracks const& fullMCTracks, MCCollisions const&)`
`1378`	`1377`	`{`
`@@ -1444,7 +1443,7 @@ struct phik0shortanalysis {`
`1444`	`1443`	`}`
`1445`	`1444`	`}`
`1446`	`1445`
`1447`		`- PROCESS_SWITCH(phik0shortanalysis, processRecMCClosurePhiPion, "Process RecMC for MCClosure Phi-Pion Analysis", false);`
	`1446`	`+ PROCESS_SWITCH(Phik0shortanalysis, processRecMCClosurePhiPion, "Process RecMC for MCClosure Phi-Pion Analysis", false);`
`1448`	`1447`
`1449`	`1448`	`void processGenMCPhiQA(MCCollisions::iterator const& mcCollision, soa::SmallGroups<SimCollisions> const& collisions, aod::McParticles const& mcParticles)`
`1450`	`1449`	`{`
`@@ -1581,7 +1580,7 @@ struct phik0shortanalysis {`
`1581`	`1580`	`}`
`1582`	`1581`	`}`
`1583`	`1582`
`1584`		`- PROCESS_SWITCH(phik0shortanalysis, processGenMCPhiQA, "Process for ReCMCQA and Phi in RecMC", false);`
	`1583`	`+ PROCESS_SWITCH(Phik0shortanalysis, processGenMCPhiQA, "Process for ReCMCQA and Phi in RecMC", false);`
`1585`	`1584`
`1586`	`1585`	`void processGenMCPhiK0S(MCCollisions::iterator const& mcCollision, soa::SmallGroups<SimCollisions> const& collisions, aod::McParticles const& mcParticles)`
`1587`	`1586`	`{`
`@@ -1671,7 +1670,7 @@ struct phik0shortanalysis {`
`1671`	`1670`	`}`
`1672`	`1671`	`}`
`1673`	`1672`
`1674`		`- PROCESS_SWITCH(phik0shortanalysis, processGenMCPhiK0S, "Process GenMC for Phi-K0S Analysis", false);`
	`1673`	`+ PROCESS_SWITCH(Phik0shortanalysis, processGenMCPhiK0S, "Process GenMC for Phi-K0S Analysis", false);`
`1675`	`1674`
`1676`	`1675`	`void processGenMCPhiPion(MCCollisions::iterator const& mcCollision, soa::SmallGroups<SimCollisions> const& collisions, aod::McParticles const& mcParticles)`
`1677`	`1676`	`{`
`@@ -1749,11 +1748,11 @@ struct phik0shortanalysis {`
`1749`	`1748`	`}`
`1750`	`1749`	`}`
`1751`	`1750`
`1752`		`- PROCESS_SWITCH(phik0shortanalysis, processGenMCPhiPion, "Process GenMC for Phi-Pion Analysis", false);`
	`1751`	`+ PROCESS_SWITCH(Phik0shortanalysis, processGenMCPhiPion, "Process GenMC for Phi-Pion Analysis", false);`
`1753`	`1752`	`};`
`1754`	`1753`
`1755`	`1754`	`WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)`
`1756`	`1755`	`{`
`1757`	`1756`	`return WorkflowSpec{`
`1758`		`- adaptAnalysisTask<phik0shortanalysis>(cfgc)};`
	`1757`	`+ adaptAnalysisTask<Phik0shortanalysis>(cfgc)};`
`1759`	`1758`	`}`