Skip to content

Commit 2ca9cf9

Browse files
cnkostercnkoster
committed
Add extra histos and clenup MC
1 parent be25124 commit 2ca9cf9

1 file changed

Lines changed: 57 additions & 49 deletions

File tree

‎PWGCF/Flow/Tasks/flowSP.cxx‎

Lines changed: 57 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ struct FlowSP {
210210
};
211211

212212
static constexpr std::string_view Charge[] = {"incl/", "pos/", "neg/"};
213-
static constexpr std::string_view Time[] = {"before/", "after"};
213+
static constexpr std::string_view Time[] = {"before/", "after/"};
214214

215215
void init(InitContext const&)
216216
{
@@ -347,20 +347,22 @@ struct FlowSP {
347347
}
348348

349349
if (cfgFillMixedHarmonics) {
350-
registry.add<TProfile>("incl/vnAxCxUx_pt_MH", "", kTProfile, {axisPt});
351-
registry.add<TProfile>("incl/vnAxCyUx_pt_MH", "", kTProfile, {axisPt});
352-
registry.add<TProfile>("incl/vnAxCyUy_pt_MH", "", kTProfile, {axisPt});
353-
registry.add<TProfile>("incl/vnAyCxUy_pt_MH", "", kTProfile, {axisPt});
354-
355-
registry.add<TProfile>("incl/vnAxCxUx_cent_MH", "", kTProfile, {axisCent});
356-
registry.add<TProfile>("incl/vnAxCyUx_cent_MH", "", kTProfile, {axisCent});
357-
registry.add<TProfile>("incl/vnAxCyUy_cent_MH", "", kTProfile, {axisCent});
358-
registry.add<TProfile>("incl/vnAyCxUy_cent_MH", "", kTProfile, {axisCent});
359-
360-
registry.add<TProfile>("incl/vnAxCxUx_eta_MH", "", kTProfile, {axisEtaVn});
361-
registry.add<TProfile>("incl/vnAxCyUx_eta_MH", "", kTProfile, {axisEtaVn});
362-
registry.add<TProfile>("incl/vnAxCyUy_eta_MH", "", kTProfile, {axisEtaVn});
363-
registry.add<TProfile>("incl/vnAyCxUy_eta_MH", "", kTProfile, {axisEtaVn});
350+
registry.add<TProfile>("incl/v2/vnAxCxUx_pt_MH", "", kTProfile, {axisPt});
351+
registry.add<TProfile>("incl/v2/vnAxCyUx_pt_MH", "", kTProfile, {axisPt});
352+
registry.add<TProfile>("incl/v2/vnAxCyUy_pt_MH", "", kTProfile, {axisPt});
353+
registry.add<TProfile>("incl/v2/vnAyCxUy_pt_MH", "", kTProfile, {axisPt});
354+
355+
registry.add<TProfile>("incl/v2/vnAxCxUx_cent_MH", "", kTProfile, {axisCent});
356+
registry.add<TProfile>("incl/v2/vnAxCyUx_cent_MH", "", kTProfile, {axisCent});
357+
registry.add<TProfile>("incl/v2/vnAxCyUy_cent_MH", "", kTProfile, {axisCent});
358+
registry.add<TProfile>("incl/v2/vnAyCxUy_cent_MH", "", kTProfile, {axisCent});
359+
360+
registry.add<TProfile>("incl/v2/vnAxCxUx_eta_MH", "", kTProfile, {axisEtaVn});
361+
registry.add<TProfile>("incl/v2/vnAxCyUx_eta_MH", "", kTProfile, {axisEtaVn});
362+
registry.add<TProfile>("incl/v2/vnAxCyUy_eta_MH", "", kTProfile, {axisEtaVn});
363+
registry.add<TProfile>("incl/v2/vnAyCxUy_eta_MH", "", kTProfile, {axisEtaVn});
364+
365+
registry.addClone("incl/v2/", "incl/v3/");
364366
}
365367

366368
if (cfgFillEventPlane) {
@@ -414,7 +416,7 @@ struct FlowSP {
414416
}
415417

416418
registry.addClone("QA/after/", "QA/before/");
417-
419+
418420
if (cfgFillChargeDependence) {
419421
registry.addClone("incl/", "pos/");
420422
registry.addClone("incl/", "neg/");
@@ -855,37 +857,37 @@ struct FlowSP {
855857
registry.fill(HIST(Charge[ct]) + HIST("vnC_pt"), track.pt(), (uy * qyC + ux * qxC) / std::sqrt(std::fabs(corrQQ)), wacc * weff);
856858

857859
if (cfgFillMixedHarmonics) {
858-
registry.fill(HIST(Charge[ct]) + HIST("vnAxCxUx_eta_MH"), track.eta(), (uxMH * qxA * qxC) / corrQQx, wacc * weff);
859-
registry.fill(HIST(Charge[ct]) + HIST("vnAxCyUx_eta_MH"), track.eta(), (uxMH * qyA * qyC) / corrQQy, wacc * weff);
860-
registry.fill(HIST(Charge[ct]) + HIST("vnAxCyUy_eta_MH"), track.eta(), (uyMH * qxA * qyC) / corrQQx, wacc * weff);
861-
registry.fill(HIST(Charge[ct]) + HIST("vnAyCxUy_eta_MH"), track.eta(), (uyMH * qyA * qxC) / corrQQy, wacc * weff);
860+
registry.fill(HIST(Charge[ct]) + HIST("v2/vnAxCxUx_eta_MH"), track.eta(), (uxMH * qxA * qxC) / corrQQx, wacc * weff);
861+
registry.fill(HIST(Charge[ct]) + HIST("v2/vnAxCyUx_eta_MH"), track.eta(), (uxMH * qyA * qyC) / corrQQy, wacc * weff);
862+
registry.fill(HIST(Charge[ct]) + HIST("v2/vnAxCyUy_eta_MH"), track.eta(), (uyMH * qxA * qyC) / corrQQx, wacc * weff);
863+
registry.fill(HIST(Charge[ct]) + HIST("v2/vnAyCxUy_eta_MH"), track.eta(), (uyMH * qyA * qxC) / corrQQy, wacc * weff);
862864

863-
registry.fill(HIST(Charge[ct]) + HIST("vnAxCxUx_pt_MH"), track.pt(), (uxMH * qxA * qxC) / corrQQx, wacc * weff);
864-
registry.fill(HIST(Charge[ct]) + HIST("vnAxCyUx_pt_MH"), track.pt(), (uxMH * qyA * qyC) / corrQQy, wacc * weff);
865-
registry.fill(HIST(Charge[ct]) + HIST("vnAxCyUy_pt_MH"), track.pt(), (uyMH * qxA * qyC) / corrQQx, wacc * weff);
866-
registry.fill(HIST(Charge[ct]) + HIST("vnAyCxUy_pt_MH"), track.pt(), (uyMH * qyA * qxC) / corrQQy, wacc * weff);
865+
registry.fill(HIST(Charge[ct]) + HIST("v2/vnAxCxUx_pt_MH"), track.pt(), (uxMH * qxA * qxC) / corrQQx, wacc * weff);
866+
registry.fill(HIST(Charge[ct]) + HIST("v2/vnAxCyUx_pt_MH"), track.pt(), (uxMH * qyA * qyC) / corrQQy, wacc * weff);
867+
registry.fill(HIST(Charge[ct]) + HIST("v2/vnAxCyUy_pt_MH"), track.pt(), (uyMH * qxA * qyC) / corrQQx, wacc * weff);
868+
registry.fill(HIST(Charge[ct]) + HIST("v2/vnAyCxUy_pt_MH"), track.pt(), (uyMH * qyA * qxC) / corrQQy, wacc * weff);
867869

868-
registry.fill(HIST(Charge[ct]) + HIST("vnAxCxUx_cent_MH"), centrality, (uxMH * qxA * qxC) / corrQQx, wacc * weff);
869-
registry.fill(HIST(Charge[ct]) + HIST("vnAxCyUx_cent_MH"), centrality, (uxMH * qyA * qyC) / corrQQy, wacc * weff);
870-
registry.fill(HIST(Charge[ct]) + HIST("vnAxCyUy_cent_MH"), centrality, (uyMH * qxA * qyC) / corrQQx, wacc * weff);
871-
registry.fill(HIST(Charge[ct]) + HIST("vnAyCxUy_cent_MH"), centrality, (uyMH * qyA * qxC) / corrQQy, wacc * weff);
870+
registry.fill(HIST(Charge[ct]) + HIST("v2/vnAxCxUx_cent_MH"), centrality, (uxMH * qxA * qxC) / corrQQx, wacc * weff);
871+
registry.fill(HIST(Charge[ct]) + HIST("v2/vnAxCyUx_cent_MH"), centrality, (uxMH * qyA * qyC) / corrQQy, wacc * weff);
872+
registry.fill(HIST(Charge[ct]) + HIST("v2/vnAxCyUy_cent_MH"), centrality, (uyMH * qxA * qyC) / corrQQx, wacc * weff);
873+
registry.fill(HIST(Charge[ct]) + HIST("v2/vnAyCxUy_cent_MH"), centrality, (uyMH * qyA * qxC) / corrQQy, wacc * weff);
872874

873875
// -+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
874876

875-
registry.fill(HIST(Charge[ct]) + HIST("vnAxCxUx_eta_MH"), track.eta(), (uxMH2 * qxA * qxC) / corrQQx, wacc * weff);
876-
registry.fill(HIST(Charge[ct]) + HIST("vnAxCyUx_eta_MH"), track.eta(), (uxMH2 * qyA * qyC) / corrQQy, wacc * weff);
877-
registry.fill(HIST(Charge[ct]) + HIST("vnAxCyUy_eta_MH"), track.eta(), (uyMH2 * qxA * qyC) / corrQQx, wacc * weff);
878-
registry.fill(HIST(Charge[ct]) + HIST("vnAyCxUy_eta_MH"), track.eta(), (uyMH2 * qyA * qxC) / corrQQy, wacc * weff);
877+
registry.fill(HIST(Charge[ct]) + HIST("v3/vnAxCxUx_eta_MH"), track.eta(), (uxMH2 * qxA * qxC) / corrQQx, wacc * weff);
878+
registry.fill(HIST(Charge[ct]) + HIST("v3/vnAxCyUx_eta_MH"), track.eta(), (uxMH2 * qyA * qyC) / corrQQy, wacc * weff);
879+
registry.fill(HIST(Charge[ct]) + HIST("v3/vnAxCyUy_eta_MH"), track.eta(), (uyMH2 * qxA * qyC) / corrQQx, wacc * weff);
880+
registry.fill(HIST(Charge[ct]) + HIST("v3/vnAyCxUy_eta_MH"), track.eta(), (uyMH2 * qyA * qxC) / corrQQy, wacc * weff);
879881

880-
registry.fill(HIST(Charge[ct]) + HIST("vnAxCxUx_pt_MH"), track.pt(), (uxMH2 * qxA * qxC) / corrQQx, wacc * weff);
881-
registry.fill(HIST(Charge[ct]) + HIST("vnAxCyUx_pt_MH"), track.pt(), (uxMH2 * qyA * qyC) / corrQQy, wacc * weff);
882-
registry.fill(HIST(Charge[ct]) + HIST("vnAxCyUy_pt_MH"), track.pt(), (uyMH2 * qxA * qyC) / corrQQx, wacc * weff);
883-
registry.fill(HIST(Charge[ct]) + HIST("vnAyCxUy_pt_MH"), track.pt(), (uyMH2 * qyA * qxC) / corrQQy, wacc * weff);
882+
registry.fill(HIST(Charge[ct]) + HIST("v3/vnAxCxUx_pt_MH"), track.pt(), (uxMH2 * qxA * qxC) / corrQQx, wacc * weff);
883+
registry.fill(HIST(Charge[ct]) + HIST("v3/vnAxCyUx_pt_MH"), track.pt(), (uxMH2 * qyA * qyC) / corrQQy, wacc * weff);
884+
registry.fill(HIST(Charge[ct]) + HIST("v3/vnAxCyUy_pt_MH"), track.pt(), (uyMH2 * qxA * qyC) / corrQQx, wacc * weff);
885+
registry.fill(HIST(Charge[ct]) + HIST("v3/vnAyCxUy_pt_MH"), track.pt(), (uyMH2 * qyA * qxC) / corrQQy, wacc * weff);
884886

885-
registry.fill(HIST(Charge[ct]) + HIST("vnAxCxUx_cent_MH"), centrality, (uxMH2 * qxA * qxC) / corrQQx, wacc * weff);
886-
registry.fill(HIST(Charge[ct]) + HIST("vnAxCyUx_cent_MH"), centrality, (uxMH2 * qyA * qyC) / corrQQy, wacc * weff);
887-
registry.fill(HIST(Charge[ct]) + HIST("vnAxCyUy_cent_MH"), centrality, (uyMH2 * qxA * qyC) / corrQQx, wacc * weff);
888-
registry.fill(HIST(Charge[ct]) + HIST("vnAyCxUy_cent_MH"), centrality, (uyMH2 * qyA * qxC) / corrQQy, wacc * weff);
887+
registry.fill(HIST(Charge[ct]) + HIST("v3/vnAxCxUx_cent_MH"), centrality, (uxMH2 * qxA * qxC) / corrQQx, wacc * weff);
888+
registry.fill(HIST(Charge[ct]) + HIST("v3/vnAxCyUx_cent_MH"), centrality, (uxMH2 * qyA * qyC) / corrQQy, wacc * weff);
889+
registry.fill(HIST(Charge[ct]) + HIST("v3/vnAxCyUy_cent_MH"), centrality, (uyMH2 * qxA * qyC) / corrQQx, wacc * weff);
890+
registry.fill(HIST(Charge[ct]) + HIST("v3/vnAyCxUy_cent_MH"), centrality, (uyMH2 * qyA * qxC) / corrQQy, wacc * weff);
889891
}
890892

891893
if (cfgFillXandYterms) {
@@ -997,6 +999,19 @@ struct FlowSP {
997999
}
9981000
}
9991001

1002+
template < ModeType md, typename McParticleObject>
1003+
inline void fillPrimaryHistos(McParticleObject mcparticle)
1004+
{
1005+
static constexpr std::string_view Time[] = {"before/", "after/"};
1006+
1007+
if (!mcparticle.isPhysicalPrimary()) {
1008+
registry.fill(HIST("trackMCReco") + HIST() + HIST("/hIsPhysicalPrimary"), 0);
1009+
} else {
1010+
registry.fill(HIST("trackMCReco") + HIST() + HIST("/hIsPhysicalPrimary"), 1);
1011+
}
1012+
1013+
}
1014+
10001015
void processData(UsedCollisions::iterator const& collision, aod::BCsWithTimestamps const&, UsedTracks const& tracks)
10011016
{
10021017
registry.fill(HIST("hEventCount"), evSel_FilteredEvent);
@@ -1063,11 +1078,11 @@ struct FlowSP {
10631078
}
10641079

10651080
if (centrality > cfgCentMax || centrality < cfgCentMin)
1066-
return;
1081+
return;
10671082

10681083
registry.fill(HIST("hEventCount"), evSel_CentCuts);
10691084

1070-
if (cfgFillQAHistos)
1085+
if (cfgFillQAHistos)
10711086
fillEventQA<kAfter>(collision, tracks);
10721087

10731088
double corrQQ = 1., corrQQx = 1., corrQQy = 1.;
@@ -1225,13 +1240,6 @@ struct FlowSP {
12251240

12261241
fillMCPtHistos<kBefore, kReco>(track, mcParticle.pdgCode());
12271242

1228-
if (!mcParticle.isPhysicalPrimary()) {
1229-
registry.fill(HIST("trackMCReco/before/hIsPhysicalPrimary"), 0);
1230-
continue;
1231-
} else {
1232-
registry.fill(HIST("trackMCReco/before/hIsPhysicalPrimary"), 1);
1233-
}
1234-
12351243
if (!trackSelected(track, field))
12361244
continue;
12371245

0 commit comments

Comments
 (0)