Skip to content

Commit d5cd1a9

Browse files
jkinner2jkinner2
committed
minor_histogram_(name)_changes
1 parent 3fe8909 commit d5cd1a9

File tree

1 file changed

+27
-23
lines changed

1 file changed

+27
-23
lines changed

‎PWGJE/Tasks/photonChargedTriggerCorrelation.cxx‎

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ struct PhotonChargedTriggerCorrelation {
485485
Configurable<int> nTriggerMixingPi0PCM{"nTriggerMixingPi0PCM", 64, "number of triggers that are saved for pi0PCM mixing"};
486486
Configurable<int> nNeighboursMixingPi0PCMPair{"nNeighboursMixingPi0PCMPair", 64, "number neighbours used for for pi0PCM pair mixing"};
487487
Configurable<std::vector<double>> pi0PCMMassRange{"pi0PCMMassRange", {0.10, 0.15}, "photon-pair mass integration range for pi0PCM"};
488-
Configurable<std::vector<double>> pi0PCMSideMassRange{"pi0PCMSideMassRange", {0.15, 0.25}, "photon-pair mass integration range outside outside pi0PCM region"};
488+
Configurable<std::vector<double>> pi0PCMSideMassRange{"pi0PCMSideMassRange", {0.16, 0.24}, "photon-pair mass integration range outside outside pi0PCM region"};
489489

490490
Configurable<bool> requireSingleCollisionPurity{"requireSingleCollisionPurity", true, "whether particle from single chosen MC-col associated to reco-col (else just type/kin match)"};
491491

@@ -498,7 +498,7 @@ struct PhotonChargedTriggerCorrelation {
498498

499499
Configurable<int> nBinsPhi{"nBinsPhi", 72, "number phi bins"};
500500
Configurable<int> nBinsEta{"nBinsEta", 40, "number eta bins"};
501-
Configurable<int> nBinsMgg{"nBinsMgg", 60, "number mass-photon-pair bins"};
501+
Configurable<int> nBinsMgg{"nBinsMgg", 160, "number mass-photon-pair bins"};
502502

503503
Configurable<std::vector<double>> binsPtTrig{"binsPtTrig", {5, 10, 25, 50}, "correlation ptTrig bins"};
504504
Configurable<std::vector<double>> binsPtAssoc{"binsPtAssoc",
@@ -669,7 +669,7 @@ struct PhotonChargedTriggerCorrelation {
669669

670670
const AxisSpec axisPhi{nBinsPhi, 0, constants::math::TwoPI, "#it{#varphi}"};
671671
const AxisSpec axisEta{nBinsEta, -etaMax, etaMax, "#it{#eta}"};
672-
const AxisSpec axisMgg{nBinsMgg, 0, 0.3, "#it{m}_{#gamma#gamma}"};
672+
const AxisSpec axisMgg{nBinsMgg, 0, 0.8, "#it{m}_{#gamma#gamma}"};
673673

674674
const AxisSpec axisPtTrig{binsPtTrig, "#it{p}_{T}^{trig}"};
675675
const AxisSpec axisPtAssoc{binsPtAssoc, "#it{p}_{T}^{assoc}"};
@@ -713,24 +713,25 @@ struct PhotonChargedTriggerCorrelation {
713713
kTHnSparseF, {axisDPhi, axisDEta, axisPtTrig, axisPtAssoc, axisZPvBinning, axisMultBinning}, true);
714714
histos.add("reco/corr/h6_mix_photonPCM", "h6_mix_photonPCM",
715715
kTHnSparseF, {axisDPhi, axisDEta, axisPtTrig, axisPtAssoc, axisZPvBinning, axisMultBinning}, true);
716-
// pi0PCM
717-
histos.add("reco/plain/h3_ptPhiEta_pi0PCM", "h3_ptPhiEta_pi0PCM", kTHnSparseD, {axisPtAssoc, axisPhi, axisEta}, true);
718-
histos.add("reco/plain/h4_ptMggZPvMult_pi0PCM", "h4_ptMggZPvMult_pi0PCM", kTHnSparseD, {axisPtAssoc, axisMgg, axisZPvBinning, axisMultBinning}, true);
719-
histos.add("reco/corr/h3_ptPhiEta_assoc_pi0PCM", "h3_ptPhiEta_assoc_pi0PCM", kTHnSparseD, {axisPtAssoc, axisPhi, axisEta}, true);
720-
histos.add("reco/corr/h4_ptMggZPvMult_assoc_pi0PCM", "h4_ptMggZPvMult_assoc_pi0PCM", kTHnSparseD, {axisPtAssoc, axisMgg, axisZPvBinning, axisMultBinning}, true);
721-
histos.add("reco/corr/h6_corr_pi0PCM", "h6_corr_pi0PCM",
716+
// photonPCM pairs
717+
histos.add("reco/plain/h4_ptMggZPvMult_photonPCMPair", "h4_ptMggZPvMult_photonPCMPair", kTHnSparseD, {axisPtAssoc, axisMgg, axisZPvBinning, axisMultBinning}, true);
718+
histos.add("reco/plain/h3_ptPhiEta_pi0PCMPeak", "h3_ptPhiEta_pi0PCMPeak", kTHnSparseD, {axisPtAssoc, axisPhi, axisEta}, true);
719+
histos.add("reco/corr/h4_ptMggZPvMult_assoc_photonPCMPair", "h4_ptMggZPvMult_assoc_photonPCMPair", kTHnSparseD, {axisPtAssoc, axisMgg, axisZPvBinning, axisMultBinning}, true);
720+
histos.add("reco/corr/h3_ptPhiEta_assoc_pi0PCMPeak", "h3_ptPhiEta_assoc_pi0PCMPeak", kTHnSparseD, {axisPtAssoc, axisPhi, axisEta}, true);
721+
// peak (mgg)
722+
histos.add("reco/corr/h6_corr_pi0PCMPeak", "h6_corr_pi0PCMPeak",
722723
kTHnSparseF, {axisDPhi, axisDEta, axisPtTrig, axisPtAssoc, axisZPvBinning, axisMultBinning}, true);
723-
histos.add("reco/corr/h6_mix_pi0PCM", "h6_mix_pi0PCM",
724+
histos.add("reco/corr/h6_mix_pi0PCMPeak", "h6_mix_pi0PCMPeak",
724725
kTHnSparseF, {axisDPhi, axisDEta, axisPtTrig, axisPtAssoc, axisZPvBinning, axisMultBinning}, true);
725-
// side band (mgg)
726+
// side (mgg)
726727
histos.add("reco/corr/h6_corr_pi0PCMSide", "h6_corr_pi0PCMSide",
727728
kTHnSparseF, {axisDPhi, axisDEta, axisPtTrig, axisPtAssoc, axisZPvBinning, axisMultBinning}, true);
728729
histos.add("reco/corr/h6_mix_pi0PCMSide", "h6_mix_pi0PCMSide",
729730
kTHnSparseF, {axisDPhi, axisDEta, axisPtTrig, axisPtAssoc, axisZPvBinning, axisMultBinning}, true);
730731
// event mixing for photon pairs
731-
histos.add("reco/plain/h2_zPvMult_pi0PCMMix", "h2_zPvMult_pi0PCMMix", kTHnSparseD, {axisZPv, axisMult}, true);
732-
histos.add("reco/plain/h3_ptPhiEta_pi0PCMMix", "h3_ptPhiEta_pi0PCMMix", kTHnSparseD, {axisPtAssoc, axisPhi, axisEta}, true);
733-
histos.add("reco/plain/h4_ptMggZPvMult_pi0PCMMix", "h4_ptMggZPvMult_pi0PCMMix", kTHnSparseD, {axisPtAssoc, axisMgg, axisZPvBinning, axisMultBinning}, true);
732+
histos.add("reco/plain/h2_zPvMult_photonPCMPair_evMix", "h2_zPvMult_photonPCMPair_evMix", kTHnSparseD, {axisZPv, axisMult}, true);
733+
histos.add("reco/plain/h4_ptMggZPvMult_photonPCMPair_evMix", "h4_ptMggZPvMult_photonPCMPair_evMix", kTHnSparseD, {axisPtAssoc, axisMgg, axisZPvBinning, axisMultBinning}, true);
734+
histos.add("reco/plain/h3_ptPhiEta_pi0PCMPeak_evMix", "h3_ptPhiEta_pi0PCMPeak_evMix", kTHnSparseD, {axisPtAssoc, axisPhi, axisEta}, true);
734735

735736
// mc info
736737
histos.add("mc/info/h1_nEvents_mcTrue", "h1_nEvents_mcTrue", kTH1D, {axisN});
@@ -1212,10 +1213,10 @@ struct PhotonChargedTriggerCorrelation {
12121213
return;
12131214

12141215
auto const funcPlain = [this](auto const& collision, auto const& associated) {
1215-
histos.fill(HIST("reco/plain/h4_ptMggZPvMult_pi0PCM"), associated.pt(), associated.mgg(), collision.posZ(), collision.multNTracksGlobal());
1216+
histos.fill(HIST("reco/plain/h4_ptMggZPvMult_photonPCMPair"), associated.pt(), associated.mgg(), collision.posZ(), collision.multNTracksGlobal());
12161217
// pi0 mass range
12171218
if (associated.mgg() > pi0PCMMassRange.value[0] && associated.mgg() < pi0PCMMassRange.value[1]) {
1218-
histos.fill(HIST("reco/plain/h3_ptPhiEta_pi0PCM"), associated.pt(), associated.phi(), associated.eta());
1219+
histos.fill(HIST("reco/plain/h3_ptPhiEta_pi0PCMPeak"), associated.pt(), associated.phi(), associated.eta());
12191220
}
12201221
};
12211222
corrProcessPlain(collision, photonPCMPairs, funcPlain);
@@ -1226,16 +1227,16 @@ struct PhotonChargedTriggerCorrelation {
12261227
trigger.jetTrackId() == associated.negTrack2Id() || trigger.jetTrackId() == associated.posTrack2Id())
12271228
return;
12281229

1229-
histos.fill(HIST("reco/corr/h4_ptMggZPvMult_assoc_pi0PCM"),
1230+
histos.fill(HIST("reco/corr/h4_ptMggZPvMult_assoc_photonPCMPair"),
12301231
associated.pt(), associated.mgg(), collision.posZ(), collision.multNTracksGlobal(),
12311232
getInvEff<ParticleType::Trigger>(trigger.pt()));
12321233

12331234
if (associated.mgg() > pi0PCMMassRange.value[0] && associated.mgg() < pi0PCMMassRange.value[1]) {
12341235
// pi0 mass range
1235-
histos.fill(HIST("reco/corr/h3_ptPhiEta_assoc_pi0PCM"),
1236+
histos.fill(HIST("reco/corr/h3_ptPhiEta_assoc_pi0PCMPeak"),
12361237
associated.pt(), associated.phi(), associated.eta(),
12371238
getInvEff<ParticleType::Trigger>(trigger.pt()));
1238-
histos.fill(HIST("reco/corr/h6_corr_pi0PCM"),
1239+
histos.fill(HIST("reco/corr/h6_corr_pi0PCMPeak"),
12391240
getDeltaPhi(trigger.phi(), associated.phi()),
12401241
trigger.eta() - associated.eta(),
12411242
trigger.pt(), associated.pt(), collision.posZ(), collision.multNTracksGlobal(),
@@ -1255,7 +1256,7 @@ struct PhotonChargedTriggerCorrelation {
12551256
float const mixingTriggerPt, float const mixingTriggerPhi, float const mixingTriggerEta, auto const& associated, auto const perTriggerWeight) {
12561257
if (associated.mgg() > pi0PCMMassRange.value[0] && associated.mgg() < pi0PCMMassRange.value[1]) {
12571258
// pi0 mass range
1258-
histos.fill(HIST("reco/corr/h6_mix_pi0PCM"),
1259+
histos.fill(HIST("reco/corr/h6_mix_pi0PCMPeak"),
12591260
getDeltaPhi(mixingTriggerPhi, associated.phi()),
12601261
mixingTriggerEta - associated.eta(),
12611262
mixingTriggerPt, associated.pt(), collision.posZ(), collision.multNTracksGlobal(),
@@ -1297,7 +1298,7 @@ struct PhotonChargedTriggerCorrelation {
12971298
continue;
12981299

12991300
// event info
1300-
histos.fill(HIST("reco/plain/h2_zPvMult_pi0PCMMix"), collision1.posZ(), collision1.multNTracksGlobal());
1301+
histos.fill(HIST("reco/plain/h2_zPvMult_photonPCMPair_evMix"), collision1.posZ(), collision1.multNTracksGlobal());
13011302

13021303
// mixing loop
13031304
for (auto const& [photonPCM1, photonPCM2] : soa::combinations(soa::CombinationsFullIndexPolicy(photonPCMs1, photonPCMs2))) {
@@ -1306,8 +1307,11 @@ struct PhotonChargedTriggerCorrelation {
13061307
ROOT::Math::PtEtaPhiMVector const p4photonPCMPair = p4photonPCM1 + p4photonPCM2;
13071308

13081309
// plain
1309-
histos.fill(HIST("reco/plain/h3_ptPhiEta_pi0PCMMix"), p4photonPCMPair.pt(), p4photonPCMPair.phi() + constants::math::PI, p4photonPCMPair.eta());
1310-
histos.fill(HIST("reco/plain/h4_ptMggZPvMult_pi0PCMMix"), p4photonPCMPair.pt(), p4photonPCMPair.M(), collision1.posZ(), collision1.multNTracksGlobal());
1310+
histos.fill(HIST("reco/plain/h4_ptMggZPvMult_photonPCMPair_evMix"), p4photonPCMPair.pt(), p4photonPCMPair.M(), collision1.posZ(), collision1.multNTracksGlobal());
1311+
// pi0 mass range
1312+
if (p4photonPCMPair.M() > pi0PCMMassRange.value[0] && p4photonPCMPair.M() < pi0PCMMassRange.value[1]) {
1313+
histos.fill(HIST("reco/plain/h3_ptPhiEta_pi0PCMPeak_evMix"), p4photonPCMPair.pt(), p4photonPCMPair.phi() + constants::math::PI, p4photonPCMPair.eta());
1314+
}
13111315
}
13121316
}
13131317
}

0 commit comments

Comments
 (0)