@@ -80,10 +80,6 @@ struct PhotonMcTask {
8080
8181 // configurable axis
8282 ConfigurableAxis thnConfigAxisPt{" thnConfigAxisPt" , {400 , 0 ., 20 .}, " pT axis for the neutral meson" };
83- ConfigurableAxis thnConfigAxisERelative{" thnConfigAxisERelative" , {600 , -1 ., 5 .}, " (E rec - E true) / E true axis" };
84- ConfigurableAxis thnConfigAxisPRelative{" thnConfigAxisPRelative" , {300 , -1 ., 2 .}, " (P rec - P true) / P true axis" };
85- ConfigurableAxis thnConfigAxisEtaRelative{" thnConfigAxisEtaRelative" , {300 , -1 ., 2 .}, " (eta rec - eta true) / eta true axis" };
86- ConfigurableAxis thnConfigAxisPhiRelative{" thnConfigAxisPhiRelative" , {300 , -1 ., 2 .}, " (phi rec - phi true) / phi true axis" };
8783 ConfigurableAxis thnConfigAxisCent{" thnConfigAxisCent" , {20 , 0 ., 100 .}, " centrality axis for the current event" };
8884 ConfigurableAxis thnConfigAxisMult{" thnConfigAxisMult" , {60 , 0 ., 60000 .}, " multiplicity axis for the current event" };
8985 Configurable<bool > useCent{" useCent" , false , " flag to enable usage of centrality instead of multiplicity as axis." };
@@ -276,20 +272,6 @@ struct PhotonMcTask {
276272 fEMEventCut .addEventHistograms (®istry);
277273
278274 const AxisSpec thnAxisPt{thnConfigAxisPt, " #it{p}_{T} (GeV/#it{c})" };
279- const AxisSpec thnAxisPtGen{thnConfigAxisPt, " #it{p}_{T,Gen} (GeV/#it{c})" };
280- const AxisSpec thnAxisPtRec{thnConfigAxisPt, " #it{p}_{T,Rec} (GeV/#it{c})" };
281- const AxisSpec thnAxisPGen{thnConfigAxisPt, " #it{p}_{Gen} (GeV/#it{c})" };
282- const AxisSpec thnAxisPRec{thnConfigAxisPt, " #it{p}_{Rec} (GeV/#it{c})" };
283- const AxisSpec thnAxisPRelative{thnConfigAxisPRelative, " #it{p}_{Rec} - #it{p}_{Gen} / #it{p}_{Gen}" };
284- const AxisSpec thnAxisEGen{thnConfigAxisPt, " #it{E}_{Gen} (GeV)" };
285- const AxisSpec thnAxisERec{thnConfigAxisPt, " #it{E}_{Rec} (GeV)" };
286- const AxisSpec thnAxisERelative{thnConfigAxisERelative, " #it{E}_{Rec} - #it{E}_{Gen} / #it{E}_{Gen}" };
287-
288- const AxisSpec thnAxisEtaRelative{thnConfigAxisEtaRelative, " #it{#eta}_{Rec} - #it{#eta}_{Gen} / #it{#eta}_{Gen}" };
289- const AxisSpec thnAxisPhiRelative{thnConfigAxisPhiRelative, " #it{#varphi}_{Rec} - #it{#varphi}_{Gen} / #it{#varphi}_{Gen}" };
290-
291- const AxisSpec thnAxisEtaGen{280 , -0.7 , 0.7 , " #it{#eta}_{Gen}" };
292- const AxisSpec thnAxisPhiGen{360 , 0 ., o2::constants::math::TwoPI, " #it{#varphi}_{Gen} (rad)" };
293275
294276 AxisSpec thnAxisCentOrMult{1 , 0 ., 1 ., " Centrality/Multiplicity" }; // placeholder, overwritten in init
295277 if (useCent.value ) {
@@ -306,12 +288,14 @@ struct PhotonMcTask {
306288 registry.add (" EMCal/hAccepted" , " EMCal accepted photon pt vs cent/mult" , HistType::kTH2D , {thnAxisPt, thnAxisCentOrMult});
307289 registry.add (" EMCal/hMeasured" , " EMCal measured photon candidate pt vs cent/mult " , HistType::kTH2D , {thnAxisPt, thnAxisCentOrMult});
308290 registry.add (" EMCal/hMeasuredTruePhoton" , " EMCal measured and validated photon pt vs cent/mult " , HistType::kTH2D , {thnAxisPt, thnAxisCentOrMult});
291+ registry.add (" EMCal/hMeasuredTruePhotonGenPt" , " EMCal measured and validated photon gen pt vs cent/mult " , HistType::kTH2D , {thnAxisPt, thnAxisCentOrMult});
309292 }
310293
311294 if (doprocessPcm || doprocessPcmEmcal) {
312295 registry.add (" PCM/hAccepted" , " PCM accepted photon pt vs cent/mult" , HistType::kTH2D , {thnAxisPt, thnAxisCentOrMult});
313296 registry.add (" PCM/hMeasured" , " PCM measured photon candidate pt vs cent/mult " , HistType::kTH2D , {thnAxisPt, thnAxisCentOrMult});
314297 registry.add (" PCM/hMeasuredTruePhoton" , " PCM measured and validated photon pt vs cent/mult " , HistType::kTH2D , {thnAxisPt, thnAxisCentOrMult});
298+ registry.add (" PCM/hMeasuredTruePhotonGenPt" , " PCM measured and validated photon gen pt vs cent/mult " , HistType::kTH2D , {thnAxisPt, thnAxisCentOrMult});
315299 }
316300
317301 }; // end init
@@ -450,6 +434,8 @@ struct PhotonMcTask {
450434 auto pos1mc = mcParticles.begin ();
451435 auto ele1mc = mcParticles.begin ();
452436
437+ auto mcPhoton = mcParticles.begin ();
438+
453439 for (const auto & collision : collisions) {
454440
455441 initCCDB (collision);
@@ -487,7 +473,9 @@ struct PhotonMcTask {
487473 if (photonid1 < 0 ) {
488474 continue ;
489475 }
476+ mcPhoton.setCursor (photonid1);
490477 registry.fill (HIST (" PCM/hMeasuredTruePhoton" ), photon.pt (), centOrMult);
478+ registry.fill (HIST (" PCM/hMeasuredTruePhotonGenPt" ), mcPhoton.pt (), centOrMult);
491479 }
492480 }
493481 }
@@ -545,6 +533,7 @@ struct PhotonMcTask {
545533 }
546534
547535 registry.fill (HIST (" EMCal/hMeasuredTruePhoton" ), photonEMC.pt (), centOrMult);
536+ registry.fill (HIST (" EMCal/hMeasuredTruePhotonGenPt" ), mcPhoton.pt (), centOrMult);
548537 }
549538 }
550539 }
@@ -616,6 +605,7 @@ struct PhotonMcTask {
616605 }
617606
618607 registry.fill (HIST (" EMCal/hMeasuredTruePhoton" ), photonEMC.pt (), centOrMult);
608+ registry.fill (HIST (" EMCal/hMeasuredTruePhotonGenPt" ), mcPhoton.pt (), centOrMult);
619609 }
620610
621611 for (const auto & photon : photonsPCMPerCollision) {
@@ -635,7 +625,9 @@ struct PhotonMcTask {
635625 if (photonid1 < 0 ) {
636626 continue ;
637627 }
628+ mcPhoton.setCursor (photonid1);
638629 registry.fill (HIST (" PCM/hMeasuredTruePhoton" ), photon.pt (), centOrMult);
630+ registry.fill (HIST (" PCM/hMeasuredTruePhotonGenPt" ), mcPhoton.pt (), centOrMult);
639631 }
640632 }
641633 }
0 commit comments