Skip to content

Commit d9ee88c

Browse files
ddobrigkddobrigk
committed
PWGLF: add evsel::alias to stra der data
1 parent 8702768 commit d9ee88c

File tree

4 files changed

+100
-21
lines changed

4 files changed

+100
-21
lines changed

‎PWGLF/DataModel/LFStrangenessTables.h‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,6 @@ DECLARE_SOA_TABLE_VERSIONED(StraEvSels_001, "AOD", "STRAEVSELS", 1, //!
129129
udcollision::TotalFDDAmplitudeC, // UPC info: re-assigned FDD-C amplitude, in case of SG event, from the most active bc
130130
udzdc::EnergyCommonZNA, // UPC info: re-assigned ZN-A amplitude, in case of SG event, from the most active bc
131131
udzdc::EnergyCommonZNC, // UPC info: re-assigned ZN-C amplitude, in case of SG event, from the most active bc
132-
133-
// Dynamic columns for manipulating information
134-
// stracollision::TotalFV0AmplitudeA<mult::MultFV0A>,
135-
// stracollision::TotalFT0AmplitudeA<mult::MultFT0A>,
136-
// stracollision::TotalFT0AmplitudeC<mult::MultFT0C>,
137-
// stracollision::TotalFDDAmplitudeA<mult::MultFDDA>,
138-
// stracollision::TotalFDDAmplitudeC<mult::MultFDDC>,
139-
// stracollision::EnergyCommonZNA<mult::MultZNA>,
140-
// stracollision::EnergyCommonZNC<mult::MultZNC>,
141132
stracollision::IsUPC<udcollision::GapSide>);
142133

143134
DECLARE_SOA_TABLE_VERSIONED(StraEvSels_002, "AOD", "STRAEVSELS", 2, //! debug information
@@ -161,17 +152,7 @@ DECLARE_SOA_TABLE_VERSIONED(StraEvSels_002, "AOD", "STRAEVSELS", 2, //!
161152
udcollision::TotalFDDAmplitudeC, // UPC info: re-assigned FDD-C amplitude, in case of SG event, from the most active bc
162153
udzdc::EnergyCommonZNA, // UPC info: re-assigned ZN-A amplitude, in case of SG event, from the most active bc
163154
udzdc::EnergyCommonZNC, // UPC info: re-assigned ZN-C amplitude, in case of SG event, from the most active bc
164-
165155
collision::Flags, // Contains Vertex::Flags, with most notably the UPCMode to know whether the vertex has been found using UPC settings
166-
167-
// Dynamic columns for manipulating information
168-
// stracollision::TotalFV0AmplitudeA<mult::MultFV0A>,
169-
// stracollision::TotalFT0AmplitudeA<mult::MultFT0A>,
170-
// stracollision::TotalFT0AmplitudeC<mult::MultFT0C>,
171-
// stracollision::TotalFDDAmplitudeA<mult::MultFDDA>,
172-
// stracollision::TotalFDDAmplitudeC<mult::MultFDDC>,
173-
// stracollision::EnergyCommonZNA<mult::MultZNA>,
174-
// stracollision::EnergyCommonZNC<mult::MultZNC>,
175156
stracollision::IsUPC<udcollision::GapSide>);
176157

177158
DECLARE_SOA_TABLE_VERSIONED(StraEvSels_003, "AOD", "STRAEVSELS", 3, //! debug information
@@ -196,8 +177,34 @@ DECLARE_SOA_TABLE_VERSIONED(StraEvSels_003, "AOD", "STRAEVSELS", 3, //!
196177
udcollision::TotalFDDAmplitudeC, // UPC info: re-assigned FDD-C amplitude, in case of SG event, from the most active bc
197178
udzdc::EnergyCommonZNA, // UPC info: re-assigned ZN-A amplitude, in case of SG event, from the most active bc
198179
udzdc::EnergyCommonZNC, // UPC info: re-assigned ZN-C amplitude, in case of SG event, from the most active bc
180+
collision::Flags, // Contains Vertex::Flags, with most notably the UPCMode to know whether the vertex has been found using UPC settings
181+
stracollision::IsUPC<udcollision::GapSide>);
182+
183+
DECLARE_SOA_TABLE_VERSIONED(StraEvSels_004, "AOD", "STRAEVSELS", 4, //! debug information
184+
evsel::Sel8, evsel::Selection, //! event selection: sel8
185+
mult::MultFT0A, mult::MultFT0C, mult::MultFV0A, // FIT detectors
186+
mult::MultFDDA, mult::MultFDDC,
187+
mult::MultNTracksPVeta1, // track multiplicities with eta cut for INEL>0
188+
mult::MultPVTotalContributors, // number of PV contribs total
189+
mult::MultNTracksGlobal, // global track multiplicities
190+
mult::MultNTracksITSTPC, // track multiplicities, PV contribs, no eta cut
191+
mult::MultAllTracksTPCOnly, // TPConly track multiplicities, all, no eta cut
192+
mult::MultAllTracksITSTPC, // ITSTPC track multiplicities, all, no eta cut
193+
mult::MultZNA, mult::MultZNC, mult::MultZEM1, // ZDC signals
194+
mult::MultZEM2, mult::MultZPA, mult::MultZPC,
195+
evsel::NumTracksInTimeRange, // add occupancy in specified time interval by a number of tracks from nearby collisions
196+
evsel::SumAmpFT0CInTimeRange, // add occupancy in specified time interval by a sum of FT0C amplitudes from nearby collisions
197+
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
198+
udcollision::TotalFT0AmplitudeA, // UPC info: re-assigned FT0-A amplitude, in case of SG event, from the most active bc
199+
udcollision::TotalFT0AmplitudeC, // UPC info: re-assigned FT0-C amplitude, in case of SG event, from the most active bc
200+
udcollision::TotalFV0AmplitudeA, // UPC info: re-assigned FV0-A amplitude, in case of SG event, from the most active bc
201+
udcollision::TotalFDDAmplitudeA, // UPC info: re-assigned FDD-A amplitude, in case of SG event, from the most active bc
202+
udcollision::TotalFDDAmplitudeC, // UPC info: re-assigned FDD-C amplitude, in case of SG event, from the most active bc
203+
udzdc::EnergyCommonZNA, // UPC info: re-assigned ZN-A amplitude, in case of SG event, from the most active bc
204+
udzdc::EnergyCommonZNC, // UPC info: re-assigned ZN-C amplitude, in case of SG event, from the most active bc
199205

200206
collision::Flags, // Contains Vertex::Flags, with most notably the UPCMode to know whether the vertex has been found using UPC settings
207+
evsel::Alias, // trigger aliases (e.g. kTVXinTRD for v2)
201208

202209
// Dynamic columns for manipulating information
203210
// stracollision::TotalFV0AmplitudeA<mult::MultFV0A>,
@@ -228,7 +235,7 @@ DECLARE_SOA_TABLE(StraStamps, "AOD", "STRASTAMPS", //! information for ID-ing ma
228235
bc::RunNumber, timestamp::Timestamp);
229236

230237
using StraRawCents = StraRawCents_004;
231-
using StraEvSels = StraEvSels_003;
238+
using StraEvSels = StraEvSels_004;
232239
using StraCollision = StraCollisions::iterator;
233240
using StraCent = StraCents::iterator;
234241

‎PWGLF/TableProducer/Strangeness/Converters/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ o2physics_add_dpl_workflow(straevselsconverter3
3939
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::ITStracking
4040
COMPONENT_NAME Analysis)
4141

42+
o2physics_add_dpl_workflow(straevselsconverter4
43+
SOURCES straevselsconverter4.cxx
44+
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::ITStracking
45+
COMPONENT_NAME Analysis)
46+
4247
o2physics_add_dpl_workflow(straevselsconverter2rawcents
4348
SOURCES straevselsconverter2rawcents.cxx
4449
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore

‎PWGLF/TableProducer/Strangeness/Converters/straevselsconverter4.cxx‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
2+
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
// All rights not expressly granted are reserved.
4+
//
5+
// This software is distributed under the terms of the GNU General Public
6+
// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
7+
//
8+
// In applying this license CERN does not waive the privileges and immunities
9+
// granted to it by virtue of its status as an Intergovernmental Organization
10+
// or submit itself to any jurisdiction.
11+
#include "Framework/runDataProcessing.h"
12+
#include "Framework/AnalysisTask.h"
13+
#include "Framework/AnalysisDataModel.h"
14+
#include "ITStracking/Vertexer.h"
15+
#include "PWGLF/DataModel/LFStrangenessTables.h"
16+
17+
using namespace o2;
18+
using namespace o2::framework;
19+
20+
// Converts Stra Event selections from 000 to 001
21+
struct straevselsconverter4 {
22+
Produces<aod::StraEvSels_004> straEvSels_004;
23+
24+
void process(aod::StraEvSels_003 const& straEvSels_003)
25+
{
26+
for (auto& values : straEvSels_003) {
27+
straEvSels_004(values.sel8(),
28+
values.selection_raw(),
29+
values.multFT0A(),
30+
values.multFT0C(),
31+
values.multFT0A(),
32+
0 /*dummy FDDA value*/,
33+
0 /*dummy FDDC value*/,
34+
values.multNTracksPVeta1(),
35+
values.multPVTotalContributors(),
36+
values.multNTracksGlobal(),
37+
values.multNTracksITSTPC(),
38+
values.multAllTracksTPCOnly(),
39+
values.multAllTracksITSTPC(),
40+
values.multZNA(),
41+
values.multZNC(),
42+
values.multZEM1(),
43+
values.multZEM2(),
44+
values.multZPA(),
45+
values.multZPC(),
46+
values.trackOccupancyInTimeRange(),
47+
0 /*dummy occupancy value*/,
48+
values.gapSide(),
49+
values.totalFT0AmplitudeA(),
50+
values.totalFT0AmplitudeC(),
51+
values.totalFV0AmplitudeA(),
52+
values.totalFDDAmplitudeA(),
53+
values.totalFDDAmplitudeC(),
54+
values.energyCommonZNA(),
55+
values.energyCommonZNC(),
56+
values.flags(),
57+
0 /*dummy Alias value*/);
58+
}
59+
}
60+
};
61+
62+
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
63+
{
64+
return WorkflowSpec{
65+
adaptAnalysisTask<straevselsconverter4>(cfgc)};
66+
}

‎PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,8 @@ struct strangederivedbuilder {
381381
totalFDDAmplitudeA, totalFDDAmplitudeC,
382382
energyCommonZNA, energyCommonZNC,
383383
// Collision flags
384-
collision.flags());
384+
collision.flags(),
385+
collision.alias());
385386
strangeStamps(bc.runNumber(), bc.timestamp());
386387
}
387388
for (const auto& v0 : V0Table_thisColl)

0 commit comments

Comments
 (0)