Skip to content

Commit 22a7a65

Browse files
mytkomalibuild
mytkom
and
alibuild
authored
[PIDML] use dynamic columns instead of hardcoding (#10282)
Co-authored-by: ALICE Builder <alibuild@users.noreply.github.com>
1 parent 1e36b14 commit 22a7a65

12 files changed

+514
-636
lines changed

‎Tools/PIDML/CMakeLists.txt‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
# or submit itself to any jurisdiction.
1111

1212
o2physics_add_dpl_workflow(pid-ml-producer
13-
SOURCES pidMLProducer.cxx
13+
SOURCES pidMlProducer.cxx
1414
JOB_POOL analysis
1515
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
1616
COMPONENT_NAME Analysis)
1717

1818
o2physics_add_dpl_workflow(pid-ml-batch-eff-and-pur-producer
19-
SOURCES pidMLBatchEffAndPurProducer.cxx
19+
SOURCES pidMlBatchEffAndPurProducer.cxx
2020
JOB_POOL analysis
2121
PUBLIC_LINK_LIBRARIES O2::Framework ONNXRuntime::ONNXRuntime O2::CCDB O2Physics::DataModel
2222
COMPONENT_NAME Analysis)
2323

2424
o2physics_add_dpl_workflow(pid-ml-eff-and-pur-producer
25-
SOURCES pidMLEffAndPurProducer.cxx
25+
SOURCES pidMlEffAndPurProducer.cxx
2626
JOB_POOL analysis
2727
PUBLIC_LINK_LIBRARIES O2::Framework ONNXRuntime::ONNXRuntime O2::CCDB O2Physics::DataModel
2828
COMPONENT_NAME Analysis)
@@ -45,12 +45,6 @@ o2physics_add_dpl_workflow(qa-pid
4545
COMPONENT_NAME Analysis)
4646

4747
o2physics_add_dpl_workflow(qa-pid-ml
48-
SOURCES qaPidML.cxx
48+
SOURCES qaPidMl.cxx
4949
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore ONNXRuntime::ONNXRuntime
5050
COMPONENT_NAME Analysis)
51-
52-
o2physics_add_dpl_workflow(kaon-pid-ml
53-
SOURCES KaonPidTask.cxx
54-
JOB_POOL analysis
55-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore ONNXRuntime::ONNXRuntime O2::CCDB O2Physics::DataModel
56-
COMPONENT_NAME Analysis)

‎Tools/PIDML/KaonPidTask.cxx‎

Lines changed: 0 additions & 138 deletions
This file was deleted.

Tools/PIDML/pidML.h renamed to Tools/PIDML/pidMl.h

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
/// \file pidML.h
12+
/// \file pidMl.h
1313
/// \brief Data model for PID ML training.
1414
///
1515
/// \author Maja Kabus <mkabus@cern.ch>
@@ -19,6 +19,8 @@
1919

2020
#include "Framework/AnalysisDataModel.h"
2121
#include "Common/DataModel/PIDResponse.h"
22+
#include "Common/DataModel/Centrality.h"
23+
#include "Common/DataModel/Multiplicity.h"
2224

2325
namespace o2::aod
2426
{
@@ -32,16 +34,16 @@ DECLARE_SOA_COLUMN(Py, py, float); //! Non-dynam
3234
DECLARE_SOA_COLUMN(Pz, pz, float); //! Non-dynamic column with track z-momentum
3335
DECLARE_SOA_COLUMN(Sign, sign, float); //! Non-dynamic column with track sign
3436
DECLARE_SOA_COLUMN(IsPhysicalPrimary, isPhysicalPrimary, uint8_t); //!
35-
DECLARE_SOA_COLUMN(TOFExpSignalDiffEl, tofExpSignalDiffEl, float); //! Difference between signal and expected for electron
36-
DECLARE_SOA_COLUMN(TPCExpSignalDiffEl, tpcExpSignalDiffEl, float); //! Difference between signal and expected for electron
37-
DECLARE_SOA_COLUMN(TOFExpSignalDiffMu, tofExpSignalDiffMu, float); //! Difference between signal and expected for muon
38-
DECLARE_SOA_COLUMN(TPCExpSignalDiffMu, tpcExpSignalDiffMu, float); //! Difference between signal and expected for muon
39-
DECLARE_SOA_COLUMN(TOFExpSignalDiffPi, tofExpSignalDiffPi, float); //! Difference between signal and expected for pion
40-
DECLARE_SOA_COLUMN(TPCExpSignalDiffPi, tpcExpSignalDiffPi, float); //! Difference between signal and expected for pion
41-
DECLARE_SOA_COLUMN(TOFExpSignalDiffKa, tofExpSignalDiffKa, float); //! Difference between signal and expected for kaon
42-
DECLARE_SOA_COLUMN(TPCExpSignalDiffKa, tpcExpSignalDiffKa, float); //! Difference between signal and expected for kaon
43-
DECLARE_SOA_COLUMN(TOFExpSignalDiffPr, tofExpSignalDiffPr, float); //! Difference between signal and expected for proton
44-
DECLARE_SOA_COLUMN(TPCExpSignalDiffPr, tpcExpSignalDiffPr, float); //! Difference between signal and expected for proton
37+
DECLARE_SOA_COLUMN(TofExpSignalDiffEl, tofExpSignalDiffEl, float); //! Difference between signal and expected for electron
38+
DECLARE_SOA_COLUMN(TpcExpSignalDiffEl, tpcExpSignalDiffEl, float); //! Difference between signal and expected for electron
39+
DECLARE_SOA_COLUMN(TofExpSignalDiffMu, tofExpSignalDiffMu, float); //! Difference between signal and expected for muon
40+
DECLARE_SOA_COLUMN(TpcExpSignalDiffMu, tpcExpSignalDiffMu, float); //! Difference between signal and expected for muon
41+
DECLARE_SOA_COLUMN(TofExpSignalDiffPi, tofExpSignalDiffPi, float); //! Difference between signal and expected for pion
42+
DECLARE_SOA_COLUMN(TpcExpSignalDiffPi, tpcExpSignalDiffPi, float); //! Difference between signal and expected for pion
43+
DECLARE_SOA_COLUMN(TofExpSignalDiffKa, tofExpSignalDiffKa, float); //! Difference between signal and expected for kaon
44+
DECLARE_SOA_COLUMN(TpcExpSignalDiffKa, tpcExpSignalDiffKa, float); //! Difference between signal and expected for kaon
45+
DECLARE_SOA_COLUMN(TofExpSignalDiffPr, tofExpSignalDiffPr, float); //! Difference between signal and expected for proton
46+
DECLARE_SOA_COLUMN(TpcExpSignalDiffPr, tpcExpSignalDiffPr, float); //! Difference between signal and expected for proton
4547
} // namespace pidtracks
4648
DECLARE_SOA_TABLE(PidTracksDataMl, "AOD", "PIDTRACKSDATAML", //! Data tracks for prediction and domain adaptation
4749
aod::track::TPCSignal,
@@ -63,7 +65,6 @@ DECLARE_SOA_TABLE(PidTracksDataMl, "AOD", "PIDTRACKSDATAML", //! Data tracks for
6365
aod::track::DcaXY,
6466
aod::track::DcaZ);
6567
DECLARE_SOA_TABLE(PidTracksData, "AOD", "PIDTRACKSDATA", //! Data tracks for comparative analysis
66-
aod::cent::CentRun2V0M,
6768
aod::mult::MultFV0A, aod::mult::MultFV0C, pidtracks::MultFV0M,
6869
aod::mult::MultFT0A, aod::mult::MultFT0C, pidtracks::MultFT0M,
6970
aod::mult::MultZNA, aod::mult::MultZNC,
@@ -90,34 +91,34 @@ DECLARE_SOA_TABLE(PidTracksData, "AOD", "PIDTRACKSDATA", //! Data tracks for com
9091
aod::track::DcaZ,
9192
pidtpc::TPCNSigmaEl,
9293
pidtpc::TPCExpSigmaEl,
93-
pidtracks::TPCExpSignalDiffEl,
94+
pidtracks::TpcExpSignalDiffEl,
9495
pidtof::TOFNSigmaEl,
9596
pidtof::TOFExpSigmaEl,
96-
pidtracks::TOFExpSignalDiffEl,
97+
pidtracks::TofExpSignalDiffEl,
9798
pidtpc::TPCNSigmaMu,
9899
pidtpc::TPCExpSigmaMu,
99-
pidtracks::TPCExpSignalDiffMu,
100+
pidtracks::TpcExpSignalDiffMu,
100101
pidtof::TOFNSigmaMu,
101102
pidtof::TOFExpSigmaMu,
102-
pidtracks::TOFExpSignalDiffMu,
103+
pidtracks::TofExpSignalDiffMu,
103104
pidtpc::TPCNSigmaPi,
104105
pidtpc::TPCExpSigmaPi,
105-
pidtracks::TPCExpSignalDiffPi,
106+
pidtracks::TpcExpSignalDiffPi,
106107
pidtof::TOFNSigmaPi,
107108
pidtof::TOFExpSigmaPi,
108-
pidtracks::TOFExpSignalDiffPi,
109+
pidtracks::TofExpSignalDiffPi,
109110
pidtpc::TPCNSigmaKa,
110111
pidtpc::TPCExpSigmaKa,
111-
pidtracks::TPCExpSignalDiffKa,
112+
pidtracks::TpcExpSignalDiffKa,
112113
pidtof::TOFNSigmaKa,
113114
pidtof::TOFExpSigmaKa,
114-
pidtracks::TOFExpSignalDiffKa,
115+
pidtracks::TofExpSignalDiffKa,
115116
pidtpc::TPCNSigmaPr,
116117
pidtpc::TPCExpSigmaPr,
117-
pidtracks::TPCExpSignalDiffPr,
118+
pidtracks::TpcExpSignalDiffPr,
118119
pidtof::TOFNSigmaPr,
119120
pidtof::TOFExpSigmaPr,
120-
pidtracks::TOFExpSignalDiffPr);
121+
pidtracks::TofExpSignalDiffPr);
121122
DECLARE_SOA_TABLE(PidTracksMcMl, "AOD", "PIDTRACKSMCML", //! MC tracks for training
122123
aod::track::TPCSignal,
123124
aod::track::TRDSignal, aod::track::TRDPattern,
@@ -140,7 +141,6 @@ DECLARE_SOA_TABLE(PidTracksMcMl, "AOD", "PIDTRACKSMCML", //! MC tracks for train
140141
aod::mcparticle::PdgCode,
141142
pidtracks::IsPhysicalPrimary);
142143
DECLARE_SOA_TABLE(PidTracksMc, "AOD", "PIDTRACKSMC", //! MC tracks for comparative analysis
143-
aod::cent::CentRun2V0M,
144144
aod::mult::MultFV0A, aod::mult::MultFV0C, pidtracks::MultFV0M,
145145
aod::mult::MultFT0A, aod::mult::MultFT0C, pidtracks::MultFT0M,
146146
aod::mult::MultZNA, aod::mult::MultZNC,
@@ -167,34 +167,34 @@ DECLARE_SOA_TABLE(PidTracksMc, "AOD", "PIDTRACKSMC", //! MC tracks for comparati
167167
aod::track::DcaZ,
168168
pidtpc::TPCNSigmaEl,
169169
pidtpc::TPCExpSigmaEl,
170-
pidtracks::TPCExpSignalDiffEl,
170+
pidtracks::TpcExpSignalDiffEl,
171171
pidtof::TOFNSigmaEl,
172172
pidtof::TOFExpSigmaEl,
173-
pidtracks::TOFExpSignalDiffEl,
173+
pidtracks::TofExpSignalDiffEl,
174174
pidtpc::TPCNSigmaMu,
175175
pidtpc::TPCExpSigmaMu,
176-
pidtracks::TPCExpSignalDiffMu,
176+
pidtracks::TpcExpSignalDiffMu,
177177
pidtof::TOFNSigmaMu,
178178
pidtof::TOFExpSigmaMu,
179-
pidtracks::TOFExpSignalDiffMu,
179+
pidtracks::TofExpSignalDiffMu,
180180
pidtpc::TPCNSigmaPi,
181181
pidtpc::TPCExpSigmaPi,
182-
pidtracks::TPCExpSignalDiffPi,
182+
pidtracks::TpcExpSignalDiffPi,
183183
pidtof::TOFNSigmaPi,
184184
pidtof::TOFExpSigmaPi,
185-
pidtracks::TOFExpSignalDiffPi,
185+
pidtracks::TofExpSignalDiffPi,
186186
pidtpc::TPCNSigmaKa,
187187
pidtpc::TPCExpSigmaKa,
188-
pidtracks::TPCExpSignalDiffKa,
188+
pidtracks::TpcExpSignalDiffKa,
189189
pidtof::TOFNSigmaKa,
190190
pidtof::TOFExpSigmaKa,
191-
pidtracks::TOFExpSignalDiffKa,
191+
pidtracks::TofExpSignalDiffKa,
192192
pidtpc::TPCNSigmaPr,
193193
pidtpc::TPCExpSigmaPr,
194-
pidtracks::TPCExpSignalDiffPr,
194+
pidtracks::TpcExpSignalDiffPr,
195195
pidtof::TOFNSigmaPr,
196196
pidtof::TOFExpSigmaPr,
197-
pidtracks::TOFExpSignalDiffPr,
197+
pidtracks::TofExpSignalDiffPr,
198198
aod::mcparticle::PdgCode,
199199
pidtracks::IsPhysicalPrimary);
200200
} // namespace o2::aod

0 commit comments

Comments
 (0)