Skip to content

Commit 8c821c2

Browse files
JimunLeejimun_lee
JimunLee
and
jimun_lee
authored
[PWGJE] Organized histograms by switch (#11043)
Co-authored-by: jimun_lee <jimun.lee@cern.ch>
1 parent 425f7f2 commit 8c821c2

File tree

1 file changed

+46
-69
lines changed

1 file changed

+46
-69
lines changed

‎PWGJE/Tasks/phiInJets.cxx‎

Lines changed: 46 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ struct phiInJets {
9292
Configurable<bool> cfgMCGenMATCHEDHists{"cfgMCGenMATCHEDHists", false, "Enables MCGenMATCHEDHists"};
9393
Configurable<bool> cfgMCRecMATCHEDHists{"cfgMCRecMATCHEDHists", false, "Enables MCRecMATCHEDHists"};
9494

95-
Configurable<int> cfgMinvNBins{"cfgMinvNBins", 500, "Number of bins for Minv axis"};
96-
Configurable<float> cfgMinvMin{"cfgMinvMin", 0.75, "Minimum Minv value"};
97-
Configurable<float> cfgMinvMax{"cfgMinvMax", 1.25, "Maximum Minv value"};
95+
Configurable<int> cfgMinvNBins{"cfgMinvNBins", 300, "Number of bins for Minv axis"};
96+
Configurable<float> cfgMinvMin{"cfgMinvMin", 0.60, "Minimum Minv value"};
97+
Configurable<float> cfgMinvMax{"cfgMinvMax", 1.20, "Maximum Minv value"};
9898

9999
// CONFIG DONE
100100
///////////////////////////////////////// //INIT
@@ -168,7 +168,6 @@ struct phiInJets {
168168
JEhistos.add("ptJEHistogramPhi", "ptJEHistogramPhi", kTH1F, {PtAxis});
169169
JEhistos.add("ptJEHistogramPhi_JetTrigger", "ptJEHistogramPhi_JetTrigger", kTH1F, {PtAxis});
170170
}
171-
172171
if (cfgDaughterQAHists) {
173172
JEhistos.add("hNRealPhiVPhiCand", "hNRealPhiVPhiCand", kTH2F, {{10, 0, 10}, {10, 0, 10}});
174173
JEhistos.add("hNRealPhiWithJetVPhiCand", "hNRealPhiWithJetVPhiCand", kTH2F, {{10, 0, 10}, {10, 0, 10}});
@@ -177,37 +176,36 @@ struct phiInJets {
177176
JEhistos.add("hMCRec_nonmatch_hUSS_Kangle_v_pt", "hMCRec_nonmatch_hUSS_Kangle_v_pt", kTH2F, {axisEta, PtAxis});
178177
JEhistos.add("hMCRec_nonmatch_hUSS_INSIDE_pt_v_eta", "hMCRec_nonmatch_hUSS_INSIDE_pt_v_eta", kTH2F, {PtAxis, axisEta});
179178
}
180-
181179
// used for Minv closure tests
182180
// MB
183181
if (cfgMCRecMBHists) {
184182
JEhistos.add("hMCRec_hUSS", "hMCRec_hUSS", kTHnSparseF, {dRAxis, PtAxis, MinvAxis});
185183
JEhistos.add("hMCRec_hLSS", "hMCRec_hLSS", kTHnSparseF, {dRAxis, PtAxis, MinvAxis});
186184
JEhistos.add("hMCRecTrue_hUSS", "hMCRecTrue_hUSS", kTHnSparseF, {dRAxis, PtAxis, MinvAxis});
185+
}
186+
187+
if (cfgMCRecRotationalHists) {
187188
JEhistos.add("hMCRec_R_distribution", "hMCRec_R_distribution", kTH1F, {{100, 0.0, 2 * TMath::Pi()}});
188189
JEhistos.add("hMCRec_dPhi_distribution", "hMCRec_dPhi_distribution", kTH1F, {{80, -5.0, 7.0}});
189190
JEhistos.add("hMCRec_dEta_distribution", "hMCRec_dEta_distribution", kTH1F, {{100, -2.0, 2.0}});
190-
191-
if (cfgMCRecRotationalHists) {
192-
JEhistos.add("hMCRec_hUSS_Rotational", "hMCRec_hUSS_Rotational", kTHnSparseF, {dRAxis, PtAxis, MinvAxis});
193-
JEhistos.add("hMCRec_R_Rotation_distribution", "hMCRec_R_Rotation_distribution", HistType::kTH1F, {{100, 0.0, 2 * TMath::Pi()}});
194-
JEhistos.add("hMCRec_dPhi_rot_distribution", "hMCRec_dPhi_rot_distribution", kTH1F, {{80, -5.0, 7.0}});
195-
JEhistos.add("hMCRec_dEta_rot_distribution", "hMCRec_dEta_rot_distribution", kTH1F, {{100, -2.0, 2.0}});
196-
JEhistos.add("hMCRec_dEta_qa_rot_distribution", "hMCRec_dEta_qa_rot_distribution", kTH1F, {{100, -4.0, 2.0}});
197-
}
191+
JEhistos.add("hMCRec_hUSS_Rotational", "hMCRec_hUSS_Rotational", kTHnSparseF, {dRAxis, PtAxis, MinvAxis});
192+
JEhistos.add("hMCRec_R_Rotation_distribution", "hMCRec_R_Rotation_distribution", HistType::kTH1F, {{100, 0.0, 2 * TMath::Pi()}});
193+
JEhistos.add("hMCRec_dPhi_rot_distribution", "hMCRec_dPhi_rot_distribution", kTH1F, {{80, -5.0, 7.0}});
194+
JEhistos.add("hMCRec_dEta_rot_distribution", "hMCRec_dEta_rot_distribution", kTH1F, {{100, -2.0, 2.0}});
195+
JEhistos.add("hMCRec_dEta_qa_rot_distribution", "hMCRec_dEta_qa_rot_distribution", kTH1F, {{100, -4.0, 2.0}});
198196
}
197+
199198
// INSIDE
200199
if (cfgMCRecInsideHists) {
201200
JEhistos.add("hMCRec_hUSS_INSIDE", "hMCRec_hUSS_INSIDE", kTHnSparseF, {dRAxis, PtAxis, MinvAxis});
202201
JEhistos.add("hMCRec_hLSS_INSIDE", "hMCRec_hLSS_INSIDE", kTHnSparseF, {dRAxis, PtAxis, MinvAxis});
203202
JEhistos.add("hMCRecTrue_hUSS_INSIDE", "hMCRecTrue_hUSS_INSIDE", kTHnSparseF, {dRAxis, PtAxis, MinvAxis});
204203
JEhistos.add("hMCRec_nonmatch_hUSS_INSIDE", "hMCRec_nonmatch_hUSS_INSIDE", kTHnSparseF, {dRAxis, PtAxis, MinvAxis});
205-
JEhistos.add("hMCRec_nonmatch_hUSS_INSIDE_1D", "hMCRec_nonmatch_hUSS_INSIDE_1D", kTH1F, {MinvAxis});
206-
JEhistos.add("hMCRec_nonmatch_hUSS_INSIDE_1D_2_3", "hMCRec_nonmatch_hUSS_INSIDE_1D_2_3", kTH1F, {MinvAxis});
207204
JEhistos.add("JetVsPhi_REC", "JetVsPhi_REC", kTH2F, {{4000, 0., 200.}, {200, 0, 20.0}});
208205
JEhistos.add("minvJEHistogramPhi", "minvJEHistogramPhi", kTH1F, {MinvAxis});
209206
}
210207
}
208+
211209
if (cfgMCGenHists) {
212210
JEhistos.add("nEvents_MCGen", "nEvents_MCGen", kTH1F, {{4, 0.0, 4.0}});
213211

@@ -560,7 +558,7 @@ struct phiInJets {
560558
}
561559
JEhistos.fill(HIST("nEvents"), 0.5);
562560

563-
if (fabs(collision.posZ()) > cfgVtxCut)
561+
if (std::fabs(collision.posZ()) > cfgVtxCut)
564562
return;
565563
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits))
566564
return;
@@ -646,14 +644,14 @@ struct phiInJets {
646644
// # of Events
647645
//=================
648646
JEhistos.fill(HIST("nEvents_MCRec"), 0.5);
649-
if (fabs(collision.posZ()) > cfgVtxCut)
647+
if (std::fabs(collision.posZ()) > cfgVtxCut)
650648
return;
651649
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits))
652650
return;
653651

654652
bool INELgt0 = false;
655653
for (const auto& track : tracks) {
656-
if (fabs(track.eta()) < cfgtrkMaxEta) {
654+
if (std::fabs(track.eta()) < cfgtrkMaxEta) {
657655
INELgt0 = true;
658656
break;
659657
}
@@ -699,7 +697,7 @@ struct phiInJets {
699697
if (track.has_mcParticle()) {
700698
auto mcParticle = track.mcParticle();
701699
if (cfgPIDQAHists) {
702-
if (mcParticle.isPhysicalPrimary() && fabs(mcParticle.eta()) <= cfgtrkMaxEta) {
700+
if (mcParticle.isPhysicalPrimary() && std::fabs(mcParticle.eta()) <= cfgtrkMaxEta) {
703701
if (abs(mcParticle.pdgCode()) == 211)
704702
JEhistos.fill(HIST("ptJEHistogramPion"), mcParticle.pt());
705703
if (abs(mcParticle.pdgCode()) == 321)
@@ -723,12 +721,12 @@ struct phiInJets {
723721
if (originalTrack.globalIndex() == originalTrack2.globalIndex())
724722
continue;
725723
}
726-
if (fabs(originalTrack.eta()) > cfgtrkMaxEta || fabs(originalTrack2.eta()) > cfgtrkMaxEta)
724+
if (std::fabs(originalTrack.eta()) > cfgtrkMaxEta || std::fabs(originalTrack2.eta()) > cfgtrkMaxEta)
727725
continue;
728726

729727
double dPhi = TVector2::Phi_mpi_pi(originalTrack.phi() - originalTrack2.phi());
730728
double dEta = originalTrack.eta() - originalTrack2.eta();
731-
if (cfgMCRecMBHists) {
729+
if (cfgMCRecRotationalHists) {
732730
JEhistos.fill(HIST("hMCRec_dPhi_distribution"), dPhi);
733731
JEhistos.fill(HIST("hMCRec_dEta_distribution"), dEta);
734732
}
@@ -737,7 +735,6 @@ struct phiInJets {
737735
TLorentzVector lDecayDaughter1, lDecayDaughter2, lResonance, lRotationalTrack, lRotationalResonance;
738736
lDecayDaughter1.SetXYZM(originalTrack.px(), originalTrack.py(), originalTrack.pz(), massKa);
739737
//-----------------------------------------------------------------------
740-
741738
TRandom* trand = new TRandom();
742739
double shift = trand->Uniform(TMath::Pi() - TMath::Pi() / 10.0, TMath::Pi() + TMath::Pi() / 10.0);
743740
// double shift = TMath::Pi();
@@ -747,23 +744,8 @@ struct phiInJets {
747744
} else {
748745
lDecayDaughter2.SetXYZM(originalTrack2.px(), originalTrack2.py(), originalTrack2.pz(), massPi);
749746

750-
// double pTog = TMath::Sqrt(originalTrack2.px() * originalTrack2.px() + originalTrack2.py() * originalTrack2.py());
751-
// double Pxrot = pTog*TMath::Cos(originalTrack2.phi() + shift);
752-
// double Pyrot = pTog*TMath::Sin(originalTrack2.phi() + shift);
753-
754-
// if(gDebug){
755-
// double Ptrot = TMath::Sqrt(Pxrot*Pxrot + Pyrot*Pyrot);
756-
// if(TMath::Abs(Ptrot-pTog)>0.1) {
757-
// std::cout<<"We are jottettta"<<std::endl;
758-
// std::cout<<Ptrot-pTog<<std::endl;
759-
// }
760-
// }
761-
// lRotationalTrack.SetXYZM(Pxrot, Pyrot,originalTrack.pz(), massPi);
762747
lRotationalTrack = lDecayDaughter2;
763-
764-
// JEhistos.fill(HIST("hMCRec_Phi_Before_Shift"), lRotationalTrack.Phi());
765748
lRotationalTrack.RotateZ(shift);
766-
// JEhistos.fill(HIST("hMCRec_Phi_After_Shift"), lRotationalTrack.Phi());
767749

768750
double dPhi_rot = TVector2::Phi_mpi_pi(lDecayDaughter1.Phi() - lRotationalTrack.Phi());
769751
double dEta_rot = lDecayDaughter1.Eta() - lRotationalTrack.Eta();
@@ -776,12 +758,11 @@ struct phiInJets {
776758
JEhistos.fill(HIST("hMCRec_dEta_qa_rot_distribution"), dEta_rot_qa);
777759
}
778760
}
779-
780761
//-----------------------------------------------------------------------
781762
lResonance = lDecayDaughter1 + lDecayDaughter2;
782763
if (cfgIsKstar)
783764
lRotationalResonance = lDecayDaughter1 + lRotationalTrack;
784-
if (fabs(lResonance.Eta()) > cfgtrkMaxEta)
765+
if (std::fabs(lResonance.Eta()) > cfgtrkMaxEta)
785766
continue;
786767

787768
if (cfgDaughterQAHists) {
@@ -794,13 +775,10 @@ struct phiInJets {
794775
if (cfgMCRecMBHists) {
795776
if (originalTrack.sign() * originalTrack2.sign() < 0) {
796777
JEhistos.fill(HIST("hMCRec_hUSS"), 1.0, lResonance.Pt(), lResonance.M());
797-
// normal R
798-
JEhistos.fill(HIST("hMCRec_R_distribution"), dR);
799778

800-
// switch because of memory
801779
if (cfgMCRecRotationalHists && cfgIsKstar) {
780+
JEhistos.fill(HIST("hMCRec_R_distribution"), dR);
802781
JEhistos.fill(HIST("hMCRec_hUSS_Rotational"), 1.0, lRotationalResonance.Pt(), lResonance.M());
803-
// Rotational R
804782
JEhistos.fill(HIST("hMCRec_R_Rotation_distribution"), dR_rot);
805783
}
806784
} else if (originalTrack.sign() * originalTrack2.sign() > 0) {
@@ -860,13 +838,13 @@ struct phiInJets {
860838
if (track.has_mcParticle() && track2.has_mcParticle()) {
861839
auto part1 = track.mcParticle();
862840
auto part2 = track2.mcParticle();
863-
if (fabs(part1.pdgCode()) != 321)
841+
if (std::fabs(part1.pdgCode()) != 321)
864842
continue; // Not Kaon
865843
if (!cfgIsKstar) {
866-
if (fabs(part2.pdgCode()) != 321)
844+
if (std::fabs(part2.pdgCode()) != 321)
867845
continue; // Not Kaon
868846
} else {
869-
if (fabs(part2.pdgCode()) != 211)
847+
if (std::fabs(part2.pdgCode()) != 211)
870848
continue; // Not Kaon
871849
}
872850

@@ -948,9 +926,8 @@ struct phiInJets {
948926
}
949927
if (cfgDaughterQAHists) {
950928
JEhistos.fill(HIST("hMCRec_nonmatch_hUSS_INSIDE_pt_v_eta"), lResonance.Pt(), lResonance.Eta());
951-
JEhistos.fill(HIST("hMCRec_nonmatch_hUSS_INSIDE_1D"), lResonance.M());
952-
if (lResonance.Pt() > 2.0 && lResonance.Pt() < 3)
953-
JEhistos.fill(HIST("hMCRec_nonmatch_hUSS_INSIDE_1D_2_3"), lResonance.M());
929+
// if (lResonance.Pt() > 2.0 && lResonance.Pt() < 3)
930+
// JEhistos.fill(HIST("hMCRec_nonmatch_hUSS_INSIDE_1D_2_3"), lResonance.M());
954931
JEhistos.fill(HIST("hMCRec_nonmatch_hUSS_INSIDE"), jetpt, lResonance.Pt(), lResonance.M());
955932
}
956933
}
@@ -1006,11 +983,11 @@ struct phiInJets {
1006983
return;
1007984
}
1008985

1009-
if (fabs(collision.posZ()) > cfgVtxCut) // bad vertex
986+
if (std::fabs(collision.posZ()) > cfgVtxCut) // bad vertex
1010987
return;
1011988
bool INELgt0 = false;
1012989
for (const auto& mcParticle : mcParticles) {
1013-
if (fabs(mcParticle.eta()) < cfgtrkMaxEta) {
990+
if (std::fabs(mcParticle.eta()) < cfgtrkMaxEta) {
1014991
INELgt0 = true;
1015992
break;
1016993
}
@@ -1040,15 +1017,15 @@ struct phiInJets {
10401017

10411018
// Check pikp and phi
10421019
for (const auto& mcParticle : mcParticles) {
1043-
if (mcParticle.isPhysicalPrimary() && fabs(mcParticle.eta()) <= cfgtrkMaxEta) { // watch out for context!!!
1020+
if (mcParticle.isPhysicalPrimary() && std::fabs(mcParticle.eta()) <= cfgtrkMaxEta) { // watch out for context!!!
10441021
if (abs(mcParticle.pdgCode()) == 211)
10451022
JEhistos.fill(HIST("ptGeneratedPion"), mcParticle.pt());
10461023
if (abs(mcParticle.pdgCode()) == 321)
10471024
JEhistos.fill(HIST("ptGeneratedKaon"), mcParticle.pt());
10481025
if (abs(mcParticle.pdgCode()) == 2212)
10491026
JEhistos.fill(HIST("ptGeneratedProton"), mcParticle.pt());
10501027
}
1051-
if (fabs(mcParticle.eta()) <= cfgtrkMaxEta) { // watch out for context!!!
1028+
if (std::fabs(mcParticle.eta()) <= cfgtrkMaxEta) { // watch out for context!!!
10521029
TLorentzVector lResonance;
10531030
lResonance.SetPxPyPzE(mcParticle.px(), mcParticle.py(), mcParticle.pz(), mcParticle.e());
10541031

@@ -1068,12 +1045,12 @@ struct phiInJets {
10681045
if (!cfgIsKstar) {
10691046
if (mcParticle.has_daughters())
10701047
for (auto& dgth : mcParticle.daughters_as<aod::JetParticles>())
1071-
if (fabs(dgth.pdgCode()) != 321)
1048+
if (std::fabs(dgth.pdgCode()) != 321)
10721049
skip = true;
10731050
} else {
10741051
if (mcParticle.has_daughters())
10751052
for (auto& dgth : mcParticle.daughters_as<aod::JetParticles>())
1076-
if (fabs(dgth.pdgCode()) != 321 || fabs(dgth.pdgCode()) != 211)
1053+
if (std::fabs(dgth.pdgCode()) != 321 || std::fabs(dgth.pdgCode()) != 211)
10771054
skip = true;
10781055
}
10791056

@@ -1162,7 +1139,7 @@ struct phiInJets {
11621139

11631140
JEhistos.fill(HIST("nEvents_MCGen_MATCHED"), 0.5);
11641141

1165-
if (fabs(collision.posZ()) > cfgVtxCut)
1142+
if (std::fabs(collision.posZ()) > cfgVtxCut)
11661143
return;
11671144

11681145
if (recocolls.size() <= 0) // not reconstructed
@@ -1219,7 +1196,7 @@ struct phiInJets {
12191196

12201197
// First we do GEN part
12211198
for (const auto& mcParticle : mcParticles) {
1222-
if (fabs(mcParticle.eta()) > cfgtrkMaxEta)
1199+
if (std::fabs(mcParticle.eta()) > cfgtrkMaxEta)
12231200
continue;
12241201

12251202
int GenPID = 0;
@@ -1229,7 +1206,7 @@ struct phiInJets {
12291206
else
12301207
GenPID = 313;
12311208

1232-
if (fabs(mcParticle.pdgCode()) == GenPID) {
1209+
if (std::fabs(mcParticle.pdgCode()) == GenPID) {
12331210
bool skip = false;
12341211
double phi_dgth_px[2] = {0};
12351212
double phi_dgth_py[2] = {0};
@@ -1245,15 +1222,15 @@ struct phiInJets {
12451222
if (!cfgIsKstar) {
12461223
if (mcParticle.has_daughters()) {
12471224
for (auto& dgth : mcParticle.daughters_as<aod::JetParticles>()) {
1248-
if (fabs(dgth.pdgCode()) != 321) {
1225+
if (std::fabs(dgth.pdgCode()) != 321) {
12491226
skip = true;
12501227
break;
12511228
}
12521229
for (const auto& track : tracks) {
12531230
auto trk = track.track_as<myCompleteTracks>();
12541231
if (!trackSelection(trk))
12551232
continue;
1256-
if (fabs(trk.eta()) > cfgtrkMaxEta)
1233+
if (std::fabs(trk.eta()) > cfgtrkMaxEta)
12571234
continue;
12581235
if (cfgSimPID) {
12591236
if (!trackPID(trk, true))
@@ -1284,7 +1261,7 @@ struct phiInJets {
12841261
} else { // check for kstar
12851262
if (mcParticle.has_daughters())
12861263
for (auto& dgth : mcParticle.daughters_as<aod::JetParticles>())
1287-
if (fabs(dgth.pdgCode()) != 321 || fabs(dgth.pdgCode()) != 211)
1264+
if (std::fabs(dgth.pdgCode()) != 321 || std::fabs(dgth.pdgCode()) != 211)
12881265
skip = true;
12891266
}
12901267

@@ -1375,19 +1352,19 @@ struct phiInJets {
13751352
if ((nprocessRecJEEvents + 1) % 10000 == 0) {
13761353
double histmem = JEhistos.getSize();
13771354
std::cout << histmem << std::endl;
1378-
std::cout << "processMatched Rec Events: " << nprocessRecJEEvents << std::endl;
1355+
std::cout << "processMatchedRec: " << nprocessRecEvents << std::endl;
13791356
}
13801357
}
13811358
JEhistos.fill(HIST("nEvents_MCRec_MATCHED"), 0.5);
13821359

1383-
if (fabs(collision.posZ()) > cfgVtxCut)
1360+
if (std::fabs(collision.posZ()) > cfgVtxCut)
13841361
return;
13851362
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits))
13861363
return;
13871364

13881365
bool INELgt0 = false;
13891366
for (const auto& track : tracks) {
1390-
if (fabs(track.eta()) < cfgtrkMaxEta) {
1367+
if (std::fabs(track.eta()) < cfgtrkMaxEta) {
13911368
INELgt0 = true;
13921369
break;
13931370
}
@@ -1439,7 +1416,7 @@ struct phiInJets {
14391416
if (trk1.globalIndex() == trk2.globalIndex())
14401417
continue;
14411418
}
1442-
if (fabs(trk1.eta()) > cfgtrkMaxEta || fabs(trk2.eta()) > cfgtrkMaxEta)
1419+
if (std::fabs(trk1.eta()) > cfgtrkMaxEta || std::fabs(trk2.eta()) > cfgtrkMaxEta)
14431420
continue;
14441421
if ((trk1.sign() * trk2.sign()) > 0)
14451422
continue; // Not K+K-
@@ -1453,13 +1430,13 @@ struct phiInJets {
14531430
if (track1.has_mcParticle() && track2.has_mcParticle()) {
14541431
auto part1 = track1.mcParticle();
14551432
auto part2 = track2.mcParticle();
1456-
if (fabs(part1.pdgCode()) != 321)
1433+
if (std::fabs(part1.pdgCode()) != 321)
14571434
continue; // Not Kaon
14581435
if (!cfgIsKstar) {
1459-
if (fabs(part2.pdgCode()) != 321)
1436+
if (std::fabs(part2.pdgCode()) != 321)
14601437
continue; // Not Kaon
14611438
} else {
1462-
if (fabs(part2.pdgCode()) != 211)
1439+
if (std::fabs(part2.pdgCode()) != 211)
14631440
continue; // Not Kaon
14641441
}
14651442
if (!part1.has_mothers())
@@ -1506,7 +1483,7 @@ struct phiInJets {
15061483
lDecayDaughter2.SetXYZM(trk2.px(), trk2.py(), trk2.pz(), massPi);
15071484

15081485
lResonance = lDecayDaughter1 + lDecayDaughter2;
1509-
if (fabs(lResonance.Eta()) > cfgtrkMaxEta)
1486+
if (std::fabs(lResonance.Eta()) > cfgtrkMaxEta)
15101487
continue;
15111488

15121489
bool jetFlag = false;

0 commit comments

Comments
 (0)