Skip to content

Commit 305e1ff

Browse files
PaolaVTPaolaVT
committed
AxisSpec was moved inside init()
1 parent c308001 commit 305e1ff

File tree

1 file changed

+28
-10
lines changed

1 file changed

+28
-10
lines changed

‎PWGMM/UE/Tasks/dedxAnalysis.cxx‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,16 @@ struct DedxAnalysis {
8484
Configurable<bool> eventSelection{"eventSelection", true, "event selection"};
8585
Configurable<bool> calibrationMode{"calibrationMode", true, "calibration mode"};
8686
// Histograms names
87-
static constexpr std::string_view kDedxvsMomentum[4] = {"dEdx_vs_Momentum_all", "dEdx_vs_Momentum_Pi_v0", "dEdx_vs_Momentum_Pr_v0", "dEdx_vs_Momentum_El_v0"};
87+
static constexpr std::string_view kDedxvsMomentumPos[4] = {"dEdx_vs_Momentum_all_Pos", "dEdx_vs_Momentum_Pi_v0_Pos", "dEdx_vs_Momentum_Pr_v0_Pos", "dEdx_vs_Momentum_El_v0_Pos"};
88+
static constexpr std::string_view kDedxvsMomentumNeg[4] = {"dEdx_vs_Momentum_all_Neg", "dEdx_vs_Momentum_Pi_v0_Neg", "dEdx_vs_Momentum_Pr_v0_Neg", "dEdx_vs_Momentum_El_v0_Neg"};
8889
static constexpr double EtaCut[9] = {-0.8, -0.6, -0.4, -0.2, 0.0, 0.2, 0.4, 0.6, 0.8};
8990
static constexpr double Correction[8] = {54.5281, 54.6548, 54.6513, 54.6781, 54.6167, 54.7384, 55.0047, 54.9592};
91+
<<<<<<< HEAD
9092
ConfigurableAxis binP{"binP", {0.1, 0.12, 0.14, 0.16, 0.18, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3.0, 3.2, 3.4, 3.6, 3.8, 4.0, 4.5, 5.0, 5.5, 6.0, 6.5, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 18.0, 20.0}, ""};
9193
AxisSpec pAxis = {binP, "#it{p}/Z (GeV/c)"};
94+
=======
95+
ConfigurableAxis binP{"binP", {VARIABLE_WIDTH, 0.1, 0.12, 0.14, 0.16, 0.18, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3.0, 3.2, 3.4, 3.6, 3.8, 4.0, 4.5, 5.0, 5.5, 6.0, 6.5, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 18.0, 20.0}, ""};
96+
>>>>>>> c200e0ce0 (AxisSpec was moved inside init())
9297

9398
void init(InitContext const&)
9499
{
@@ -102,6 +107,8 @@ struct DedxAnalysis {
102107
{{100, 0.0, 6.4, "#phi"}, {100, 0.0, 600.0, "dE/dx MIP (a. u.)"}});
103108

104109
} else {
110+
AxisSpec pAxis = {binP, "#it{p}/Z (GeV/c)"};
111+
105112
registryDeDx.add(
106113
"hdEdxMIP_vs_eta_calibrated", "dE/dx", HistType::kTH2F,
107114
{{8, -0.8, 0.8, "#eta"}, {10, 30.0, 70.0, "dE/dx MIP (a. u.)"}});
@@ -111,8 +118,15 @@ struct DedxAnalysis {
111118

112119
// De/Dx for ch and v0 particles
113120
for (int i = 0; i < 4; ++i) {
121+
<<<<<<< HEAD
114122
registryDeDx.add(kDedxvsMomentum[i].data(), "dE/dx", HistType::kTH3F,
115123
{{pAxis}, {100, 0.0, 600.0, "dE/dx (a. u.)"}, {8, -0.8, 0.8, "#eta"}});
124+
=======
125+
registryDeDx.add(kDedxvsMomentumPos[i].data(), "dE/dx", HistType::kTH3F,
126+
{{pAxis}, {100, 0.0, 600.0, "dE/dx (a. u.)"}, {8, -0.8, 0.8, "#eta"}});
127+
registryDeDx.add(kDedxvsMomentumNeg[i].data(), "dE/dx", HistType::kTH3F,
128+
{{pAxis}, {100, 0.0, 600.0, "dE/dx (a. u.)"}, {8, -0.8, 0.8, "#eta"}});
129+
>>>>>>> c200e0ce0 (AxisSpec was moved inside init())
116130
}
117131
}
118132
// Event Counter
@@ -322,7 +336,11 @@ struct DedxAnalysis {
322336
if (!calibrationMode) {
323337
for (int i = 0; i < 8; ++i) {
324338
if (trk.eta() > EtaCut[i] && trk.eta() < EtaCut[i + 1]) {
325-
registryDeDx.fill(HIST(kDedxvsMomentum[0]), signedP, trk.tpcSignal() * 50 / Correction[i], trk.eta());
339+
if (signedP > 0) {
340+
registryDeDx.fill(HIST(kDedxvsMomentumPos[0]), signedP, trk.tpcSignal() * 50 / Correction[i], trk.eta());
341+
}else{
342+
registryDeDx.fill(HIST(kDedxvsMomentumNeg[0]), std::abs(signedP), trk.tpcSignal() * 50 / Correction[i], trk.eta());
343+
}
326344
}
327345
}
328346
}
@@ -377,11 +395,11 @@ struct DedxAnalysis {
377395
for (int i = 0; i < 8; ++i) {
378396
if (negTrack.eta() > EtaCut[i] && negTrack.eta() < EtaCut[i + 1]) {
379397

380-
registryDeDx.fill(HIST(kDedxvsMomentum[1]), signedPneg, negTrack.tpcSignal() * 50 / Correction[i], negTrack.eta());
398+
registryDeDx.fill(HIST(kDedxvsMomentumNeg[1]), std::abs(signedPneg), negTrack.tpcSignal() * 50 / Correction[i], negTrack.eta());
381399
}
382400
if (posTrack.eta() > EtaCut[i] && posTrack.eta() < EtaCut[i + 1]) {
383401

384-
registryDeDx.fill(HIST(kDedxvsMomentum[1]), signedPpos, posTrack.tpcSignal() * 50 / Correction[i], posTrack.eta());
402+
registryDeDx.fill(HIST(kDedxvsMomentumPos[1]), signedPpos, posTrack.tpcSignal() * 50 / Correction[i], posTrack.eta());
385403
}
386404
}
387405
}
@@ -401,11 +419,11 @@ struct DedxAnalysis {
401419
for (int i = 0; i < 8; ++i) {
402420
if (negTrack.eta() > EtaCut[i] && negTrack.eta() < EtaCut[i + 1]) {
403421

404-
registryDeDx.fill(HIST(kDedxvsMomentum[1]), signedPneg, negTrack.tpcSignal() * 50 / Correction[i], negTrack.eta());
422+
registryDeDx.fill(HIST(kDedxvsMomentumNeg[1]), std::abs(signedPneg), negTrack.tpcSignal() * 50 / Correction[i], negTrack.eta());
405423
}
406424
if (posTrack.eta() > EtaCut[i] && posTrack.eta() < EtaCut[i + 1]) {
407425

408-
registryDeDx.fill(HIST(kDedxvsMomentum[2]), signedPpos, posTrack.tpcSignal() * 50 / Correction[i], posTrack.eta());
426+
registryDeDx.fill(HIST(kDedxvsMomentumPos[2]), signedPpos, posTrack.tpcSignal() * 50 / Correction[i], posTrack.eta());
409427
}
410428
}
411429
}
@@ -425,11 +443,11 @@ struct DedxAnalysis {
425443
for (int i = 0; i < 8; ++i) {
426444
if (negTrack.eta() > EtaCut[i] && negTrack.eta() < EtaCut[i + 1]) {
427445

428-
registryDeDx.fill(HIST(kDedxvsMomentum[2]), signedPneg, negTrack.tpcSignal() * 50 / Correction[i], negTrack.eta());
446+
registryDeDx.fill(HIST(kDedxvsMomentumNeg[2]), std::abs(signedPneg), negTrack.tpcSignal() * 50 / Correction[i], negTrack.eta());
429447
}
430448
if (posTrack.eta() > EtaCut[i] && posTrack.eta() < EtaCut[i + 1]) {
431449

432-
registryDeDx.fill(HIST(kDedxvsMomentum[1]), signedPpos, posTrack.tpcSignal() * 50 / Correction[i], posTrack.eta());
450+
registryDeDx.fill(HIST(kDedxvsMomentumPos[1]), signedPpos, posTrack.tpcSignal() * 50 / Correction[i], posTrack.eta());
433451
}
434452
}
435453
}
@@ -449,11 +467,11 @@ struct DedxAnalysis {
449467
for (int i = 0; i < 8; ++i) {
450468
if (negTrack.eta() > EtaCut[i] && negTrack.eta() < EtaCut[i + 1]) {
451469

452-
registryDeDx.fill(HIST(kDedxvsMomentum[3]), signedPneg, negTrack.tpcSignal() * 50 / Correction[i], negTrack.eta());
470+
registryDeDx.fill(HIST(kDedxvsMomentumNeg[3]), std::abs(signedPneg), negTrack.tpcSignal() * 50 / Correction[i], negTrack.eta());
453471
}
454472
if (posTrack.eta() > EtaCut[i] && posTrack.eta() < EtaCut[i + 1]) {
455473

456-
registryDeDx.fill(HIST(kDedxvsMomentum[3]), signedPpos, posTrack.tpcSignal() * 50 / Correction[i], posTrack.eta());
474+
registryDeDx.fill(HIST(kDedxvsMomentumPos[3]), signedPpos, posTrack.tpcSignal() * 50 / Correction[i], posTrack.eta());
457475
}
458476
}
459477
}

0 commit comments

Comments
 (0)