Skip to content

Commit 3bfea57

Browse files
sashingosashingo
authored
Merge branch 'AliceO2Group:master' into master
2 parents 2854a0d + 8e7592b commit 3bfea57

File tree

152 files changed

+15361
-7190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+15361
-7190
lines changed

‎ALICE3/DataModel/OTFTOF.h‎

Lines changed: 60 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,42 +27,81 @@ namespace o2::aod
2727
{
2828
namespace upgrade_tof
2929
{
30-
DECLARE_SOA_COLUMN(NSigmaElectronInnerTOF, nSigmaElectronInnerTOF, float); //! NSigma electron InnerTOF
31-
DECLARE_SOA_COLUMN(NSigmaMuonInnerTOF, nSigmaMuonInnerTOF, float); //! NSigma muon InnerTOF
32-
DECLARE_SOA_COLUMN(NSigmaPionInnerTOF, nSigmaPionInnerTOF, float); //! NSigma pion InnerTOF
33-
DECLARE_SOA_COLUMN(NSigmaKaonInnerTOF, nSigmaKaonInnerTOF, float); //! NSigma kaon InnerTOF
34-
DECLARE_SOA_COLUMN(NSigmaProtonInnerTOF, nSigmaProtonInnerTOF, float); //! NSigma proton InnerTOF
35-
DECLARE_SOA_COLUMN(InnerTOFTrackLength, innerTOFTrackLength, float); //! track length for calculation of InnerTOF
36-
DECLARE_SOA_COLUMN(InnerTOFTrackLengthReco, innerTOFTrackLengthReco, float); //! track length for calculation of InnerTOF
37-
DECLARE_SOA_COLUMN(DeltaTrackLengthInnerTOF, deltaTrackLengthInnerTOF, float); //! track length for calculation of InnerTOF
38-
DECLARE_SOA_COLUMN(NSigmaElectronOuterTOF, nSigmaElectronOuterTOF, float); //! NSigma electron OuterTOF
39-
DECLARE_SOA_COLUMN(NSigmaMuonOuterTOF, nSigmaMuonOuterTOF, float); //! NSigma muon OuterTOF
40-
DECLARE_SOA_COLUMN(NSigmaPionOuterTOF, nSigmaPionOuterTOF, float); //! NSigma pion OuterTOF
41-
DECLARE_SOA_COLUMN(NSigmaKaonOuterTOF, nSigmaKaonOuterTOF, float); //! NSigma kaon OuterTOF
42-
DECLARE_SOA_COLUMN(NSigmaProtonOuterTOF, nSigmaProtonOuterTOF, float); //! NSigma proton OuterTOF
43-
DECLARE_SOA_COLUMN(OuterTOFTrackLength, outerTOFTrackLength, float); //! track length for calculation of OuterTOF
44-
DECLARE_SOA_COLUMN(OuterTOFTrackLengthReco, outerTOFTrackLengthReco, float); //! track length for calculation of OuterTOF
45-
DECLARE_SOA_COLUMN(DeltaTrackLengthOuterTOF, deltaTrackLengthOuterTOF, float); //! track length for calculation of InnerTOF
30+
DECLARE_SOA_COLUMN(InnerTOFTrackTime, innerTOFTrackTime, float); //! Track time generated at the InnerTOF
31+
DECLARE_SOA_COLUMN(InnerTOFTrackLength, innerTOFTrackLength, float); //! track length for calculation of InnerTOF (generated)
32+
DECLARE_SOA_COLUMN(OuterTOFTrackTime, outerTOFTrackTime, float); //! Track time generated at the OuterTOF
33+
DECLARE_SOA_COLUMN(OuterTOFTrackLength, outerTOFTrackLength, float); //! track length for calculation of OuterTOF (generated)
34+
35+
DECLARE_SOA_COLUMN(TOFEventTime, tofEventTime, float); //! Event time reconstructed with the TOF
36+
DECLARE_SOA_COLUMN(TOFEventTimeErr, tofEventTimeErr, float); //! Uncertainty on the event time reconstructed with the TOF
37+
DECLARE_SOA_COLUMN(NSigmaElectronInnerTOF, nSigmaElectronInnerTOF, float); //! NSigma electron InnerTOF
38+
DECLARE_SOA_COLUMN(NSigmaMuonInnerTOF, nSigmaMuonInnerTOF, float); //! NSigma muon InnerTOF
39+
DECLARE_SOA_COLUMN(NSigmaPionInnerTOF, nSigmaPionInnerTOF, float); //! NSigma pion InnerTOF
40+
DECLARE_SOA_COLUMN(NSigmaKaonInnerTOF, nSigmaKaonInnerTOF, float); //! NSigma kaon InnerTOF
41+
DECLARE_SOA_COLUMN(NSigmaProtonInnerTOF, nSigmaProtonInnerTOF, float); //! NSigma proton InnerTOF
42+
DECLARE_SOA_COLUMN(InnerTOFTrackTimeReco, innerTOFTrackTimeReco, float); //! Track time measured at the InnerTOF
43+
DECLARE_SOA_COLUMN(InnerTOFTrackLengthReco, innerTOFTrackLengthReco, float); //! track length for calculation of InnerTOF (reconstructed)
44+
45+
DECLARE_SOA_COLUMN(InnerTOFExpectedTimeEl, innerTOFExpectedTimeEl, float); //! Reconstructed expected time at the InnerTOF for the Electron mass hypotheses
46+
DECLARE_SOA_COLUMN(InnerTOFExpectedTimeMu, innerTOFExpectedTimeMu, float); //! Reconstructed expected time at the InnerTOF for the Muon mass hypotheses
47+
DECLARE_SOA_COLUMN(InnerTOFExpectedTimePi, innerTOFExpectedTimePi, float); //! Reconstructed expected time at the InnerTOF for the Pion mass hypotheses
48+
DECLARE_SOA_COLUMN(InnerTOFExpectedTimeKa, innerTOFExpectedTimeKa, float); //! Reconstructed expected time at the InnerTOF for the Kaon mass hypotheses
49+
DECLARE_SOA_COLUMN(InnerTOFExpectedTimePr, innerTOFExpectedTimePr, float); //! Reconstructed expected time at the InnerTOF for the Proton mass hypotheses
50+
51+
DECLARE_SOA_COLUMN(NSigmaElectronOuterTOF, nSigmaElectronOuterTOF, float); //! NSigma electron OuterTOF
52+
DECLARE_SOA_COLUMN(NSigmaMuonOuterTOF, nSigmaMuonOuterTOF, float); //! NSigma muon OuterTOF
53+
DECLARE_SOA_COLUMN(NSigmaPionOuterTOF, nSigmaPionOuterTOF, float); //! NSigma pion OuterTOF
54+
DECLARE_SOA_COLUMN(NSigmaKaonOuterTOF, nSigmaKaonOuterTOF, float); //! NSigma kaon OuterTOF
55+
DECLARE_SOA_COLUMN(NSigmaProtonOuterTOF, nSigmaProtonOuterTOF, float); //! NSigma proton OuterTOF
56+
DECLARE_SOA_COLUMN(OuterTOFTrackTimeReco, outerTOFTrackTimeReco, float); //! Track time measured at the OuterTOF
57+
DECLARE_SOA_COLUMN(OuterTOFTrackLengthReco, outerTOFTrackLengthReco, float); //! track length for calculation of OuterTOF (reconstructed)
58+
59+
DECLARE_SOA_COLUMN(OuterTOFExpectedTimeEl, outerTOFExpectedTimeEl, float); //! Reconstructed expected time at the OuterTOF for the Electron mass hypotheses
60+
DECLARE_SOA_COLUMN(OuterTOFExpectedTimeMu, outerTOFExpectedTimeMu, float); //! Reconstructed expected time at the OuterTOF for the Muon mass hypotheses
61+
DECLARE_SOA_COLUMN(OuterTOFExpectedTimePi, outerTOFExpectedTimePi, float); //! Reconstructed expected time at the OuterTOF for the Pion mass hypotheses
62+
DECLARE_SOA_COLUMN(OuterTOFExpectedTimeKa, outerTOFExpectedTimeKa, float); //! Reconstructed expected time at the OuterTOF for the Kaon mass hypotheses
63+
DECLARE_SOA_COLUMN(OuterTOFExpectedTimePr, outerTOFExpectedTimePr, float); //! Reconstructed expected time at the OuterTOF for the Proton mass hypotheses
4664
} // namespace upgrade_tof
65+
66+
DECLARE_SOA_TABLE(UpgradeTofMCs, "AOD", "UPGRADETOFMC",
67+
upgrade_tof::InnerTOFTrackTime,
68+
upgrade_tof::InnerTOFTrackLength,
69+
upgrade_tof::OuterTOFTrackTime,
70+
upgrade_tof::OuterTOFTrackLength);
71+
4772
DECLARE_SOA_TABLE(UpgradeTofs, "AOD", "UPGRADETOF",
73+
upgrade_tof::TOFEventTime,
74+
upgrade_tof::TOFEventTimeErr,
4875
upgrade_tof::NSigmaElectronInnerTOF,
4976
upgrade_tof::NSigmaMuonInnerTOF,
5077
upgrade_tof::NSigmaPionInnerTOF,
5178
upgrade_tof::NSigmaKaonInnerTOF,
5279
upgrade_tof::NSigmaProtonInnerTOF,
53-
upgrade_tof::InnerTOFTrackLength,
80+
upgrade_tof::InnerTOFTrackTimeReco,
5481
upgrade_tof::InnerTOFTrackLengthReco,
55-
upgrade_tof::DeltaTrackLengthInnerTOF,
5682
upgrade_tof::NSigmaElectronOuterTOF,
5783
upgrade_tof::NSigmaMuonOuterTOF,
5884
upgrade_tof::NSigmaPionOuterTOF,
5985
upgrade_tof::NSigmaKaonOuterTOF,
6086
upgrade_tof::NSigmaProtonOuterTOF,
61-
upgrade_tof::OuterTOFTrackLength,
62-
upgrade_tof::OuterTOFTrackLengthReco,
63-
upgrade_tof::DeltaTrackLengthOuterTOF);
87+
upgrade_tof::OuterTOFTrackTimeReco,
88+
upgrade_tof::OuterTOFTrackLengthReco);
89+
90+
DECLARE_SOA_TABLE(UpgradeTofExpectedTimes, "AOD", "UPGRADETOFEXPT",
91+
upgrade_tof::InnerTOFExpectedTimeEl,
92+
upgrade_tof::InnerTOFExpectedTimeMu,
93+
upgrade_tof::InnerTOFExpectedTimePi,
94+
upgrade_tof::InnerTOFExpectedTimeKa,
95+
upgrade_tof::InnerTOFExpectedTimePr,
96+
upgrade_tof::OuterTOFExpectedTimeEl,
97+
upgrade_tof::OuterTOFExpectedTimeMu,
98+
upgrade_tof::OuterTOFExpectedTimePi,
99+
upgrade_tof::OuterTOFExpectedTimeKa,
100+
upgrade_tof::OuterTOFExpectedTimePr);
64101

102+
using UpgradeTofMC = UpgradeTofMCs::iterator;
65103
using UpgradeTof = UpgradeTofs::iterator;
104+
using UpgradeTofExpectedTime = UpgradeTofExpectedTimes::iterator;
66105

67106
} // namespace o2::aod
68107

‎ALICE3/TableProducer/OTF/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ o2physics_add_dpl_workflow(onthefly-tracker
1515
COMPONENT_NAME Analysis)
1616

1717
o2physics_add_dpl_workflow(onthefly-tofpid
18-
SOURCES onTheFlyTOFPID.cxx
18+
SOURCES onTheFlyTofPid.cxx
1919
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2Physics::AnalysisCore O2::ReconstructionDataFormats O2::DetectorsCommonDataFormats O2Physics::ALICE3Core
2020
COMPONENT_NAME Analysis)
2121

0 commit comments

Comments
 (0)