Skip to content

Commit d9f8f5d

Browse files
[PWGJE] jetSpectraCharged.cxx: add isMCGenOnly configurable, clean up one if{} in histogram definitions, remove processTracks() processes to avoid confusion
1 parent deba0b5 commit d9f8f5d

File tree

1 file changed

+9
-50
lines changed

1 file changed

+9
-50
lines changed

PWGJE/Tasks/jetSpectraCharged.cxx

Lines changed: 9 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ struct JetSpectraCharged {
7878
Configurable<int> acceptSplitCollisions{"acceptSplitCollisions", 0, "0: only look at mcCollisions that are not split; 1: accept split mcCollisions, 2: accept split mcCollisions but only look at the first reco collision associated with it"};
7979
Configurable<bool> skipMBGapEvents{"skipMBGapEvents", false, "flag to choose to reject min. bias gap events; jet-level rejection can also be applied at the jet finder level for jets only, here rejection is applied for collision and track process functions for the first time, and on jets in case it was set to false at the jet finder level"};
8080
Configurable<bool> checkLeadConstituentPtForMcpJets{"checkLeadConstituentPtForMcpJets", false, "flag to choose whether particle level jets should have their lead track pt above leadingConstituentPtMin to be accepted; off by default, as leadingConstituentPtMin cut is only applied on MCD jets for the Pb-Pb analysis using pp MC anchored to Pb-Pb for the response matrix"};
81+
Configurable<bool> isMCGenOnly{"isMCGenOnly", false, "analysis is run over mcGen only"};
8182

8283
std::vector<int> eventSelectionBits;
8384
int trackSelection = -1;
@@ -106,11 +107,6 @@ struct JetSpectraCharged {
106107
AxisSpec jetPtAxisRhoAreaSub = {400, -200., 200., "#it{p}_{T} (GeV/#it{c})"};
107108
AxisSpec jetEtaAxis = {nBinsEta, -1.0, 1.0, "#eta"};
108109

109-
if (doprocessTracksQC || doprocessTracksQCWeighted) {
110-
registry.add("h_track_pt", "track #it{p}_{T} ; #it{p}_{T,track} (GeV/#it{c})", {HistType::kTH1F, {trackPtAxis}}, doSumw2);
111-
registry.add("h2_track_eta_track_phi", "track eta vs. track phi; #eta; #phi; counts", {HistType::kTH2F, {trackEtaAxis, phiAxis}}, doSumw2);
112-
}
113-
114110
if (doprocessCollisions || doprocessCollisionsWeighted) {
115111
registry.add("h_collisions", "number of events;event status;entries", {HistType::kTH1F, {{4, 0.0, 4.0}}}, doSumw2);
116112
registry.get<TH1>(HIST("h_collisions"))->GetXaxis()->SetBinLabel(1, "allColl");
@@ -154,7 +150,7 @@ struct JetSpectraCharged {
154150
}
155151
registry.add("h2_centrality_mccollisions", "mc event status vs. centrality;entries;centrality", {HistType::kTH2F, {centralityAxis, {4, 0.0, 4.0}}}, doSumw2);
156152
}
157-
if (doprocessSpectraMCP || doprocessSpectraMCPWeighted || doprocessMCCollisions || doprocessMCCollisionsWeighted) {
153+
if (doprocessMCCollisions || doprocessMCCollisionsWeighted) {
158154
registry.add("h_mccollisions_zvertex", "position of mc collision ;#it{Z} (cm)", {HistType::kTH1F, {{300, -15.0, 15.0}}}, doSumw2);
159155
}
160156

@@ -318,6 +314,13 @@ struct JetSpectraCharged {
318314
template <typename TMCColl, typename TCollisions>
319315
bool applyMCCollisionCuts(TMCColl const& mccollision, TCollisions const& collisions, bool fillHistograms = false, bool isWeighted = false, float eventWeight = 1.0)
320316
{
317+
if (isMCGenOnly) {
318+
if (fillHistograms) {
319+
registry.fill(HIST("h_mccollisions"), 0.5);
320+
}
321+
return true;
322+
} // if isMCGenOnly is true, skip MC selection and accept all of them
323+
321324
float centrality = -1.0;
322325
// checkCentFT0M ? centrality = mccollision.centFT0M() : centrality = mccollision.centFT0C();
323326
centrality = mccollision.centFT0M();
@@ -568,13 +571,6 @@ struct JetSpectraCharged {
568571
}
569572
}
570573

571-
template <typename TTracks>
572-
void fillTrackHistograms(TTracks const& track, float weight = 1.0)
573-
{
574-
registry.fill(HIST("h_track_pt"), track.pt(), weight);
575-
registry.fill(HIST("h2_track_eta_track_phi"), track.eta(), track.phi(), weight);
576-
}
577-
578574
template <typename TBase, typename TTag>
579575
void fillMatchedHistograms(TBase const& jetMCD, float weight = 1.0)
580576
{
@@ -698,42 +694,6 @@ struct JetSpectraCharged {
698694
}
699695
}
700696

701-
void processTracksQC(soa::Filtered<aod::JetCollisions>::iterator const& collision,
702-
soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras>> const& tracks)
703-
{
704-
if (!applyCollisionCuts(collision)) {
705-
return;
706-
}
707-
708-
for (auto const& track : tracks) {
709-
if (!jetderiveddatautilities::selectTrack(track, trackSelection)) {
710-
continue;
711-
}
712-
fillTrackHistograms(track);
713-
}
714-
}
715-
PROCESS_SWITCH(JetSpectraCharged, processTracksQC, "collisions and track QC for Data and MCD", false);
716-
717-
void processTracksQCWeighted(soa::Filtered<soa::Join<aod::JetCollisions, aod::JMcCollisionLbs>>::iterator const& collision,
718-
aod::JetMcCollisions const&,
719-
soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras>> const& tracks)
720-
{
721-
bool fillHistograms = false;
722-
bool isWeighted = true;
723-
float eventWeight = collision.weight();
724-
if (!applyCollisionCuts(collision, fillHistograms, isWeighted, eventWeight)) {
725-
return;
726-
}
727-
728-
for (auto const& track : tracks) {
729-
if (!jetderiveddatautilities::selectTrack(track, trackSelection)) {
730-
continue;
731-
}
732-
fillTrackHistograms(track, eventWeight);
733-
}
734-
}
735-
PROCESS_SWITCH(JetSpectraCharged, processTracksQCWeighted, "weighted collsions and tracks QC for MC", false);
736-
737697
void processCollisions(soa::Filtered<aod::JetCollisions>::iterator const& collision)
738698
{
739699
bool fillHistograms = true;
@@ -950,7 +910,6 @@ struct JetSpectraCharged {
950910
if (!applyMCCollisionCuts(mccollision, collisions)) {
951911
return;
952912
}
953-
registry.fill(HIST("h_mccollisions_zvertex"), mccollision.posZ());
954913

955914
for (auto const& jet : jets) {
956915
if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaMin, jetEtaMax, trackEtaMin, trackEtaMax)) {

0 commit comments

Comments
 (0)