Skip to content

Commit 10eae36

Browse files
njacazionjacazio
authored
Add detector prefix for expected values (#4088)
1 parent ec211d4 commit 10eae36

3 files changed

Lines changed: 95 additions & 74 deletions

File tree

‎Analysis/DataModel/include/PID/PIDResponse.h‎

Lines changed: 71 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -45,35 +45,35 @@ DECLARE_SOA_DYNAMIC_COLUMN(DiffBetaEl, diffbetael, [](float beta, float expbetae
4545
namespace pidTOF
4646
{
4747
// Expected times
48-
DECLARE_SOA_COLUMN(ExpTimeEl, expTimeEl, float);
49-
DECLARE_SOA_COLUMN(ExpTimeMu, expTimeMu, float);
50-
DECLARE_SOA_COLUMN(ExpTimePi, expTimePi, float);
51-
DECLARE_SOA_COLUMN(ExpTimeKa, expTimeKa, float);
52-
DECLARE_SOA_COLUMN(ExpTimePr, expTimePr, float);
53-
DECLARE_SOA_COLUMN(ExpTimeDe, expTimeDe, float);
54-
DECLARE_SOA_COLUMN(ExpTimeTr, expTimeTr, float);
55-
DECLARE_SOA_COLUMN(ExpTimeHe, expTimeHe, float);
56-
DECLARE_SOA_COLUMN(ExpTimeAl, expTimeAl, float);
48+
DECLARE_SOA_COLUMN(TOFExpSignalEl, tofExpSignalEl, float);
49+
DECLARE_SOA_COLUMN(TOFExpSignalMu, tofExpSignalMu, float);
50+
DECLARE_SOA_COLUMN(TOFExpSignalPi, tofExpSignalPi, float);
51+
DECLARE_SOA_COLUMN(TOFExpSignalKa, tofExpSignalKa, float);
52+
DECLARE_SOA_COLUMN(TOFExpSignalPr, tofExpSignalPr, float);
53+
DECLARE_SOA_COLUMN(TOFExpSignalDe, tofExpSignalDe, float);
54+
DECLARE_SOA_COLUMN(TOFExpSignalTr, tofExpSignalTr, float);
55+
DECLARE_SOA_COLUMN(TOFExpSignalHe, tofExpSignalHe, float);
56+
DECLARE_SOA_COLUMN(TOFExpSignalAl, tofExpSignalAl, float);
5757
// Expected sigma
58-
DECLARE_SOA_COLUMN(ExpSigmaEl, expSigmaEl, float);
59-
DECLARE_SOA_COLUMN(ExpSigmaMu, expSigmaMu, float);
60-
DECLARE_SOA_COLUMN(ExpSigmaPi, expSigmaPi, float);
61-
DECLARE_SOA_COLUMN(ExpSigmaKa, expSigmaKa, float);
62-
DECLARE_SOA_COLUMN(ExpSigmaPr, expSigmaPr, float);
63-
DECLARE_SOA_COLUMN(ExpSigmaDe, expSigmaDe, float);
64-
DECLARE_SOA_COLUMN(ExpSigmaTr, expSigmaTr, float);
65-
DECLARE_SOA_COLUMN(ExpSigmaHe, expSigmaHe, float);
66-
DECLARE_SOA_COLUMN(ExpSigmaAl, expSigmaAl, float);
58+
DECLARE_SOA_COLUMN(TOFExpSigmaEl, tofExpSigmaEl, float);
59+
DECLARE_SOA_COLUMN(TOFExpSigmaMu, tofExpSigmaMu, float);
60+
DECLARE_SOA_COLUMN(TOFExpSigmaPi, tofExpSigmaPi, float);
61+
DECLARE_SOA_COLUMN(TOFExpSigmaKa, tofExpSigmaKa, float);
62+
DECLARE_SOA_COLUMN(TOFExpSigmaPr, tofExpSigmaPr, float);
63+
DECLARE_SOA_COLUMN(TOFExpSigmaDe, tofExpSigmaDe, float);
64+
DECLARE_SOA_COLUMN(TOFExpSigmaTr, tofExpSigmaTr, float);
65+
DECLARE_SOA_COLUMN(TOFExpSigmaHe, tofExpSigmaHe, float);
66+
DECLARE_SOA_COLUMN(TOFExpSigmaAl, tofExpSigmaAl, float);
6767
// NSigma
68-
DECLARE_SOA_COLUMN(NSigmaEl, nSigmaEl, float);
69-
DECLARE_SOA_COLUMN(NSigmaMu, nSigmaMu, float);
70-
DECLARE_SOA_COLUMN(NSigmaPi, nSigmaPi, float);
71-
DECLARE_SOA_COLUMN(NSigmaKa, nSigmaKa, float);
72-
DECLARE_SOA_COLUMN(NSigmaPr, nSigmaPr, float);
73-
DECLARE_SOA_COLUMN(NSigmaDe, nSigmaDe, float);
74-
DECLARE_SOA_COLUMN(NSigmaTr, nSigmaTr, float);
75-
DECLARE_SOA_COLUMN(NSigmaHe, nSigmaHe, float);
76-
DECLARE_SOA_COLUMN(NSigmaAl, nSigmaAl, float);
68+
DECLARE_SOA_COLUMN(TOFNSigmaEl, tofNSigmaEl, float);
69+
DECLARE_SOA_COLUMN(TOFNSigmaMu, tofNSigmaMu, float);
70+
DECLARE_SOA_COLUMN(TOFNSigmaPi, tofNSigmaPi, float);
71+
DECLARE_SOA_COLUMN(TOFNSigmaKa, tofNSigmaKa, float);
72+
DECLARE_SOA_COLUMN(TOFNSigmaPr, tofNSigmaPr, float);
73+
DECLARE_SOA_COLUMN(TOFNSigmaDe, tofNSigmaDe, float);
74+
DECLARE_SOA_COLUMN(TOFNSigmaTr, tofNSigmaTr, float);
75+
DECLARE_SOA_COLUMN(TOFNSigmaHe, tofNSigmaHe, float);
76+
DECLARE_SOA_COLUMN(TOFNSigmaAl, tofNSigmaAl, float);
7777
} // namespace pidTOF
7878

7979
using namespace pidTOFbeta;
@@ -84,37 +84,49 @@ DECLARE_SOA_TABLE(pidRespTOFbeta, "AOD", "pidRespTOFbeta",
8484
DiffBetaEl<Beta, ExpBetaEl>);
8585
using namespace pidTOF;
8686
DECLARE_SOA_TABLE(pidRespTOF, "AOD", "pidRespTOF",
87-
ExpTimeEl, ExpTimeMu, ExpTimePi, ExpTimeKa, ExpTimePr, ExpTimeDe, ExpTimeTr, ExpTimeHe, ExpTimeAl,
88-
ExpSigmaEl, ExpSigmaMu, ExpSigmaPi, ExpSigmaKa, ExpSigmaPr, ExpSigmaDe, ExpSigmaTr, ExpSigmaHe, ExpSigmaAl,
89-
NSigmaEl, NSigmaMu, NSigmaPi, NSigmaKa, NSigmaPr, NSigmaDe, NSigmaTr, NSigmaHe, NSigmaAl);
87+
TOFExpSignalEl, TOFExpSignalMu, TOFExpSignalPi, TOFExpSignalKa, TOFExpSignalPr, TOFExpSignalDe, TOFExpSignalTr, TOFExpSignalHe, TOFExpSignalAl,
88+
TOFExpSigmaEl, TOFExpSigmaMu, TOFExpSigmaPi, TOFExpSigmaKa, TOFExpSigmaPr, TOFExpSigmaDe, TOFExpSigmaTr, TOFExpSigmaHe, TOFExpSigmaAl,
89+
TOFNSigmaEl, TOFNSigmaMu, TOFNSigmaPi, TOFNSigmaKa, TOFNSigmaPr, TOFNSigmaDe, TOFNSigmaTr, TOFNSigmaHe, TOFNSigmaAl);
9090

9191
namespace pidTPC
9292
{
9393
// Expected signals
94-
DECLARE_SOA_COLUMN(ExpSignalEl, expSignalEl, float);
95-
DECLARE_SOA_COLUMN(ExpSignalMu, expSignalMu, float);
96-
DECLARE_SOA_COLUMN(ExpSignalPi, expSignalPi, float);
97-
DECLARE_SOA_COLUMN(ExpSignalKa, expSignalKa, float);
98-
DECLARE_SOA_COLUMN(ExpSignalPr, expSignalPr, float);
99-
DECLARE_SOA_COLUMN(ExpSignalDe, expSignalDe, float);
100-
DECLARE_SOA_COLUMN(ExpSignalTr, expSignalTr, float);
101-
DECLARE_SOA_COLUMN(ExpSignalHe, expSignalHe, float);
102-
DECLARE_SOA_COLUMN(ExpSignalAl, expSignalAl, float);
94+
DECLARE_SOA_COLUMN(TPCExpSignalEl, tpcExpSignalEl, float);
95+
DECLARE_SOA_COLUMN(TPCExpSignalMu, tpcExpSignalMu, float);
96+
DECLARE_SOA_COLUMN(TPCExpSignalPi, tpcExpSignalPi, float);
97+
DECLARE_SOA_COLUMN(TPCExpSignalKa, tpcExpSignalKa, float);
98+
DECLARE_SOA_COLUMN(TPCExpSignalPr, tpcExpSignalPr, float);
99+
DECLARE_SOA_COLUMN(TPCExpSignalDe, tpcExpSignalDe, float);
100+
DECLARE_SOA_COLUMN(TPCExpSignalTr, tpcExpSignalTr, float);
101+
DECLARE_SOA_COLUMN(TPCExpSignalHe, tpcExpSignalHe, float);
102+
DECLARE_SOA_COLUMN(TPCExpSignalAl, tpcExpSignalAl, float);
103+
// Expected sigma
104+
DECLARE_SOA_COLUMN(TPCExpSigmaEl, tpcExpSigmaEl, float);
105+
DECLARE_SOA_COLUMN(TPCExpSigmaMu, tpcExpSigmaMu, float);
106+
DECLARE_SOA_COLUMN(TPCExpSigmaPi, tpcExpSigmaPi, float);
107+
DECLARE_SOA_COLUMN(TPCExpSigmaKa, tpcExpSigmaKa, float);
108+
DECLARE_SOA_COLUMN(TPCExpSigmaPr, tpcExpSigmaPr, float);
109+
DECLARE_SOA_COLUMN(TPCExpSigmaDe, tpcExpSigmaDe, float);
110+
DECLARE_SOA_COLUMN(TPCExpSigmaTr, tpcExpSigmaTr, float);
111+
DECLARE_SOA_COLUMN(TPCExpSigmaHe, tpcExpSigmaHe, float);
112+
DECLARE_SOA_COLUMN(TPCExpSigmaAl, tpcExpSigmaAl, float);
103113
// NSigma
104-
DECLARE_SOA_COLUMN(NSigmaEl, nSigmaEl, float);
105-
DECLARE_SOA_COLUMN(NSigmaMu, nSigmaMu, float);
106-
DECLARE_SOA_COLUMN(NSigmaPi, nSigmaPi, float);
107-
DECLARE_SOA_COLUMN(NSigmaKa, nSigmaKa, float);
108-
DECLARE_SOA_COLUMN(NSigmaPr, nSigmaPr, float);
109-
DECLARE_SOA_COLUMN(NSigmaDe, nSigmaDe, float);
110-
DECLARE_SOA_COLUMN(NSigmaTr, nSigmaTr, float);
111-
DECLARE_SOA_COLUMN(NSigmaHe, nSigmaHe, float);
112-
DECLARE_SOA_COLUMN(NSigmaAl, nSigmaAl, float);
114+
DECLARE_SOA_COLUMN(TPCNSigmaEl, tpcNSigmaEl, float);
115+
DECLARE_SOA_COLUMN(TPCNSigmaMu, tpcNSigmaMu, float);
116+
DECLARE_SOA_COLUMN(TPCNSigmaPi, tpcNSigmaPi, float);
117+
DECLARE_SOA_COLUMN(TPCNSigmaKa, tpcNSigmaKa, float);
118+
DECLARE_SOA_COLUMN(TPCNSigmaPr, tpcNSigmaPr, float);
119+
DECLARE_SOA_COLUMN(TPCNSigmaDe, tpcNSigmaDe, float);
120+
DECLARE_SOA_COLUMN(TPCNSigmaTr, tpcNSigmaTr, float);
121+
DECLARE_SOA_COLUMN(TPCNSigmaHe, tpcNSigmaHe, float);
122+
DECLARE_SOA_COLUMN(TPCNSigmaAl, tpcNSigmaAl, float);
113123
} // namespace pidTPC
114124

125+
using namespace pidTPC;
115126
DECLARE_SOA_TABLE(pidRespTPC, "AOD", "pidRespTPC",
116-
pidTPC::ExpSignalEl, pidTPC::ExpSignalMu, pidTPC::ExpSignalPi, pidTPC::ExpSignalKa, pidTPC::ExpSignalPr, pidTPC::ExpSignalDe, pidTPC::ExpSignalTr, pidTPC::ExpSignalHe, pidTPC::ExpSignalAl,
117-
pidTPC::NSigmaEl, pidTPC::NSigmaMu, pidTPC::NSigmaPi, pidTPC::NSigmaKa, pidTPC::NSigmaPr, pidTPC::NSigmaDe, pidTPC::NSigmaTr, pidTPC::NSigmaHe, pidTPC::NSigmaAl);
127+
TPCExpSignalEl, TPCExpSignalMu, TPCExpSignalPi, TPCExpSignalKa, TPCExpSignalPr, TPCExpSignalDe, TPCExpSignalTr, TPCExpSignalHe, TPCExpSignalAl,
128+
TPCExpSigmaEl, TPCExpSigmaMu, TPCExpSigmaPi, TPCExpSigmaKa, TPCExpSigmaPr, TPCExpSigmaDe, TPCExpSigmaTr, TPCExpSigmaHe, TPCExpSigmaAl,
129+
TPCNSigmaEl, TPCNSigmaMu, TPCNSigmaPi, TPCNSigmaKa, TPCNSigmaPr, TPCNSigmaDe, TPCNSigmaTr, TPCNSigmaHe, TPCNSigmaAl);
118130

119131
} // namespace o2::aod
120132

@@ -198,6 +210,15 @@ struct pidTPCTask {
198210
resp.GetExpectedSignal(PID::Triton),
199211
resp.GetExpectedSignal(PID::Helium3),
200212
resp.GetExpectedSignal(PID::Alpha),
213+
resp.GetExpectedSigma(PID::Electron),
214+
resp.GetExpectedSigma(PID::Muon),
215+
resp.GetExpectedSigma(PID::Pion),
216+
resp.GetExpectedSigma(PID::Kaon),
217+
resp.GetExpectedSigma(PID::Proton),
218+
resp.GetExpectedSigma(PID::Deuteron),
219+
resp.GetExpectedSigma(PID::Triton),
220+
resp.GetExpectedSigma(PID::Helium3),
221+
resp.GetExpectedSigma(PID::Alpha),
201222
resp.GetNumberOfSigmas(PID::Electron),
202223
resp.GetNumberOfSigmas(PID::Muon),
203224
resp.GetNumberOfSigmas(PID::Pion),

‎Analysis/Tasks/spectraTOF.cxx‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,17 @@ struct TOFPIDQATask {
7474
hevtime_NoCut->Fill(collision.collisionTime() / 1000);
7575
// hevtime_NoCut->Fill(collision.collisionTime0() / 1000);
7676
//
77-
htimediffEl_NoCut->Fill(i.p(), i.tofSignal() - collision.collisionTime() - i.expTimeEl());
78-
htimediffMu_NoCut->Fill(i.p(), i.tofSignal() - collision.collisionTime() - i.expTimeMu());
79-
htimediffPi_NoCut->Fill(i.p(), i.tofSignal() - collision.collisionTime() - i.expTimePi());
80-
htimediffKa_NoCut->Fill(i.p(), i.tofSignal() - collision.collisionTime() - i.expTimeKa());
81-
htimediffPr_NoCut->Fill(i.p(), i.tofSignal() - collision.collisionTime() - i.expTimePr());
77+
htimediffEl_NoCut->Fill(i.p(), i.tofSignal() - collision.collisionTime() - i.tofExpSignalEl());
78+
htimediffMu_NoCut->Fill(i.p(), i.tofSignal() - collision.collisionTime() - i.tofExpSignalMu());
79+
htimediffPi_NoCut->Fill(i.p(), i.tofSignal() - collision.collisionTime() - i.tofExpSignalPi());
80+
htimediffKa_NoCut->Fill(i.p(), i.tofSignal() - collision.collisionTime() - i.tofExpSignalKa());
81+
htimediffPr_NoCut->Fill(i.p(), i.tofSignal() - collision.collisionTime() - i.tofExpSignalPr());
8282
//
83-
hnsigmaEl_NoCut->Fill(i.p(), i.nSigmaEl());
84-
hnsigmaMu_NoCut->Fill(i.p(), i.nSigmaMu());
85-
hnsigmaPi_NoCut->Fill(i.p(), i.nSigmaPi());
86-
hnsigmaKa_NoCut->Fill(i.p(), i.nSigmaKa());
87-
hnsigmaPr_NoCut->Fill(i.p(), i.nSigmaPr());
83+
hnsigmaEl_NoCut->Fill(i.p(), i.tofNSigmaEl());
84+
hnsigmaMu_NoCut->Fill(i.p(), i.tofNSigmaMu());
85+
hnsigmaPi_NoCut->Fill(i.p(), i.tofNSigmaPi());
86+
hnsigmaKa_NoCut->Fill(i.p(), i.tofNSigmaKa());
87+
hnsigmaPr_NoCut->Fill(i.p(), i.tofNSigmaPr());
8888
// Beta
8989
hp_beta->Fill(i.p(), i.beta());
9090
}
@@ -121,13 +121,13 @@ struct SpectraTask {
121121
issel = issel && (i.flags() & 0x80000000); //kTIME
122122
if (!issel)
123123
continue;
124-
if (TMath::Abs(i.nSigmaPi()) < 3) {
124+
if (TMath::Abs(i.tofNSigmaPi()) < 3) {
125125
hp_El->Fill(i.p());
126126
hpt_El->Fill(i.pt());
127-
} else if (TMath::Abs(i.nSigmaKa()) < 3) {
127+
} else if (TMath::Abs(i.tofNSigmaKa()) < 3) {
128128
hp_Ka->Fill(i.p());
129129
hpt_Ka->Fill(i.pt());
130-
} else if (TMath::Abs(i.nSigmaPr()) < 3) {
130+
} else if (TMath::Abs(i.tofNSigmaPr()) < 3) {
131131
hp_Pr->Fill(i.p());
132132
hpt_Pr->Fill(i.pt());
133133
}

‎Analysis/Tasks/spectraTPC.cxx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ struct TPCPIDQATask {
5555
continue;
5656
//
5757
htpcsignal->Fill(i.p(), i.tpcSignal());
58-
hexpEl->Fill(i.p(), i.expSignalEl());
59-
hexpDe->Fill(i.p(), i.expSignalDe());
60-
hnsigmaEl->Fill(i.p(), i.nSigmaEl());
61-
hnsigmaMu->Fill(i.p(), i.nSigmaMu());
62-
hnsigmaPi->Fill(i.p(), i.nSigmaPi());
63-
hnsigmaKa->Fill(i.p(), i.nSigmaKa());
64-
hnsigmaPr->Fill(i.p(), i.nSigmaPr());
65-
hnsigmaDe->Fill(i.p(), i.nSigmaDe());
66-
hnsigmaTr->Fill(i.p(), i.nSigmaTr());
67-
hnsigmaHe->Fill(i.p(), i.nSigmaHe());
68-
hnsigmaAl->Fill(i.p(), i.nSigmaAl());
58+
hexpEl->Fill(i.p(), i.tpcExpSignalEl());
59+
hexpDe->Fill(i.p(), i.tpcExpSignalDe());
60+
hnsigmaEl->Fill(i.p(), i.tpcNSigmaEl());
61+
hnsigmaMu->Fill(i.p(), i.tpcNSigmaMu());
62+
hnsigmaPi->Fill(i.p(), i.tpcNSigmaPi());
63+
hnsigmaKa->Fill(i.p(), i.tpcNSigmaKa());
64+
hnsigmaPr->Fill(i.p(), i.tpcNSigmaPr());
65+
hnsigmaDe->Fill(i.p(), i.tpcNSigmaDe());
66+
hnsigmaTr->Fill(i.p(), i.tpcNSigmaTr());
67+
hnsigmaHe->Fill(i.p(), i.tpcNSigmaHe());
68+
hnsigmaAl->Fill(i.p(), i.tpcNSigmaAl());
6969
}
7070
}
7171
};

0 commit comments

Comments
 (0)