Skip to content

Commit b04f601

Browse files
author
Romain Schotter
committed
Update strangeness data model to reduce derived data size (in pp)
1 parent 33a18b8 commit b04f601

1 file changed

Lines changed: 58 additions & 10 deletions

File tree

‎PWGLF/DataModel/LFStrangenessTables.h‎

Lines changed: 58 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "Common/Core/RecoDecay.h"
2020
#include "Common/DataModel/Centrality.h"
2121
#include "Common/DataModel/EventSelection.h"
22+
#include "Common/DataModel/McCollisionExtra.h" // IWYU pragma: keep (FIXME: not used, remove asap)
2223
#include "Common/DataModel/Multiplicity.h"
2324
#include "Common/DataModel/Qvectors.h"
2425

@@ -278,15 +279,61 @@ DECLARE_SOA_TABLE_VERSIONED(StraEvSels_005, "AOD", "STRAEVSELS", 5, //!
278279
// stracollision::EnergyCommonZNC<mult::MultZNC>,
279280
stracollision::IsUPC<udcollision::GapSide>);
280281

281-
DECLARE_SOA_TABLE(StraEvSelExtras, "AOD", "STRAEVSELEXTRAS", //! debug information
282-
udzdc::TimeZNA, // UPC info: re-assigned ZN-A time, in case of SG event, from the most active bc
283-
udzdc::TimeZNC, // UPC info: re-assigned ZN-C time, in case of SG event, from the most active bc
284-
udcollision::TimeFDDA, // Average A-side time (ns)
285-
udcollision::TimeFDDC, // Average C-side time (ns)
286-
udcollision::TimeFV0A, // Average A-side time (ns)
287-
udcollision::TimeFT0A, // Average A-side time (ns)
288-
udcollision::TimeFT0C, // Average C-side time (ns)
289-
udcollision::TriggerMaskFT0); // 8 trigger bits: OrA, OrC, Semi-central, Central, Vertex, IsActiveA, IsActiveC, IsFlangeEvent
282+
DECLARE_SOA_TABLE_VERSIONED(StraEvSels_006, "AOD", "STRAEVSELS", 6, //! debug information
283+
evsel::Sel8, evsel::Selection, //! event selection: sel8
284+
mult::MultFT0A, mult::MultFT0C, mult::MultFV0A, // FIT detectors
285+
mult::MultFDDA, mult::MultFDDC,
286+
mult::MultNTracksPVeta1, // track multiplicities with eta cut for INEL>0
287+
mult::MultPVTotalContributors, // number of PV contribs total
288+
mult::MultNTracksGlobal, // global track multiplicities
289+
collision::Flags, // Contains Vertex::Flags, with most notably the UPCMode to know whether the vertex has been found using UPC settings
290+
evsel::Alias, // trigger aliases (e.g. kTVXinTRD for v2)
291+
evsel::Rct); // Bitmask of RCT flags
292+
293+
DECLARE_SOA_TABLE(StraEvSelExtras_000, "AOD", "STRAEVSELEXTRAS", //! debug information
294+
udzdc::TimeZNA, // UPC info: re-assigned ZN-A time, in case of SG event, from the most active bc
295+
udzdc::TimeZNC, // UPC info: re-assigned ZN-C time, in case of SG event, from the most active bc
296+
udcollision::TimeFDDA, // Average A-side time (ns)
297+
udcollision::TimeFDDC, // Average C-side time (ns)
298+
udcollision::TimeFV0A, // Average A-side time (ns)
299+
udcollision::TimeFT0A, // Average A-side time (ns)
300+
udcollision::TimeFT0C, // Average C-side time (ns)
301+
udcollision::TriggerMaskFT0); // 8 trigger bits: OrA, OrC, Semi-central, Central, Vertex, IsActiveA, IsActiveC, IsFlangeEvent
302+
303+
DECLARE_SOA_TABLE_VERSIONED(StraEvSelExtras_001, "AOD", "STRAEVSELEXTRAS", 1, //! debug information
304+
mult::MultZNA, mult::MultZNC, mult::MultZEM1, // ZDC signals
305+
mult::MultZEM2, mult::MultZPA, mult::MultZPC,
306+
mult::MultNTracksITSTPC, // track multiplicities, PV contribs, no eta cut
307+
mult::MultAllTracksTPCOnly, // TPConly track multiplicities, all, no eta cut
308+
mult::MultAllTracksITSTPC, // ITSTPC track multiplicities, all, no eta cut
309+
evsel::NumTracksInTimeRange, // add occupancy in specified time interval by a number of tracks from nearby collisions
310+
evsel::SumAmpFT0CInTimeRange, // add occupancy in specified time interval by a sum of FT0C amplitudes from nearby collisions
311+
udcollision::TimeFDDA, // Average A-side time (ns)
312+
udcollision::TimeFDDC, // Average C-side time (ns)
313+
udcollision::TimeFV0A, // Average A-side time (ns)
314+
udcollision::TimeFT0A, // Average A-side time (ns)
315+
udcollision::TimeFT0C, // Average C-side time (ns)
316+
udcollision::TriggerMaskFT0, // 8 trigger bits: OrA, OrC, Semi-central, Central, Vertex, IsActiveA, IsActiveC, IsFlangeEvent
317+
udcollision::GapSide, // UPC info: 0 for side A, 1 for side C, 2 for both sides, 3 neither A or C, 4 not enough or too many pv contributors
318+
udcollision::TotalFT0AmplitudeA, // UPC info: re-assigned FT0-A amplitude, in case of SG event, from the most active bc
319+
udcollision::TotalFT0AmplitudeC, // UPC info: re-assigned FT0-C amplitude, in case of SG event, from the most active bc
320+
udcollision::TotalFV0AmplitudeA, // UPC info: re-assigned FV0-A amplitude, in case of SG event, from the most active bc
321+
udcollision::TotalFDDAmplitudeA, // UPC info: re-assigned FDD-A amplitude, in case of SG event, from the most active bc
322+
udcollision::TotalFDDAmplitudeC, // UPC info: re-assigned FDD-C amplitude, in case of SG event, from the most active bc
323+
udzdc::TimeZNA, // UPC info: re-assigned ZN-A time, in case of SG event, from the most active bc
324+
udzdc::TimeZNC, // UPC info: re-assigned ZN-C time, in case of SG event, from the most active bc
325+
udzdc::EnergyCommonZNA, // UPC info: re-assigned ZN-A amplitude, in case of SG event, from the most active bc
326+
udzdc::EnergyCommonZNC, // UPC info: re-assigned ZN-C amplitude, in case of SG event, from the most active bc
327+
// Dynamic columns for manipulating information
328+
// stracollision::TotalFV0AmplitudeA<mult::MultFV0A>,
329+
// stracollision::TotalFT0AmplitudeA<mult::MultFT0A>,
330+
// stracollision::TotalFT0AmplitudeC<mult::MultFT0C>,
331+
// stracollision::TotalFDDAmplitudeA<mult::MultFDDA>,
332+
// stracollision::TotalFDDAmplitudeC<mult::MultFDDC>,
333+
// stracollision::EnergyCommonZNA<mult::MultZNA>,
334+
// stracollision::EnergyCommonZNC<mult::MultZNC>,
335+
stracollision::IsUPC<udcollision::GapSide>
336+
);
290337

291338
DECLARE_SOA_TABLE(StraEvSelsRun2, "AOD", "STRAEVSELSRUN2", //! debug information
292339
evsel::Sel8, evsel::Sel7, evsel::Selection, //! event selection: sel8
@@ -330,7 +377,8 @@ DECLARE_SOA_TABLE(StraEvTimes, "AOD", "STRAEVTIMES", //! event time (FT0, TOF)
330377

331378
using StraRawCents = StraRawCents_004;
332379
using StraCents = StraCents_002;
333-
using StraEvSels = StraEvSels_005;
380+
using StraEvSels = StraEvSels_006;
381+
using StraEvSelExtras = StraEvSelExtras_001;
334382
using StraStamps = StraStamps_001;
335383
using StraCollision = StraCollisions::iterator;
336384
using StraCent = StraCents::iterator;

0 commit comments

Comments
 (0)