@@ -101,6 +101,7 @@ struct FlowSP {
101101 O2_DEFINE_CONFIGURABLE (cFillQABefore, bool , false , " Fill QA histograms before cuts, only for processData" );
102102 O2_DEFINE_CONFIGURABLE (cFillMeanPT, bool , false , " Fill histograms for mean PX/PT" );
103103 O2_DEFINE_CONFIGURABLE (cFillMeanPTextra, bool , false , " Fill histograms for mean PX/PT extra" );
104+ O2_DEFINE_CONFIGURABLE (cUseCentAveragePt, bool , false , " Use <pt> in 1% centrality intervals and not cent average" );
104105 O2_DEFINE_CONFIGURABLE (cFillWithMCParticle, bool , false , " Fill histograms with MCParticle instead of Track" );
105106 // Flags to make and fill histograms
106107 O2_DEFINE_CONFIGURABLE (cFillGeneralV1Histos, bool , true , " Fill histograms for vn analysis" );
@@ -1141,23 +1142,21 @@ struct FlowSP {
11411142 if (!cfg.cFillEventQA )
11421143 return ;
11431144
1144- static constexpr std::string_view Time[] = {" before" , " after" };
1145-
1146- histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" /hCentFT0C" ), collision.centFT0C (), spm.centWeight );
1147- histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" /hCentNGlobal" ), collision.centNGlobal (), spm.centWeight );
1148- histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" /hCentFT0M" ), collision.centFT0M (), spm.centWeight );
1149- histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" /hCentFV0A" ), collision.centFV0A (), spm.centWeight );
1150- histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" /globalTracks_centT0C" ), collision.centFT0C (), tracks.size (), spm.centWeight );
1151- histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" /PVTracks_centT0C" ), collision.centFT0C (), collision.multNTracksPV (), spm.centWeight );
1152- histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" /globalTracks_PVTracks" ), collision.multNTracksPV (), tracks.size (), spm.centWeight );
1153- histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" /globalTracks_multT0A" ), collision.multFT0A (), tracks.size (), spm.centWeight );
1154- histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" /globalTracks_multV0A" ), collision.multFV0A (), tracks.size (), spm.centWeight );
1155- histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" /multV0A_multT0A" ), collision.multFT0A (), collision.multFV0A (), spm.centWeight );
1156- histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" /multT0C_centT0C" ), collision.centFT0C (), collision.multFT0C (), spm.centWeight );
1157- histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" /CentFT0C_vs_CentFT0Cvariant1" ), collision.centFT0C (), collision.centFT0CVariant1 (), spm.centWeight );
1158- histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" /CentFT0C_vs_CentFT0M" ), collision.centFT0C (), collision.centFT0M (), spm.centWeight );
1159- histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" /CentFT0C_vs_CentFV0A" ), collision.centFT0C (), collision.centFV0A (), spm.centWeight );
1160- histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" /CentFT0C_vs_CentNGlobal" ), collision.centFT0C (), collision.centNGlobal (), spm.centWeight );
1145+ histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" hCentFT0C" ), collision.centFT0C (), spm.centWeight );
1146+ histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" hCentNGlobal" ), collision.centNGlobal (), spm.centWeight );
1147+ histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" hCentFT0M" ), collision.centFT0M (), spm.centWeight );
1148+ histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" hCentFV0A" ), collision.centFV0A (), spm.centWeight );
1149+ histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" globalTracks_centT0C" ), collision.centFT0C (), tracks.size (), spm.centWeight );
1150+ histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" PVTracks_centT0C" ), collision.centFT0C (), collision.multNTracksPV (), spm.centWeight );
1151+ histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" globalTracks_PVTracks" ), collision.multNTracksPV (), tracks.size (), spm.centWeight );
1152+ histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" globalTracks_multT0A" ), collision.multFT0A (), tracks.size (), spm.centWeight );
1153+ histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" globalTracks_multV0A" ), collision.multFV0A (), tracks.size (), spm.centWeight );
1154+ histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" multV0A_multT0A" ), collision.multFT0A (), collision.multFV0A (), spm.centWeight );
1155+ histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" multT0C_centT0C" ), collision.centFT0C (), collision.multFT0C (), spm.centWeight );
1156+ histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" CentFT0C_vs_CentFT0Cvariant1" ), collision.centFT0C (), collision.centFT0CVariant1 (), spm.centWeight );
1157+ histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" CentFT0C_vs_CentFT0M" ), collision.centFT0C (), collision.centFT0M (), spm.centWeight );
1158+ histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" CentFT0C_vs_CentFV0A" ), collision.centFT0C (), collision.centFV0A (), spm.centWeight );
1159+ histos.fill (HIST (" QA/" ) + HIST (Time[ft]) + HIST (" CentFT0C_vs_CentNGlobal" ), collision.centFT0C (), collision.centNGlobal (), spm.centWeight );
11611160
11621161 if (cfg.cFillEventPlaneQA ) {
11631162 if constexpr (o2::framework::has_type_v<aod::sptablezdc::Vertex, typename CollisionObject::all_columns>) {
@@ -1259,7 +1258,6 @@ struct FlowSP {
12591258
12601259 double weight = spm.wacc [ct][par] * spm.weff [ct][par] * spm.centWeight ;
12611260
1262- static constexpr std::string_view Time[] = {" before/" , " after/" };
12631261 // NOTE: species[kUnidentified] = "" (when nocfg.cTrackSelDo) {
12641262 if (cfg.cTrackSelDoTrackQAvsCent ) {
12651263 histos.fill (HIST (Charge[ct]) + HIST (Species[par]) + HIST (" QA/" ) + HIST (Time[ft]) + HIST (" hPt_Eta" ), track.pt (), track.eta (), spm.centrality , weight);
@@ -1301,7 +1299,6 @@ struct FlowSP {
13011299 template <FillType ft, ModeType md, typename TrackObject>
13021300 inline void fillMCPtHistos (TrackObject track, int pdgCode)
13031301 {
1304- static constexpr std::string_view Time[] = {" before/" , " after/" };
13051302 static constexpr std::string_view Mode[] = {" Gen/" , " Reco/" };
13061303
13071304 registry.fill (HIST (" trackMC" ) + HIST (Mode[md]) + HIST (Time[ft]) + HIST (" incl/hPt_hadron" ), track.pt (), track.eta (), spm.centrality );
@@ -1338,12 +1335,11 @@ struct FlowSP {
13381335 template <FillType ft, ChargeType ct, typename McParticleObject>
13391336 inline void fillPrimaryHistos (McParticleObject mcparticle)
13401337 {
1341- static constexpr std::string_view Time[] = {" /before" , " /after" };
13421338
13431339 if (!mcparticle.isPhysicalPrimary ()) {
1344- registry.fill (HIST (" trackMCReco" ) + HIST (Time[ft]) + HIST ( " / " ) + HIST (Charge[ct]) + HIST (" hIsPhysicalPrimary" ), 0 , spm.centrality , mcparticle.pt ());
1340+ registry.fill (HIST (" trackMCReco/ " ) + HIST (Time[ft]) + HIST (Charge[ct]) + HIST (" hIsPhysicalPrimary" ), 0 , spm.centrality , mcparticle.pt ());
13451341 } else {
1346- registry.fill (HIST (" trackMCReco" ) + HIST (Time[ft]) + HIST ( " / " ) + HIST (Charge[ct]) + HIST (" hIsPhysicalPrimary" ), 1 , spm.centrality , mcparticle.pt ());
1342+ registry.fill (HIST (" trackMCReco/ " ) + HIST (Time[ft]) + HIST (Charge[ct]) + HIST (" hIsPhysicalPrimary" ), 1 , spm.centrality , mcparticle.pt ());
13471343 }
13481344 }
13491345
0 commit comments