Skip to content

Commit 617fdcd

Browse files
AuroraPeregoAuroraPerego
committed
add multiplicity plots and fix ranges
1 parent 9113856 commit 617fdcd

File tree

4 files changed

+140
-41
lines changed

4 files changed

+140
-41
lines changed

‎Validation/HGCalValidation/interface/TICLCandidateValidator.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,31 +70,39 @@ struct TICLCandidateValidatorHistograms {
7070
std::vector<dqm::reco::MonitorElement*> h_num_fake_chg_energy_candidate_track;
7171
std::vector<dqm::reco::MonitorElement*> h_num_fake_chg_energy_candidate_pdgId;
7272
std::vector<dqm::reco::MonitorElement*> h_num_fake_chg_energy_candidate_energy;
73+
std::vector<dqm::reco::MonitorElement*> h_num_fake_chg_energy_candidate_tot;
7374
std::vector<dqm::reco::MonitorElement*> h_den_fake_chg_pt_candidate;
7475
std::vector<dqm::reco::MonitorElement*> h_num_fake_chg_pt_candidate_track;
7576
std::vector<dqm::reco::MonitorElement*> h_num_fake_chg_pt_candidate_pdgId;
7677
std::vector<dqm::reco::MonitorElement*> h_num_fake_chg_pt_candidate_energy;
78+
std::vector<dqm::reco::MonitorElement*> h_num_fake_chg_pt_candidate_tot;
7779
std::vector<dqm::reco::MonitorElement*> h_den_fake_chg_eta_candidate;
7880
std::vector<dqm::reco::MonitorElement*> h_num_fake_chg_eta_candidate_track;
7981
std::vector<dqm::reco::MonitorElement*> h_num_fake_chg_eta_candidate_pdgId;
8082
std::vector<dqm::reco::MonitorElement*> h_num_fake_chg_eta_candidate_energy;
83+
std::vector<dqm::reco::MonitorElement*> h_num_fake_chg_eta_candidate_tot;
8184
std::vector<dqm::reco::MonitorElement*> h_den_fake_chg_phi_candidate;
8285
std::vector<dqm::reco::MonitorElement*> h_num_fake_chg_phi_candidate_track;
8386
std::vector<dqm::reco::MonitorElement*> h_num_fake_chg_phi_candidate_pdgId;
8487
std::vector<dqm::reco::MonitorElement*> h_num_fake_chg_phi_candidate_energy;
88+
std::vector<dqm::reco::MonitorElement*> h_num_fake_chg_phi_candidate_tot;
8589

8690
std::vector<dqm::reco::MonitorElement*> h_den_fake_neut_energy_candidate;
8791
std::vector<dqm::reco::MonitorElement*> h_num_fake_neut_energy_candidate_pdgId;
8892
std::vector<dqm::reco::MonitorElement*> h_num_fake_neut_energy_candidate_energy;
93+
std::vector<dqm::reco::MonitorElement*> h_num_fake_neut_energy_candidate_tot;
8994
std::vector<dqm::reco::MonitorElement*> h_den_fake_neut_pt_candidate;
9095
std::vector<dqm::reco::MonitorElement*> h_num_fake_neut_pt_candidate_pdgId;
9196
std::vector<dqm::reco::MonitorElement*> h_num_fake_neut_pt_candidate_energy;
97+
std::vector<dqm::reco::MonitorElement*> h_num_fake_neut_pt_candidate_tot;
9298
std::vector<dqm::reco::MonitorElement*> h_den_fake_neut_eta_candidate;
9399
std::vector<dqm::reco::MonitorElement*> h_num_fake_neut_eta_candidate_pdgId;
94100
std::vector<dqm::reco::MonitorElement*> h_num_fake_neut_eta_candidate_energy;
101+
std::vector<dqm::reco::MonitorElement*> h_num_fake_neut_eta_candidate_tot;
95102
std::vector<dqm::reco::MonitorElement*> h_den_fake_neut_phi_candidate;
96103
std::vector<dqm::reco::MonitorElement*> h_num_fake_neut_phi_candidate_pdgId;
97104
std::vector<dqm::reco::MonitorElement*> h_num_fake_neut_phi_candidate_energy;
105+
std::vector<dqm::reco::MonitorElement*> h_num_fake_neut_phi_candidate_tot;
98106

99107
std::vector<dqm::reco::MonitorElement*> h_chg_tracksters_in_candidate;
100108
std::vector<dqm::reco::MonitorElement*> h_chg_candidate_regressed_energy;

‎Validation/HGCalValidation/python/PostProcessorHGCAL_cfi.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,14 @@
110110
for c in charged:
111111
for var in variables.keys():
112112
eff_candidates.append("fake_"+c+"_track_"+var+" '"+c.replace("_", " ")+" candidates track fake vs "+var+"' num_fake_track_cand_vs_"+var+"_"+c+" den_fake_cand_vs_"+var+"_"+c)
113-
eff_candidates.append("fake_"+c+"_pid_"+var+" '"+c.replace("_", " ")+" candidates track + pid fake vs "+var+"' num_fake_pid_cand_vs_"+var+"_"+c+" den_fake_cand_vs_"+var+"_"+c)
114-
eff_candidates.append("fake_"+c+"_energy_"+var+" '"+c.replace("_", " ")+" candidates track + pid + energy fake vs "+var+"' num_fake_energy_cand_vs_"+var+"_"+c+" den_fake_cand_vs_"+var+"_"+c)
113+
eff_candidates.append("fake_"+c+"_pid_"+var+" '"+c.replace("_", " ")+" candidates pid fake vs "+var+"' num_fake_pid_cand_vs_"+var+"_"+c+" den_fake_cand_vs_"+var+"_"+c)
114+
eff_candidates.append("fake_"+c+"_energy_"+var+" '"+c.replace("_", " ")+" candidates energy fake vs "+var+"' num_fake_energy_cand_vs_"+var+"_"+c+" den_fake_cand_vs_"+var+"_"+c)
115+
eff_candidates.append("fake_"+c+"_total_"+var+" '"+c.replace("_", " ")+" candidates track + pid + energy fake vs "+var+"' num_fake_total_cand_vs_"+var+"_"+c+" den_fake_cand_vs_"+var+"_"+c)
115116
for n in neutrals:
116117
for var in variables.keys():
117118
eff_candidates.append("fake_"+n+"_pid_"+var+" '"+n.replace("_", " ")+" candidates pid fake vs "+var+"' num_fake_pid_cand_vs_"+var+"_"+n+" den_fake_cand_vs_"+var+"_"+n)
118-
eff_candidates.append("fake_"+n+"_energy_"+var+" '"+n.replace("_", " ")+" candidates pid + energy fake vs "+var+"' num_fake_energy_cand_vs_"+var+"_"+n+" den_fake_cand_vs_"+var+"_"+n)
119+
eff_candidates.append("fake_"+n+"_energy_"+var+" '"+n.replace("_", " ")+" candidates energy fake vs "+var+"' num_fake_energy_cand_vs_"+var+"_"+n+" den_fake_cand_vs_"+var+"_"+n)
120+
eff_candidates.append("fake_"+n+"_total_"+var+" '"+n.replace("_", " ")+" candidates pid + energy fake vs "+var+"' num_fake_total_cand_vs_"+var+"_"+n+" den_fake_cand_vs_"+var+"_"+n)
119121

120122
postProcessorHGCALCandidates = DQMEDHarvester('DQMGenericClient',
121123
subDirs = cms.untracked.vstring(subDirsCandidates),

‎Validation/HGCalValidation/python/hgcalPlots.py‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1835,20 +1835,44 @@
18351835
cand_eff_plots = []
18361836
for var in ["pt", "energy", "eta", "phi"]:
18371837
for cut in ["track", "pid", "energy"]:
1838-
cand_eff_plots.extend([Plot("eff_"+ct+"_"+cut+"_"+var, title=cut + " efficiency for "+ct.replace("_", " ")+" vs "+var, ytitle="Efficiency", **_common_eff_fake)])
1838+
if cut=="track" and ct in ["neutral_hadrons", "neutral_pions", "photons"]: continue
1839+
#options = (_common_eff_fake | _xminmaxEn) if var=="energy" else ( (_common_eff_fake | _xminmaxPt) if var=="pt" else _common_eff_fake)
1840+
cand_eff_plots.extend([Plot("eff_"+ct+"_"+cut+"_"+var, title=cut + " - efficiency for "+ct.replace("_", " ")+" vs "+var, ytitle="Efficiency", **_common_eff_fake)])
18391841
_all_cand_eff_plots.append(cand_eff_plots)
18401842

1843+
_all_cand_effNum_plots = []
1844+
for ct in cand_type:
1845+
cand_eff_plots = []
1846+
for var in ["pt", "energy", "eta", "phi"]:
1847+
for cut in ["track", "pid", "energy"]:
1848+
if cut=="track" and ct in ["neutral_hadrons", "neutral_pions", "photons"]: continue
1849+
cand_eff_plots.extend([Plot("num_"+cut+"_cand_vs_"+var+"_"+ct, title=cut + " - number of efficient "+ct.replace("_", " ")+" vs "+var, ytitle="Efficient candidates", **_common)])
1850+
_all_cand_effNum_plots.append(cand_eff_plots)
1851+
18411852
_all_cand_fake_plots = []
18421853
for ct in cand_type:
18431854
cand_fake_plots = []
18441855
for var in ["pt", "energy", "eta", "phi"]:
1845-
for cut in ["track", "pid", "energy"]:
1846-
cand_fake_plots.extend([Plot("fake_"+ct+"_"+cut+"_"+var, title=cut + " fake rate for "+ct.replace("_", " ")+" vs "+var, ytitle="Fake rate", **_common_eff_fake)])
1856+
for cut in ["track", "pid", "energy", "total"]:
1857+
if cut=="track" and ct in ["neutral_hadrons", "neutral_pions", "photons"]: continue
1858+
#options = (_common_eff_fake | _xminmaxEn) if var=="energy" else ( (_common_eff_fake | _xminmaxPt) if var=="pt" else _common_eff_fake)
1859+
cand_fake_plots.extend([Plot("fake_"+ct+"_"+cut+"_"+var, title=cut + " - fake rate for "+ct.replace("_", " ")+" vs "+var, ytitle="Fake rate", **_common_eff_fake)])
18471860
_all_cand_fake_plots.append(cand_fake_plots)
18481861

1862+
_all_cand_fakeNum_plots = []
1863+
for ct in cand_type:
1864+
cand_fake_plots = []
1865+
for var in ["pt", "energy", "eta", "phi"]:
1866+
for cut in ["track", "pid", "energy", "total"]:
1867+
if cut=="track" and ct in ["neutral_hadrons", "neutral_pions", "photons"]: continue
1868+
cand_fake_plots.extend([Plot("num_fake_"+cut+"_cand_vs_"+var+"_"+ct, title=cut + " - number of fakes for "+ct.replace("_", " ")+" vs "+var, ytitle="Fake number", **_common)])
1869+
_all_cand_fakeNum_plots.append(cand_fake_plots)
1870+
18491871
_allCandidatesPlots = [[],[],[],[],[],[]]
1850-
for i in range(6):
1851-
_allCandidatesPlots[i].extend([PlotGroup(cand_type[i]+"_type", _all_cand_type_plots[i], ncols=2), PlotGroup(cand_type[i]+"_kin", _all_cand_ene_plots[i], ncols=3), PlotGroup(cand_type[i]+"_eff", _all_cand_eff_plots[i], ncols=3), PlotGroup(cand_type[i]+"_fake", _all_cand_fake_plots[i], ncols=3)])
1872+
for i in range(3):
1873+
_allCandidatesPlots[i].extend([PlotGroup(cand_type[i]+"_type", _all_cand_type_plots[i], ncols=2), PlotGroup(cand_type[i]+"_kin", _all_cand_ene_plots[i], ncols=3), PlotGroup(cand_type[i]+"_eff", _all_cand_eff_plots[i], ncols=3), PlotGroup(cand_type[i]+"_effMultiplicity", _all_cand_effNum_plots[i], ncols=3), PlotGroup(cand_type[i]+"_fake", _all_cand_fake_plots[i], ncols=4), PlotGroup(cand_type[i]+"_fakeMultiplicity", _all_cand_fakeNum_plots[i], ncols=4)])
1874+
for i in range(3,6):
1875+
_allCandidatesPlots[i].extend([PlotGroup(cand_type[i]+"_type", _all_cand_type_plots[i], ncols=2), PlotGroup(cand_type[i]+"_kin", _all_cand_ene_plots[i], ncols=3), PlotGroup(cand_type[i]+"_eff", _all_cand_eff_plots[i], ncols=2), PlotGroup(cand_type[i]+"_effMultiplicity", _all_cand_effNum_plots[i], ncols=2), PlotGroup(cand_type[i]+"_fake", _all_cand_fake_plots[i], ncols=3), PlotGroup(cand_type[i]+"_fakeMultiplicity", _all_cand_fakeNum_plots[i], ncols=3)])
18521876

18531877
#--------------------------------------------------------------------------------------------
18541878
# SIMHITS, DIGIS, RECHITS

0 commit comments

Comments
 (0)