Skip to content

Commit f69950b

Browse files
nzardoshnzardosh
authored
PWGJE: Adding tasks for luminosity calculation in the JE framework (#7437)
* PWGJE: Adding tasks for luminosity calculation in the JE framework * fixing which element is needed * fixing zvertex position check * adding vtxz to histogram labels
1 parent bb5d50f commit f69950b

10 files changed

Lines changed: 391 additions & 435 deletions

‎PWGJE/DataModel/JetReducedData.h‎

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ DECLARE_SOA_BITMAP_COLUMN(Alias, alias, 32);
3636
DECLARE_SOA_BITMAP_COLUMN(Selection, selection, 64);
3737
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
3838
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
39-
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndITSROFBAndNoTFB, readCountsWithTVXAndITSROFBAndNoTFB, std::vector<int>);
39+
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndNoTFB, readCountsWithTVXAndNoTFB, std::vector<int>);
40+
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndNoTFBAndNoITSROFB, readCountsWithTVXAndNoTFBAndNoITSROFB, std::vector<int>);
4041
} // namespace jbc
4142

4243
DECLARE_SOA_TABLE(JBCs, "AOD", "JBC",
@@ -70,12 +71,14 @@ DECLARE_SOA_TABLE(StoredJBCPIs, "AOD1", "JBCPI",
7071
DECLARE_SOA_TABLE(BCCounts, "AOD", "BCCOUNT",
7172
jbc::ReadCounts,
7273
jbc::ReadCountsWithTVX,
73-
jbc::ReadCountsWithTVXAndITSROFBAndNoTFB);
74+
jbc::ReadCountsWithTVXAndNoTFB,
75+
jbc::ReadCountsWithTVXAndNoTFBAndNoITSROFB);
7476

7577
DECLARE_SOA_TABLE(StoredBCCounts, "AOD1", "BCCOUNT",
7678
jbc::ReadCounts,
7779
jbc::ReadCountsWithTVX,
78-
jbc::ReadCountsWithTVXAndITSROFBAndNoTFB,
80+
jbc::ReadCountsWithTVXAndNoTFB,
81+
jbc::ReadCountsWithTVXAndNoTFBAndNoITSROFB,
7982
o2::soa::Marker<1>);
8083

8184
namespace jcollision
@@ -96,9 +99,16 @@ DECLARE_SOA_COLUMN(FullTriggerSel, fullTriggerSel, uint32_t);
9699
DECLARE_SOA_COLUMN(ChargedHFTriggerSel, chargedHFTriggerSel, uint8_t);
97100
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
98101
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
99-
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelection, readCountsWithTVXAndSelection, std::vector<int>);
100-
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelectionAndZVertex, readCountsWithTVXAndSelectionAndZVertex, std::vector<int>);
101-
DECLARE_SOA_COLUMN(WrittenCounts, writtenCounts, std::vector<int>);
102+
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel8, readCountsWithTVXAndZVertexAndSel8, std::vector<int>);
103+
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel8Full, readCountsWithTVXAndZVertexAndSel8Full, std::vector<int>);
104+
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel8FullPbPb, readCountsWithTVXAndZVertexAndSel8FullPbPb, std::vector<int>);
105+
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSelMC, readCountsWithTVXAndZVertexAndSelMC, std::vector<int>);
106+
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSelMCFull, readCountsWithTVXAndZVertexAndSelMCFull, std::vector<int>);
107+
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSelMCFullPbPb, readCountsWithTVXAndZVertexAndSelMCFullPbPb, std::vector<int>);
108+
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSelUnanchoredMC, readCountsWithTVXAndZVertexAndSelUnanchoredMC, std::vector<int>);
109+
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSelTVX, readCountsWithTVXAndZVertexAndSelTVX, std::vector<int>);
110+
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel7, readCountsWithTVXAndZVertexAndSel7, std::vector<int>);
111+
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel7KINT7, readCountsWithTVXAndZVertexAndSel7KINT7, std::vector<int>);
102112
DECLARE_SOA_COLUMN(IsAmbiguous, isAmbiguous, bool);
103113
DECLARE_SOA_COLUMN(IsEMCALReadout, isEmcalReadout, bool);
104114
} // namespace jcollision
@@ -169,16 +179,30 @@ DECLARE_SOA_TABLE(JChHFTrigSels, "AOD", "JCHHFTRIGSEL",
169179
DECLARE_SOA_TABLE(CollisionCounts, "AOD", "COLLCOUNT",
170180
jcollision::ReadCounts,
171181
jcollision::ReadCountsWithTVX,
172-
jcollision::ReadCountsWithTVXAndSelection,
173-
jcollision::ReadCountsWithTVXAndSelectionAndZVertex,
174-
jcollision::WrittenCounts);
182+
jcollision::ReadCountsWithTVXAndZVertexAndSel8,
183+
jcollision::ReadCountsWithTVXAndZVertexAndSel8Full,
184+
jcollision::ReadCountsWithTVXAndZVertexAndSel8FullPbPb,
185+
jcollision::ReadCountsWithTVXAndZVertexAndSelMC,
186+
jcollision::ReadCountsWithTVXAndZVertexAndSelMCFull,
187+
jcollision::ReadCountsWithTVXAndZVertexAndSelMCFullPbPb,
188+
jcollision::ReadCountsWithTVXAndZVertexAndSelUnanchoredMC,
189+
jcollision::ReadCountsWithTVXAndZVertexAndSelTVX,
190+
jcollision::ReadCountsWithTVXAndZVertexAndSel7,
191+
jcollision::ReadCountsWithTVXAndZVertexAndSel7KINT7);
175192

176193
DECLARE_SOA_TABLE(StoredCollisionCounts, "AOD1", "COLLCOUNT",
177194
jcollision::ReadCounts,
178195
jcollision::ReadCountsWithTVX,
179-
jcollision::ReadCountsWithTVXAndSelection,
180-
jcollision::ReadCountsWithTVXAndSelectionAndZVertex,
181-
jcollision::WrittenCounts,
196+
jcollision::ReadCountsWithTVXAndZVertexAndSel8,
197+
jcollision::ReadCountsWithTVXAndZVertexAndSel8Full,
198+
jcollision::ReadCountsWithTVXAndZVertexAndSel8FullPbPb,
199+
jcollision::ReadCountsWithTVXAndZVertexAndSelMC,
200+
jcollision::ReadCountsWithTVXAndZVertexAndSelMCFull,
201+
jcollision::ReadCountsWithTVXAndZVertexAndSelMCFullPbPb,
202+
jcollision::ReadCountsWithTVXAndZVertexAndSelUnanchoredMC,
203+
jcollision::ReadCountsWithTVXAndZVertexAndSelTVX,
204+
jcollision::ReadCountsWithTVXAndZVertexAndSel7,
205+
jcollision::ReadCountsWithTVXAndZVertexAndSel7KINT7,
182206
o2::soa::Marker<1>);
183207

184208
namespace jmccollision

‎PWGJE/DataModel/JetReducedDataDQ.h‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,6 @@ DECLARE_SOA_INDEX_COLUMN(JMcCollision, mcCollision);
5252
DECLARE_SOA_INDEX_COLUMN(JMcParticle, mcParticle);
5353
} // namespace jdielectronindices
5454

55-
namespace dielectronbccounter
56-
{
57-
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
58-
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
59-
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndITSROFBAndNoTFB, readCountsWithTVXAndITSROFBAndNoTFB, std::vector<int>);
60-
} // namespace dielectronbccounter
61-
62-
namespace dielectroncollisioncounter
63-
{
64-
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
65-
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
66-
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelection, readCountsWithTVXAndSelection, std::vector<int>);
67-
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelectionAndZVertex, readCountsWithTVXAndSelectionAndZVertex, std::vector<int>);
68-
DECLARE_SOA_COLUMN(WrittenCounts, writtenCounts, std::vector<int>);
69-
} // namespace dielectroncollisioncounter
70-
7155
DECLARE_SOA_TABLE(JDielectronCollisionIds, "AOD", "JDIELCOLLID",
7256
jdielectronindices::JCollisionId);
7357

@@ -93,18 +77,6 @@ DECLARE_SOA_TABLE(StoredJDielectronIds, "AOD1", "JDIELID",
9377
jdielectronindices::Prong1Id,
9478
o2::soa::Marker<1>);
9579

96-
DECLARE_SOA_TABLE(DielectronBCCounts, "AOD", "DIELBCCOUNT",
97-
dielectronbccounter::ReadCounts,
98-
dielectronbccounter::ReadCountsWithTVX,
99-
dielectronbccounter::ReadCountsWithTVXAndITSROFBAndNoTFB);
100-
101-
DECLARE_SOA_TABLE(DielectronCollisionCounts, "AOD", "DIELCOLLCOUNT",
102-
dielectroncollisioncounter::ReadCounts,
103-
dielectroncollisioncounter::ReadCountsWithTVX,
104-
dielectroncollisioncounter::ReadCountsWithTVXAndSelection,
105-
dielectroncollisioncounter::ReadCountsWithTVXAndSelectionAndZVertex,
106-
dielectroncollisioncounter::WrittenCounts);
107-
10880
namespace jdielectronmc
10981
{
11082
DECLARE_SOA_COLUMN(Pt, pt, float);

‎PWGJE/DataModel/JetReducedDataHF.h‎

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,6 @@ DECLARE_SOA_INDEX_COLUMN(JMcCollision, mcCollision);
3535
DECLARE_SOA_INDEX_COLUMN(JMcParticle, mcParticle);
3636
} // namespace jd0indices
3737

38-
namespace d0bccounter
39-
{
40-
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
41-
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
42-
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndITSROFBAndNoTFB, readCountsWithTVXAndITSROFBAndNoTFB, std::vector<int>);
43-
} // namespace d0bccounter
44-
45-
namespace d0collisioncounter
46-
{
47-
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
48-
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
49-
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelection, readCountsWithTVXAndSelection, std::vector<int>);
50-
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelectionAndZVertex, readCountsWithTVXAndSelectionAndZVertex, std::vector<int>);
51-
DECLARE_SOA_COLUMN(WrittenCounts, writtenCounts, std::vector<int>);
52-
} // namespace d0collisioncounter
53-
5438
DECLARE_SOA_TABLE(JD0CollisionIds, "AOD", "JD0COLLID",
5539
jd0indices::JCollisionId);
5640

@@ -85,18 +69,6 @@ DECLARE_SOA_TABLE(StoredJD0PIds, "AOD1", "JD0PID",
8569
jd0indices::JMcParticleId,
8670
o2::soa::Marker<1>);
8771

88-
DECLARE_SOA_TABLE(D0BCCounts, "AOD", "D0BCCOUNT",
89-
d0bccounter::ReadCounts,
90-
d0bccounter::ReadCountsWithTVX,
91-
d0bccounter::ReadCountsWithTVXAndITSROFBAndNoTFB);
92-
93-
DECLARE_SOA_TABLE(D0CollisionCounts, "AOD", "D0COLLCOUNT",
94-
d0collisioncounter::ReadCounts,
95-
d0collisioncounter::ReadCountsWithTVX,
96-
d0collisioncounter::ReadCountsWithTVXAndSelection,
97-
d0collisioncounter::ReadCountsWithTVXAndSelectionAndZVertex,
98-
d0collisioncounter::WrittenCounts);
99-
10072
namespace jlcindices
10173
{
10274
DECLARE_SOA_INDEX_COLUMN(JCollision, collision);
@@ -107,22 +79,6 @@ DECLARE_SOA_INDEX_COLUMN(JMcCollision, mcCollision);
10779
DECLARE_SOA_INDEX_COLUMN(JMcParticle, mcParticle);
10880
} // namespace jlcindices
10981

110-
namespace lcbccounter
111-
{
112-
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
113-
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
114-
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndITSROFBAndNoTFB, readCountsWithTVXAndITSROFBAndNoTFB, std::vector<int>);
115-
} // namespace lcbccounter
116-
117-
namespace lccollisioncounter
118-
{
119-
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
120-
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
121-
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelection, readCountsWithTVXAndSelection, std::vector<int>);
122-
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelectionAndZVertex, readCountsWithTVXAndSelectionAndZVertex, std::vector<int>);
123-
DECLARE_SOA_COLUMN(WrittenCounts, writtenCounts, std::vector<int>);
124-
} // namespace lccollisioncounter
125-
12682
DECLARE_SOA_TABLE(JLcCollisionIds, "AOD", "JLCCOLLID",
12783
jlcindices::JCollisionId);
12884

@@ -159,18 +115,6 @@ DECLARE_SOA_TABLE(StoredJLcPIds, "AOD1", "JLCPID",
159115
jlcindices::JMcParticleId,
160116
o2::soa::Marker<1>);
161117

162-
DECLARE_SOA_TABLE(LcBCCounts, "AOD", "LCBCCOUNT",
163-
lcbccounter::ReadCounts,
164-
lcbccounter::ReadCountsWithTVX,
165-
lcbccounter::ReadCountsWithTVXAndITSROFBAndNoTFB);
166-
167-
DECLARE_SOA_TABLE(LcCollisionCounts, "AOD", "LCCOLLCOUNT",
168-
lccollisioncounter::ReadCounts,
169-
lccollisioncounter::ReadCountsWithTVX,
170-
lccollisioncounter::ReadCountsWithTVXAndSelection,
171-
lccollisioncounter::ReadCountsWithTVXAndSelectionAndZVertex,
172-
lccollisioncounter::WrittenCounts);
173-
174118
} // namespace o2::aod
175119

176120
#endif // PWGJE_DATAMODEL_JETREDUCEDDATAHF_H_

‎PWGJE/DataModel/JetReducedDataV0.h‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,6 @@ DECLARE_SOA_INDEX_COLUMN(JMcCollision, mcCollision);
5252
DECLARE_SOA_INDEX_COLUMN(JMcParticle, mcParticle);
5353
} // namespace jv0indices
5454

55-
namespace v0bccounter
56-
{
57-
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
58-
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
59-
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndITSROFBAndNoTFB, readCountsWithTVXAndITSROFBAndNoTFB, std::vector<int>);
60-
} // namespace v0bccounter
61-
62-
namespace v0collisioncounter
63-
{
64-
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
65-
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
66-
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelection, readCountsWithTVXAndSelection, std::vector<int>);
67-
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelectionAndZVertex, readCountsWithTVXAndSelectionAndZVertex, std::vector<int>);
68-
DECLARE_SOA_COLUMN(WrittenCounts, writtenCounts, std::vector<int>);
69-
} // namespace v0collisioncounter
70-
7155
DECLARE_SOA_TABLE(JV0CollisionIds, "AOD", "JV0COLLID",
7256
jv0indices::JCollisionId);
7357

@@ -87,18 +71,6 @@ DECLARE_SOA_TABLE(JV0Ids, "AOD", "JV0ID",
8771
jv0indices::PosTrackId,
8872
jv0indices::NegTrackId);
8973

90-
DECLARE_SOA_TABLE(V0BCCounts, "AOD", "V0BCCOUNT",
91-
v0bccounter::ReadCounts,
92-
v0bccounter::ReadCountsWithTVX,
93-
v0bccounter::ReadCountsWithTVXAndITSROFBAndNoTFB);
94-
95-
DECLARE_SOA_TABLE(V0CollisionCounts, "AOD", "V0COLLCOUNT",
96-
v0collisioncounter::ReadCounts,
97-
v0collisioncounter::ReadCountsWithTVX,
98-
v0collisioncounter::ReadCountsWithTVXAndSelection,
99-
v0collisioncounter::ReadCountsWithTVXAndSelectionAndZVertex,
100-
v0collisioncounter::WrittenCounts);
101-
10274
namespace jv0mc
10375
{
10476
DECLARE_SOA_COLUMN(Pt, pt, float);

‎PWGJE/TableProducer/CMakeLists.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,16 @@ o2physics_add_dpl_workflow(jet-deriveddata-writer
4747
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
4848
COMPONENT_NAME Analysis)
4949

50+
o2physics_add_dpl_workflow(jet-luminosity-producer
51+
SOURCES luminosityproducer.cxx
52+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
53+
COMPONENT_NAME Analysis)
54+
55+
o2physics_add_dpl_workflow(jet-luminosity-calculator
56+
SOURCES luminositycalculator.cxx
57+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
58+
COMPONENT_NAME Analysis)
59+
5060
o2physics_add_dpl_workflow(jet-matching-mc
5161
SOURCES jetmatchingmc.cxx
5262
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore

0 commit comments

Comments
 (0)