@@ -253,8 +253,8 @@ struct MeanPtFlucId {
253253 hist.add (" QA/after/h_Pt_weighted" , " weighted pT distribution" , kTH1D , {axisPt});
254254 hist.add (" QA/after/h_Pt2_weighted" , " weighted pT distribution" , kTH1D , {axisPt2});
255255 hist.add (" QA/after/h2_Pt_NFT0M" , " p_{T} in Multiplicity Classes " , kTH2D , {{axisPt}, {axisMultFT0M}});
256- hist.add (" QA/after/h_PtEtaVz_NFT0M " , " p_{T}, #eta, #phi in Multiplicity Classes " , kTHnSparseD , {{axisPt}, {axisEta}, {axisPhi}, {axisMultFT0M}});
257- hist.add (" QA/after/h_PtEtaVz_centFT0M " , " p_{T}, #eta, #phi in centrality Classes " , kTHnSparseD , {{axisPt}, {axisEta}, {axisPhi}, {axisCentFT0C}});
256+ hist.add (" QA/after/h_PtEtaPhi_NFT0M " , " p_{T}, #eta, #phi in Multiplicity Classes " , kTHnSparseD , {{axisPt}, {axisEta}, {axisPhi}, {axisMultFT0M}});
257+ hist.add (" QA/after/h_PtEtaPhi_centFT0M " , " p_{T}, #eta, #phi in centrality Classes " , kTHnSparseD , {{axisPt}, {axisEta}, {axisPhi}, {axisCentFT0C}});
258258 hist.add (" QA/after/h2_pt_nch" , " Truth" , kTH2D , {{axisMult}, {axisPt}});
259259 hist.add (" QA/after/h3_nft0m_pt_nch" , " Reco" , kTHnSparseD , {{axisMult}, {axisPt}, {axisMultFT0M}});
260260 hist.add (" QA/after/h2_pt_nch_prof" , " Truth" , kTProfile , {axisMult});
@@ -291,8 +291,8 @@ struct MeanPtFlucId {
291291 hist.add (" QA/Pion/h2_Pt_Eta_weighted" , " p_{T} vs #eta weighted" , kTH2D , {{axisEta}, {axisPt}});
292292 hist.add (" QA/Pion/h2_Pt_NFT0M" , " p_{T} in Multiplicity Classes " , kTH2D , {{axisPt}, {axisMultFT0M}});
293293
294- hist.add (" QA/Pion/h_PtEtaVz_NFT0M " , " p_{T}, #eta, #phi in Multiplicity Classes " , kTHnSparseD , {{axisPt}, {axisEta}, {axisPhi}, {axisMultFT0M}});
295- hist.add (" QA/Pion/h_PtEtaVz_centFT0M " , " p_{T}, #eta, #phi in centrality Classes " , kTHnSparseD , {{axisPt}, {axisEta}, {axisPhi}, {axisCentFT0C}});
294+ hist.add (" QA/Pion/h_PtEtaPhi_NFT0M " , " p_{T}, #eta, #phi in Multiplicity Classes " , kTHnSparseD , {{axisPt}, {axisEta}, {axisPhi}, {axisMultFT0M}});
295+ hist.add (" QA/Pion/h_PtEtaPhi_centFT0M " , " p_{T}, #eta, #phi in centrality Classes " , kTHnSparseD , {{axisPt}, {axisEta}, {axisPhi}, {axisCentFT0C}});
296296
297297 hist.add (" QA/Pion/h2_PtTruth_NFT0M" , " p_{T} in Multiplicity Classes " , kTH2D , {{axisPt}, {axisMultFT0M}});
298298 hist.add (" QA/Pion/h2_pt_nch" , " Reco" , kTH2D , {{axisMult}, {axisPt}});
@@ -367,8 +367,8 @@ struct MeanPtFlucId {
367367 hist.add (" Gen/h2_NTPC_NSim" , " Reco vs Truth Multiplicty TPC" , kTH2D , {{axisMultTPC}, {axisMultTPC}});
368368 hist.add (" Gen/h2_NChSim_NSim" , " Truth Multiplicty NCh vs NTPC" , kTH2D , {{axisMultTPC}, {axisMultTPC}});
369369
370- hist.add (" Gen/Charged/h_PtEtaVz_NFT0M " , " p_{T}, #eta, #phi in Multiplicity Classes " , kTHnSparseD , {{axisPt}, {axisEta}, {axisPhi}, {axisMultFT0M}});
371- hist.add (" Gen/Charged/h_PtEtaVz_centFT0M " , " p_{T}, #eta, #phi in centrality Classes " , kTHnSparseD , {{axisPt}, {axisEta}, {axisPhi}, {axisCentFT0C}});
370+ hist.add (" Gen/Charged/h_PtEtaPhi_NFT0M " , " p_{T}, #eta, #phi in Multiplicity Classes " , kTHnSparseD , {{axisPt}, {axisEta}, {axisPhi}, {axisMultFT0M}});
371+ hist.add (" Gen/Charged/h_PtEtaPhi_centFT0M " , " p_{T}, #eta, #phi in centrality Classes " , kTHnSparseD , {{axisPt}, {axisEta}, {axisPhi}, {axisCentFT0C}});
372372 hist.add (" Gen/Charged/h_EtaTruth" , " #eta " , kTH1D , {axisEta});
373373 hist.add (" Gen/Charged/h_PhiTruth" , " #phi " , kTH1D , {axisPhi});
374374 hist.add (" Gen/Charged/h_PtTruth" , " p_{T} " , kTH1D , {axisPt});
@@ -667,8 +667,8 @@ struct MeanPtFlucId {
667667 hist.fill (HIST (" QA/after/h_Pt" ), track.pt ());
668668 hist.fill (HIST (" QA/after/h_Pt2" ), track.pt () * track.pt ());
669669 hist.fill (HIST (" QA/after/h2_Pt_NFT0M" ), track.pt (), nFT0M);
670- hist.fill (HIST (" QA/after/h_PtEtaVz_NFT0M " ), track.pt (), track.eta (), track.phi (), nFT0M);
671- hist.fill (HIST (" QA/after/h_PtEtaVz_centFT0M " ), track.pt (), track.eta (), track.phi (), centFT0M);
670+ hist.fill (HIST (" QA/after/h_PtEtaPhi_NFT0M " ), track.pt (), track.eta (), track.phi (), nFT0M);
671+ hist.fill (HIST (" QA/after/h_PtEtaPhi_centFT0M " ), track.pt (), track.eta (), track.phi (), centFT0M);
672672 hist.fill (HIST (" QA/after/h2_PvsPinner" ), track.p (), track.tpcInnerParam ());
673673 hist.fill (HIST (" QA/after/h2_Pt_Eta" ), track.eta (), track.pt ());
674674 hist.fill (HIST (" QA/after/h_DcaZ" ), track.dcaZ ());
@@ -751,7 +751,7 @@ struct MeanPtFlucId {
751751
752752 // Fill after PID cut QA hist:
753753 template <int Mode, typename T, typename T1, typename T2>
754- void fillIdParticleQAHistos (T const & track, double rap, double nSigmaTPC, double nSigmaTOF, int nFT0M, double vtxZ, double centFT0M, T1 hWeightPt, T1 hPurePt, T2 hWeightPtY, T2 hWeightPtEta, bool cfgWeightPtId, bool cfgWeightPtYId, bool cfgWeightPtEtaId, bool cfgPurityId, int & N, double & NW, double & Q1, double & Q2, double & Q3, double & Q4, float & weight)
754+ void fillIdParticleQAHistos (T const & track, double rap, double nSigmaTPC, double nSigmaTOF, int nFT0M, double centFT0M, T1 hWeightPt, T1 hPurePt, T2 hWeightPtY, T2 hWeightPtEta, bool cfgWeightPtId, bool cfgWeightPtYId, bool cfgWeightPtEtaId, bool cfgPurityId, int & N, double & NW, double & Q1, double & Q2, double & Q3, double & Q4, float & weight)
755755 {
756756 double pt = track.pt ();
757757 double eta = track.eta ();
@@ -775,8 +775,8 @@ struct MeanPtFlucId {
775775 hist.fill (HIST (Dire[Mode]) + HIST (" h_Pt" ), pt);
776776 hist.fill (HIST (Dire[Mode]) + HIST (" h_Pt2" ), pt * pt);
777777 hist.fill (HIST (Dire[Mode]) + HIST (" h2_Pt_NFT0M" ), pt, nFT0M);
778- hist.fill (HIST (Dire[Mode]) + HIST (" h_PtEtaVz_NFT0M " ), pt, eta, vtxZ , nFT0M);
779- hist.fill (HIST (Dire[Mode]) + HIST (" h_PtEtaVz_centFT0M " ), pt, eta, vtxZ , centFT0M);
778+ hist.fill (HIST (Dire[Mode]) + HIST (" h_PtEtaPhi_NFT0M " ), pt, eta, track. phi () , nFT0M);
779+ hist.fill (HIST (Dire[Mode]) + HIST (" h_PtEtaPhi_centFT0M " ), pt, eta, track. phi () , centFT0M);
780780 hist.fill (HIST (Dire[Mode]) + HIST (" h2_Pt_Eta" ), eta, pt);
781781 if (track.sign () > 0 ) {
782782 hist.fill (HIST (Dire[Mode]) + HIST (" h_PtPos" ), pt);
@@ -966,15 +966,15 @@ struct MeanPtFlucId {
966966 }
967967
968968 if (selPi (track)) {
969- fillIdParticleQAHistos<QA_Pion>(track, rapPi, nSigmaTPCPi, nSigmaTOFPi, nFT0M, vtxZ, centFT0M, hWeightPtPi, hPurePtPi, hWeightPtRapPi, hWeightPtEtaPi, cfgWeightPtId, cfgWeightPtYId, cfgWeightPtEtaId, cfgPurityId, nPi, nPiW, q1Pi, q2Pi, q3Pi, q4Pi, wghtPi);
969+ fillIdParticleQAHistos<QA_Pion>(track, rapPi, nSigmaTPCPi, nSigmaTOFPi, nFT0M, centFT0M, hWeightPtPi, hPurePtPi, hWeightPtRapPi, hWeightPtEtaPi, cfgWeightPtId, cfgWeightPtYId, cfgWeightPtEtaId, cfgPurityId, nPi, nPiW, q1Pi, q2Pi, q3Pi, q4Pi, wghtPi);
970970 }
971971
972972 if (selKa (track)) {
973- fillIdParticleQAHistos<QA_Kaon>(track, rapKa, nSigmaTPCKa, nSigmaTOFKa, nFT0M, vtxZ, centFT0M, hWeightPtKa, hPurePtKa, hWeightPtRapKa, hWeightPtEtaKa, cfgWeightPtId, cfgWeightPtYId, cfgWeightPtEtaId, cfgPurityId, nKa, nKaW, q1Ka, q2Ka, q3Ka, q4Ka, wghtKa);
973+ fillIdParticleQAHistos<QA_Kaon>(track, rapKa, nSigmaTPCKa, nSigmaTOFKa, nFT0M, centFT0M, hWeightPtKa, hPurePtKa, hWeightPtRapKa, hWeightPtEtaKa, cfgWeightPtId, cfgWeightPtYId, cfgWeightPtEtaId, cfgPurityId, nKa, nKaW, q1Ka, q2Ka, q3Ka, q4Ka, wghtKa);
974974 }
975975
976976 if (selPr (track)) {
977- fillIdParticleQAHistos<QA_Proton>(track, rapPr, nSigmaTPCPr, nSigmaTOFPr, nFT0M, vtxZ, centFT0M, hWeightPtPr, hPurePtPr, hWeightPtRapPr, hWeightPtEtaPr, cfgWeightPtId, cfgWeightPtYId, cfgWeightPtEtaId, cfgPurityId, nPr, nPrW, q1Pr, q2Pr, q3Pr, q4Pr, wghtPr);
977+ fillIdParticleQAHistos<QA_Proton>(track, rapPr, nSigmaTPCPr, nSigmaTOFPr, nFT0M, centFT0M, hWeightPtPr, hPurePtPr, hWeightPtRapPr, hWeightPtEtaPr, cfgWeightPtId, cfgWeightPtYId, cfgWeightPtEtaId, cfgPurityId, nPr, nPrW, q1Pr, q2Pr, q3Pr, q4Pr, wghtPr);
978978 }
979979 }
980980 }
@@ -1032,22 +1032,22 @@ struct MeanPtFlucId {
10321032
10331033 if (selPi (track)) {
10341034 ptPi = track.pt ();
1035- fillIdParticleQAHistos<QA_Pion>(track, rapPi, nSigmaTPCPi, nSigmaTOFPi, nFT0M, vtxZ, centFT0M, hWeightPtPi, hPurePtPi, hWeightPtRapPi, hWeightPtEtaPi, cfgWeightPtId, cfgWeightPtYId, cfgWeightPtEtaId, cfgPurityId, nPi, nPiW, q1Pi, q2Pi, q3Pi, q4Pi, wghtPi);
1035+ fillIdParticleQAHistos<QA_Pion>(track, rapPi, nSigmaTPCPi, nSigmaTOFPi, nFT0M, centFT0M, hWeightPtPi, hPurePtPi, hWeightPtRapPi, hWeightPtEtaPi, cfgWeightPtId, cfgWeightPtYId, cfgWeightPtEtaId, cfgPurityId, nPi, nPiW, q1Pi, q2Pi, q3Pi, q4Pi, wghtPi);
10361036 if (std::abs (pid) == kPiPlus ) {
10371037 fillPtMCHist<QA_Pion>(ptPi, eta, rapPi, nFT0M, pid, kPiPlus , kPiMinus );
10381038 }
10391039 }
10401040 if (selKa (track)) {
10411041 ptKa = track.pt ();
1042- fillIdParticleQAHistos<QA_Kaon>(track, rapKa, nSigmaTPCKa, nSigmaTOFKa, nFT0M, vtxZ, centFT0M, hWeightPtKa, hPurePtKa, hWeightPtRapKa, hWeightPtEtaKa, cfgWeightPtId, cfgWeightPtYId, cfgWeightPtEtaId, cfgPurityId, nKa, nKaW, q1Ka, q2Ka, q3Ka, q4Ka, wghtKa);
1042+ fillIdParticleQAHistos<QA_Kaon>(track, rapKa, nSigmaTPCKa, nSigmaTOFKa, nFT0M, centFT0M, hWeightPtKa, hPurePtKa, hWeightPtRapKa, hWeightPtEtaKa, cfgWeightPtId, cfgWeightPtYId, cfgWeightPtEtaId, cfgPurityId, nKa, nKaW, q1Ka, q2Ka, q3Ka, q4Ka, wghtKa);
10431043 if (std::abs (pid) == kKPlus ) {
10441044 fillPtMCHist<QA_Kaon>(ptKa, eta, rapKa, nFT0M, pid, kKPlus , kKMinus );
10451045 }
10461046 }
10471047
10481048 if (selPr (track)) {
10491049 ptPr = track.pt ();
1050- fillIdParticleQAHistos<QA_Proton>(track, rapPr, nSigmaTPCPr, nSigmaTOFPr, nFT0M, vtxZ, centFT0M, hWeightPtPr, hPurePtPr, hWeightPtRapPr, hWeightPtEtaPr, cfgWeightPtId, cfgWeightPtYId, cfgWeightPtEtaId, cfgPurityId, nPr, nPrW, q1Pr, q2Pr, q3Pr, q4Pr, wghtPr);
1050+ fillIdParticleQAHistos<QA_Proton>(track, rapPr, nSigmaTPCPr, nSigmaTOFPr, nFT0M, centFT0M, hWeightPtPr, hPurePtPr, hWeightPtRapPr, hWeightPtEtaPr, cfgWeightPtId, cfgWeightPtYId, cfgWeightPtEtaId, cfgPurityId, nPr, nPrW, q1Pr, q2Pr, q3Pr, q4Pr, wghtPr);
10511051 if (std::abs (pid) == kProton ) {
10521052 fillPtMCHist<QA_Proton>(ptPr, eta, rapPr, nFT0M, pid, kProton , kProtonBar );
10531053 }
@@ -1092,9 +1092,9 @@ struct MeanPtFlucId {
10921092 hist.fill (HIST (" Gen/Charged/h_EtaTruth" ), etaSim);
10931093 hist.fill (HIST (" Gen/Charged/h_PhiTruth" ), mcPart.phi ());
10941094
1095- hist.fill (HIST (" Gen/Pion /h_PhiTruth" ), mcPart.phi ());
1096- hist.fill (HIST (" Gen/Pion/h_PtEtaVz_NFT0M " ), ptChSim, etaSim, mcPart.phi (), nFT0M);
1097- hist.fill (HIST (" Gen/Pion/h_PtEtaVz_centFT0M " ), ptChSim, etaSim, mcPart.phi (), centFT0M);
1095+ hist.fill (HIST (" Gen/Charged /h_PhiTruth" ), mcPart.phi ());
1096+ hist.fill (HIST (" Gen/Charged/h_PtEtaPhi_NFT0M " ), ptChSim, etaSim, mcPart.phi (), nFT0M);
1097+ hist.fill (HIST (" Gen/Charged/h_PtEtaPhi_centFT0M " ), ptChSim, etaSim, mcPart.phi (), centFT0M);
10981098
10991099 if (std::abs (pid) == kPiPlus && mcPart.pt () >= cfgCutPiPtMin) {
11001100 rapSim = mcPart.y ();
@@ -1104,8 +1104,8 @@ struct MeanPtFlucId {
11041104 fillPtMCHist<Gen_Pion>(ptPiSim, etaSim, rapSim, nFT0M, pid, kPiPlus , kPiMinus );
11051105
11061106 hist.fill (HIST (" Gen/Pion/h_PhiTruth" ), mcPart.phi ());
1107- hist.fill (HIST (" Gen/Pion/h_PtEtaVz_NFT0M " ), ptPiSim, etaSim, mcPart.phi (), nFT0M);
1108- hist.fill (HIST (" Gen/Pion/h_PtEtaVz_centFT0M " ), ptPiSim, etaSim, mcPart.phi (), centFT0M);
1107+ hist.fill (HIST (" Gen/Pion/h_PtEtaPhi_NFT0M " ), ptPiSim, etaSim, mcPart.phi (), nFT0M);
1108+ hist.fill (HIST (" Gen/Pion/h_PtEtaPhi_centFT0M " ), ptPiSim, etaSim, mcPart.phi (), centFT0M);
11091109 }
11101110
11111111 if (std::abs (pid) == kKPlus && mcPart.pt () >= cfgCutKaPtMin) {
@@ -1115,8 +1115,8 @@ struct MeanPtFlucId {
11151115 fillPtMCHist<Gen_Kaon>(ptKaSim, etaSim, rapSim, nFT0M, pid, kKPlus , kKMinus );
11161116
11171117 hist.fill (HIST (" Gen/Kaon/h_PhiTruth" ), mcPart.phi ());
1118- hist.fill (HIST (" Gen/Kaon/h_PtEtaVz_NFT0M " ), ptKaSim, etaSim, mcPart.phi (), nFT0M);
1119- hist.fill (HIST (" Gen/Kaon/h_PtEtaVz_centFT0M " ), ptKaSim, etaSim, mcPart.phi (), centFT0M);
1118+ hist.fill (HIST (" Gen/Kaon/h_PtEtaPhi_NFT0M " ), ptKaSim, etaSim, mcPart.phi (), nFT0M);
1119+ hist.fill (HIST (" Gen/Kaon/h_PtEtaPhi_centFT0M " ), ptKaSim, etaSim, mcPart.phi (), centFT0M);
11201120 }
11211121
11221122 if (std::abs (pid) == kProton && mcPart.pt () >= cfgCutPrPtMin) {
@@ -1126,8 +1126,8 @@ struct MeanPtFlucId {
11261126 fillPtMCHist<Gen_Proton>(ptPrSim, etaSim, rapSim, nFT0M, pid, kProton , kProtonBar );
11271127
11281128 hist.fill (HIST (" Gen/Proton/h_PhiTruth" ), mcPart.phi ());
1129- hist.fill (HIST (" Gen/Proton/h_PtEtaVz_NFT0M " ), ptPrSim, etaSim, mcPart.phi (), nFT0M);
1130- hist.fill (HIST (" Gen/Proton/h_PtEtaVz_centFT0M " ), ptPrSim, etaSim, mcPart.phi (), centFT0M);
1129+ hist.fill (HIST (" Gen/Proton/h_PtEtaPhi_NFT0M " ), ptPrSim, etaSim, mcPart.phi (), nFT0M);
1130+ hist.fill (HIST (" Gen/Proton/h_PtEtaPhi_centFT0M " ), ptPrSim, etaSim, mcPart.phi (), centFT0M);
11311131 }
11321132 }
11331133 }
0 commit comments