Skip to content

Commit d4f11dc

Browse files
ddobrigkalibuild
andauthored
Data model: add extra information for run 2 evsel (#13810)
* Data model: add extra information for run 2 evsel * Please consider the following formatting changes * Fix bug --------- Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
1 parent 5a7052d commit d4f11dc

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

Framework/Core/include/Framework/AnalysisDataModel.h

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1699,6 +1699,8 @@ DECLARE_SOA_COLUMN(SPDFiredFastOrL0, spdFiredFastOrL0, uint16_t); //! Fired
16991699
DECLARE_SOA_COLUMN(SPDFiredFastOrL1, spdFiredFastOrL1, uint16_t); //! Fired FASTOR signals in the first layer of the SPD (online)
17001700
DECLARE_SOA_COLUMN(V0TriggerChargeA, v0TriggerChargeA, uint16_t); //! V0A trigger charge
17011701
DECLARE_SOA_COLUMN(V0TriggerChargeC, v0TriggerChargeC, uint16_t); //! V0C trigger charge
1702+
DECLARE_SOA_COLUMN(NTPCClusters, nTPCClusters, uint32_t); //! total number of TPC clusters (for ev sel)
1703+
DECLARE_SOA_COLUMN(NSDDSSDClusters, nSDDSSDClusters, uint32_t); //! total number of SSD + SDD clusters (for ev sel)
17021704
namespace oftv0
17031705
{
17041706
DECLARE_SOA_INDEX_COLUMN(Collision, collision); //! Collision index
@@ -1721,12 +1723,23 @@ DECLARE_SOA_COLUMN(Mass, mass, float); //! mass
17211723
} // namespace oftv0
17221724
} // namespace run2
17231725

1724-
DECLARE_SOA_TABLE(Run2BCInfos, "AOD", "RUN2BCINFO", run2::EventCuts, //! Legacy information for Run 2 event selection
1726+
DECLARE_SOA_TABLE(Run2BCInfos_000, "AOD", "RUN2BCINFO", run2::EventCuts, //! Legacy information for Run 2 event selection
17251727
run2::TriggerMaskNext50, run2::L0TriggerInputMask,
17261728
run2::SPDClustersL0, run2::SPDClustersL1,
17271729
run2::SPDFiredChipsL0, run2::SPDFiredChipsL1,
17281730
run2::SPDFiredFastOrL0, run2::SPDFiredFastOrL1,
17291731
run2::V0TriggerChargeA, run2::V0TriggerChargeC);
1732+
1733+
DECLARE_SOA_TABLE_VERSIONED(Run2BCInfos_001, "AOD", "RUN2BCINFO", 1,
1734+
run2::EventCuts, //! Legacy information for Run 2 event selection
1735+
run2::TriggerMaskNext50, run2::L0TriggerInputMask,
1736+
run2::SPDClustersL0, run2::SPDClustersL1,
1737+
run2::SPDFiredChipsL0, run2::SPDFiredChipsL1,
1738+
run2::SPDFiredFastOrL0, run2::SPDFiredFastOrL1,
1739+
run2::V0TriggerChargeA, run2::V0TriggerChargeC,
1740+
run2::NTPCClusters, run2::NSDDSSDClusters);
1741+
1742+
using Run2BCInfos = Run2BCInfos_000;
17301743
using Run2BCInfo = Run2BCInfos::iterator;
17311744

17321745
DECLARE_SOA_TABLE(Run2OTFV0s, "AOD", "Run2OTFV0", //! Run 2 V0 on the fly table

Framework/Core/include/Framework/DataTypes.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ enum TrackFlagsRun2Enum {
5757
FreeClsSPDTracklet = 0x1, // for SPD tracklets, tracklet from cluster not used in tracking
5858
TPCrefit = 0x2,
5959
GoldenChi2 = 0x4,
60+
TPCout = 0x8
6061
// NOTE Highest 4 (29..32) bits reserved for PID hypothesis
6162
};
6263
enum DetectorMapEnum : uint8_t {

0 commit comments

Comments
 (0)