Skip to content

Commit 037cd2f

Browse files
committed
Changed declaration method for histogram names.
1 parent c79c485 commit 037cd2f

1 file changed

Lines changed: 51 additions & 52 deletions

File tree

PWGJE/Tasks/jetD0AngSubstructure.cxx

Lines changed: 51 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -222,67 +222,66 @@ mcp: Monte Carlo data (particle level)
222222
*/
223223
namespace histnames
224224
{
225-
#define HNAME(Name) constexpr const char* Name = #Name;
225+
226226
/*
227227
// Experimental Data (analyseDataChargedSubstructure)
228228
*/
229-
HNAME(ex_col); // Collision Counter
230-
HNAME(ex_jet); // Jet Counter
231-
HNAME(ex_jet_pt); // Jet pT
232-
HNAME(ex_jet_eta); // Jet eta
233-
HNAME(ex_jet_phi); // Jet phi
234-
HNAME(ex_jet_ang); // Jet angularity
235-
HNAME(ex_jet_proj); // Projection of HF candidate momentum on jet axis
236-
HNAME(ex_jet_dist); // Jet–HF candidate angular distance
237-
HNAME(ex_jet_dist_proj); // Jet–HF candidate distance vs projection
238-
HNAME(ex_hfl_pt); // HF candidate pT
239-
HNAME(ex_hfl_mass); // HF candidate mass
240-
HNAME(ex_hfl_eta); // HF candidate eta
241-
HNAME(ex_hfl_phi); // HF candidate phi
229+
constexpr const char* ex_col = "ex_col"; // Collision Counter
230+
constexpr const char* ex_jet = "ex_jet"; // Jet Counter
231+
constexpr const char* ex_jet_pt = "ex_jet_pt"; // Jet pT
232+
constexpr const char* ex_jet_eta = "ex_jet_eta"; // Jet eta
233+
constexpr const char* ex_jet_phi = "ex_jet_phi"; // Jet phi
234+
constexpr const char* ex_jet_ang = "ex_jet_ang"; // Jet angularity
235+
constexpr const char* ex_jet_proj = "ex_jet_proj"; // Projection of HF candidate momentum on jet axis
236+
constexpr const char* ex_jet_dist = "ex_jet_dist"; // Jet–HF candidate angular distance
237+
constexpr const char* ex_jet_dist_proj = "ex_jet_dist_proj"; // Jet–HF candidate distance vs projection
238+
constexpr const char* ex_hfl_pt = "ex_hfl_pt"; // HF candidate pT
239+
constexpr const char* ex_hfl_mass = "ex_hfl_mass"; // HF candidate mass
240+
constexpr const char* ex_hfl_eta = "ex_hfl_eta"; // HF candidate eta
241+
constexpr const char* ex_hfl_phi = "ex_hfl_phi"; // HF candidate phi
242242
/*
243243
// Monte Carlo Data Efficiency (analyseMonteCarloEfficiency)
244244
*/
245-
HNAME(mc_eff_col); // Collision Counter
246-
HNAME(mc_eff_jet); // Jet Counter
247-
HNAME(mc_eff_det_jet_pt); // Detector level jet pT
248-
HNAME(mc_eff_det_jet_eta); // Detector level jet eta
249-
HNAME(mc_eff_det_jet_phi); // Detector level jet phi
250-
HNAME(mc_eff_det_jet_ang); // Detector level jet angularity
251-
HNAME(mc_eff_det_hfl_pt); // Detector level HF candidate pT
252-
HNAME(mc_eff_det_hfl_mass); // Detector level HF candidate mass
253-
HNAME(mc_eff_det_hfl_eta); // Detector level HF candidate eta
254-
HNAME(mc_eff_det_hfl_phi); // Detector level HF candidate phi
255-
HNAME(mc_eff_par_jet_pt); // Particle level jet pT
256-
HNAME(mc_eff_par_jet_eta); // Particle level jet eta
257-
HNAME(mc_eff_par_jet_phi); // Particle level jet phi
258-
HNAME(mc_eff_par_jet_ang); // Particle level jet angularity
259-
HNAME(mc_eff_par_hfl_pt); // Particle level HF candidate pT
260-
// HNAME(mc_eff_par_hfl_mass); // Particle level HF candidate mass -> PDG value
261-
HNAME(mc_eff_par_hfl_eta); // Particle level HF candidate eta
262-
HNAME(mc_eff_par_hfl_phi); // Particle level HF candidate phi
245+
constexpr const char* mc_eff_col = "mc_eff_col"; // Collision Counter
246+
constexpr const char* mc_eff_jet = "mc_eff_jet"; // Jet Counter
247+
constexpr const char* mc_eff_det_jet_pt = "mc_eff_det_jet_pt"; // Detector level jet pT
248+
constexpr const char* mc_eff_det_jet_eta = "mc_eff_det_jet_eta"; // Detector level jet eta
249+
constexpr const char* mc_eff_det_jet_phi = "mc_eff_det_jet_phi"; // Detector level jet phi
250+
constexpr const char* mc_eff_det_jet_ang = "mc_eff_det_jet_ang"; // Detector level jet angularity
251+
constexpr const char* mc_eff_det_hfl_pt = "mc_eff_det_hfl_pt"; // Detector level HF candidate pT
252+
constexpr const char* mc_eff_det_hfl_mass = "mc_eff_det_hfl_mass"; // Detector level HF candidate mass
253+
constexpr const char* mc_eff_det_hfl_eta = "mc_eff_det_hfl_eta"; // Detector level HF candidate eta
254+
constexpr const char* mc_eff_det_hfl_phi = "mc_eff_det_hfl_phi"; // Detector level HF candidate phi
255+
constexpr const char* mc_eff_par_jet_pt = "mc_eff_par_jet_pt"; // Particle level jet pT
256+
constexpr const char* mc_eff_par_jet_eta = "mc_eff_par_jet_eta"; // Particle level jet eta
257+
constexpr const char* mc_eff_par_jet_phi = "mc_eff_par_jet_phi"; // Particle level jet phi
258+
constexpr const char* mc_eff_par_jet_ang = "mc_eff_par_jet_ang"; // Particle level jet angularity
259+
constexpr const char* mc_eff_par_hfl_pt = "mc_eff_par_hfl_pt"; // Particle level HF candidate pT
260+
// constexpr const char* mc_eff_par_hfl_mass = "mc_eff_par_hfl_mass"; // Particle level HF candidate mass -> PDG value
261+
constexpr const char* mc_eff_par_hfl_eta = "mc_eff_par_hfl_eta"; // Particle level HF candidate eta
262+
constexpr const char* mc_eff_par_hfl_phi = "mc_eff_par_hfl_phi"; // Particle level HF candidate phi
263263
/*
264264
// Monte Carlo Data Matching (analyseMonteCarlo)
265265
*/
266-
HNAME(mc_col); // Collision Counter
267-
HNAME(mc_jet); // Jet Counter
268-
HNAME(mc_det_jet_pt); // Detector level jet pT
269-
HNAME(mc_det_jet_eta); // Detector level jet eta
270-
HNAME(mc_det_jet_phi); // Detector level jet phi
271-
HNAME(mc_det_jet_ang); // Detector level jet angularity
272-
HNAME(mc_det_hfl_pt); // Detector level HF candidate pT (matched)
273-
HNAME(mc_det_hfl_mass); // Detector level HF candidate mass (matched)
274-
HNAME(mc_det_hfl_eta); // Detector level HF candidate eta (matched)
275-
HNAME(mc_det_hfl_phi); // Detector level HF candidate phi (matched)
276-
// HNAME(mc_par_jet_pt); // Particle level jet pT
277-
// HNAME(mc_par_jet_eta); // Particle level jet eta
278-
// HNAME(mc_par_jet_phi); // Particle level jet phi
279-
// HNAME(mc_par_jet_ang); // Particle level jet angularity
280-
// HNAME(mc_par_hfl_pt); // Particle level HF candidate pT
281-
// HNAME(mc_par_hfl_mass); // Particle level HF candidate mass -> PDG value
282-
// HNAME(mc_par_hfl_eta); // Particle level HF candidate eta
283-
// HNAME(mc_par_hfl_phi); // Particle level HF candidate phi
284-
285-
#undef HNAME
266+
constexpr const char* mc_col = "mc_col"; // Collision Counter
267+
constexpr const char* mc_jet = "mc_jet"; // Jet Counter
268+
constexpr const char* mc_det_jet_pt = "mc_det_jet_pt"; // Detector level jet pT
269+
constexpr const char* mc_det_jet_eta = "mc_det_jet_eta"; // Detector level jet eta
270+
constexpr const char* mc_det_jet_phi = "mc_det_jet_phi"; // Detector level jet phi
271+
constexpr const char* mc_det_jet_ang = "mc_det_jet_ang"; // Detector level jet angularity
272+
constexpr const char* mc_det_hfl_pt = "mc_det_hfl_pt"; // Detector level HF candidate pT (matched)
273+
constexpr const char* mc_det_hfl_mass = "mc_det_hfl_mass"; // Detector level HF candidate mass (matched)
274+
constexpr const char* mc_det_hfl_eta = "mc_det_hfl_eta"; // Detector level HF candidate eta (matched)
275+
constexpr const char* mc_det_hfl_phi = "mc_det_hfl_phi"; // Detector level HF candidate phi (matched)
276+
// constexpr const char* mc_par_jet_pt = "mc_par_jet_pt"; // Particle level jet pT
277+
// constexpr const char* mc_par_jet_eta = "mc_par_jet_eta"; // Particle level jet eta
278+
// constexpr const char* mc_par_jet_phi = "mc_par_jet_phi"; // Particle level jet phi
279+
// constexpr const char* mc_par_jet_ang = "mc_par_jet_ang"; // Particle level jet angularity
280+
// constexpr const char* mc_par_hfl_pt = "mc_par_hfl_pt"; // Particle level HF candidate pT
281+
// constexpr const char* mc_par_hfl_mass = "mc_par_hfl_mass"; // Particle level HF candidate mass -> PDG value
282+
// constexpr const char* mc_par_hfl_eta = "mc_par_hfl_eta"; // Particle level HF candidate eta
283+
// constexpr const char* mc_par_hfl_phi = "mc_par_hfl_phi"; // Particle level HF candidate phi
284+
286285
} // namespace histnames
287286

288287
consteval float getValFromBin(int bin)

0 commit comments

Comments
 (0)