Skip to content

Commit eebd803

Browse files
dsekihatalibuild
dsekihat
and
alibuild
authored
[PWGEM/Dilepton] reduce data size in Event,Mult,Cent,Qvector (#15108)
Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
1 parent a9a2fa8 commit eebd803

Some content is hidden

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

63 files changed

+1612
-1513
lines changed

‎PWGEM/Dilepton/Core/Dilepton.h‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ using namespace o2::aod::pwgem::dilepton::utils;
7070
using namespace o2::aod::pwgem::dilepton::utils::emtrackutil;
7171
using namespace o2::aod::pwgem::dilepton::utils::pairutil;
7272

73-
using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent, aod::EMEventsQvec>;
73+
using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent, aod::EMEventsQvec2, aod::EMEventsQvec3>;
7474
using MyCollision = MyCollisions::iterator;
7575

7676
using MyElectrons = soa::Join<aod::EMPrimaryElectrons, aod::EMPrimaryElectronEMEventIds, aod::EMAmbiguousElectronSelfIds, aod::EMPrimaryElectronsPrefilterBit, aod::EMPrimaryElectronsPrefilterBitDerived>;
@@ -1604,28 +1604,28 @@ struct Dilepton {
16041604
fRegistry.fill(HIST("Event/norm/hZvtx"), collision.posZ());
16051605

16061606
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 1.0);
1607-
if (collision.selection_bit(o2::aod::evsel::kIsTriggerTVX)) {
1607+
if (collision.selection_bit(o2::aod::emevsel::kIsTriggerTVX)) {
16081608
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 2.0);
16091609
}
1610-
if (collision.selection_bit(o2::aod::evsel::kNoTimeFrameBorder)) {
1610+
if (collision.selection_bit(o2::aod::emevsel::kNoTimeFrameBorder)) {
16111611
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 3.0);
16121612
}
1613-
if (collision.selection_bit(o2::aod::evsel::kNoITSROFrameBorder)) {
1613+
if (collision.selection_bit(o2::aod::emevsel::kNoITSROFrameBorder)) {
16141614
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 4.0);
16151615
}
1616-
if (collision.selection_bit(o2::aod::evsel::kNoSameBunchPileup)) {
1616+
if (collision.selection_bit(o2::aod::emevsel::kNoSameBunchPileup)) {
16171617
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 5.0);
16181618
}
1619-
if (collision.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV)) {
1619+
if (collision.selection_bit(o2::aod::emevsel::kIsGoodZvtxFT0vsPV)) {
16201620
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 6.0);
16211621
}
1622-
if (collision.selection_bit(o2::aod::evsel::kIsVertexITSTPC)) {
1622+
if (collision.selection_bit(o2::aod::emevsel::kIsVertexITSTPC)) {
16231623
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 7.0);
16241624
}
1625-
if (collision.selection_bit(o2::aod::evsel::kIsVertexTRDmatched)) {
1625+
if (collision.selection_bit(o2::aod::emevsel::kIsVertexTRDmatched)) {
16261626
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 8.0);
16271627
}
1628-
if (collision.selection_bit(o2::aod::evsel::kIsVertexTOFmatched)) {
1628+
if (collision.selection_bit(o2::aod::emevsel::kIsVertexTOFmatched)) {
16291629
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 9.0);
16301630
}
16311631
if (collision.sel8()) {
@@ -1634,28 +1634,28 @@ struct Dilepton {
16341634
if (std::fabs(collision.posZ()) < 10.0) {
16351635
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 11.0);
16361636
}
1637-
if (collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard)) {
1637+
if (collision.selection_bit(o2::aod::emevsel::kNoCollInTimeRangeStandard)) {
16381638
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 12.0);
16391639
}
1640-
if (collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStrict)) {
1640+
if (collision.selection_bit(o2::aod::emevsel::kNoCollInTimeRangeStrict)) {
16411641
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 13.0);
16421642
}
1643-
if (collision.selection_bit(o2::aod::evsel::kNoCollInRofStandard)) {
1643+
if (collision.selection_bit(o2::aod::emevsel::kNoCollInRofStandard)) {
16441644
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 14.0);
16451645
}
1646-
if (collision.selection_bit(o2::aod::evsel::kNoCollInRofStrict)) {
1646+
if (collision.selection_bit(o2::aod::emevsel::kNoCollInRofStrict)) {
16471647
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 15.0);
16481648
}
1649-
if (collision.selection_bit(o2::aod::evsel::kNoHighMultCollInPrevRof)) {
1649+
if (collision.selection_bit(o2::aod::emevsel::kNoHighMultCollInPrevRof)) {
16501650
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 16.0);
16511651
}
1652-
if (collision.selection_bit(o2::aod::evsel::kIsGoodITSLayer3)) {
1652+
if (collision.selection_bit(o2::aod::emevsel::kIsGoodITSLayer3)) {
16531653
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 17.0);
16541654
}
1655-
if (collision.selection_bit(o2::aod::evsel::kIsGoodITSLayer0123)) {
1655+
if (collision.selection_bit(o2::aod::emevsel::kIsGoodITSLayer0123)) {
16561656
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 18.0);
16571657
}
1658-
if (collision.selection_bit(o2::aod::evsel::kIsGoodITSLayersAll)) {
1658+
if (collision.selection_bit(o2::aod::emevsel::kIsGoodITSLayersAll)) {
16591659
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 19.0);
16601660
}
16611661
if (!fEMEventCut.IsSelected(collision)) {
@@ -1672,22 +1672,22 @@ struct Dilepton {
16721672
void processBC(aod::EMBCs const& bcs)
16731673
{
16741674
for (const auto& bc : bcs) {
1675-
if (bc.selection_bit(o2::aod::evsel::kIsTriggerTVX)) {
1675+
if (bc.selection_bit(o2::aod::emevsel::kIsTriggerTVX)) {
16761676
fRegistry.fill(HIST("BC/hTVXCounter"), 0.f);
16771677

1678-
if (bc.selection_bit(o2::aod::evsel::kNoTimeFrameBorder)) {
1678+
if (bc.selection_bit(o2::aod::emevsel::kNoTimeFrameBorder)) {
16791679
fRegistry.fill(HIST("BC/hTVXCounter"), 1.f);
16801680
}
1681-
if (bc.selection_bit(o2::aod::evsel::kNoITSROFrameBorder)) {
1681+
if (bc.selection_bit(o2::aod::emevsel::kNoITSROFrameBorder)) {
16821682
fRegistry.fill(HIST("BC/hTVXCounter"), 2.f);
16831683
}
16841684
if (rctChecker(bc)) {
16851685
fRegistry.fill(HIST("BC/hTVXCounter"), 3.f);
16861686
}
1687-
if (bc.selection_bit(o2::aod::evsel::kNoTimeFrameBorder) && bc.selection_bit(o2::aod::evsel::kNoITSROFrameBorder)) {
1687+
if (bc.selection_bit(o2::aod::emevsel::kNoTimeFrameBorder) && bc.selection_bit(o2::aod::emevsel::kNoITSROFrameBorder)) {
16881688
fRegistry.fill(HIST("BC/hTVXCounter"), 4.f);
16891689
}
1690-
if (bc.selection_bit(o2::aod::evsel::kNoTimeFrameBorder) && bc.selection_bit(o2::aod::evsel::kNoITSROFrameBorder) && rctChecker(bc)) {
1690+
if (bc.selection_bit(o2::aod::emevsel::kNoTimeFrameBorder) && bc.selection_bit(o2::aod::emevsel::kNoITSROFrameBorder) && rctChecker(bc)) {
16911691
fRegistry.fill(HIST("BC/hTVXCounter"), 5.f);
16921692
}
16931693
}

‎PWGEM/Dilepton/Core/DileptonMC.h‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2640,28 +2640,28 @@ struct DileptonMC {
26402640
{
26412641
for (const auto& collision : collisions) {
26422642
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 1.0);
2643-
if (collision.selection_bit(o2::aod::evsel::kIsTriggerTVX)) {
2643+
if (collision.selection_bit(o2::aod::emevsel::kIsTriggerTVX)) {
26442644
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 2.0);
26452645
}
2646-
if (collision.selection_bit(o2::aod::evsel::kNoTimeFrameBorder)) {
2646+
if (collision.selection_bit(o2::aod::emevsel::kNoTimeFrameBorder)) {
26472647
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 3.0);
26482648
}
2649-
if (collision.selection_bit(o2::aod::evsel::kNoITSROFrameBorder)) {
2649+
if (collision.selection_bit(o2::aod::emevsel::kNoITSROFrameBorder)) {
26502650
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 4.0);
26512651
}
2652-
if (collision.selection_bit(o2::aod::evsel::kNoSameBunchPileup)) {
2652+
if (collision.selection_bit(o2::aod::emevsel::kNoSameBunchPileup)) {
26532653
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 5.0);
26542654
}
2655-
if (collision.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV)) {
2655+
if (collision.selection_bit(o2::aod::emevsel::kIsGoodZvtxFT0vsPV)) {
26562656
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 6.0);
26572657
}
2658-
if (collision.selection_bit(o2::aod::evsel::kIsVertexITSTPC)) {
2658+
if (collision.selection_bit(o2::aod::emevsel::kIsVertexITSTPC)) {
26592659
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 7.0);
26602660
}
2661-
if (collision.selection_bit(o2::aod::evsel::kIsVertexTRDmatched)) {
2661+
if (collision.selection_bit(o2::aod::emevsel::kIsVertexTRDmatched)) {
26622662
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 8.0);
26632663
}
2664-
if (collision.selection_bit(o2::aod::evsel::kIsVertexTOFmatched)) {
2664+
if (collision.selection_bit(o2::aod::emevsel::kIsVertexTOFmatched)) {
26652665
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 9.0);
26662666
}
26672667
if (collision.sel8()) {
@@ -2670,28 +2670,28 @@ struct DileptonMC {
26702670
if (std::fabs(collision.posZ()) < 10.0) {
26712671
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 11.0);
26722672
}
2673-
if (collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard)) {
2673+
if (collision.selection_bit(o2::aod::emevsel::kNoCollInTimeRangeStandard)) {
26742674
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 12.0);
26752675
}
2676-
if (collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStrict)) {
2676+
if (collision.selection_bit(o2::aod::emevsel::kNoCollInTimeRangeStrict)) {
26772677
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 13.0);
26782678
}
2679-
if (collision.selection_bit(o2::aod::evsel::kNoCollInRofStandard)) {
2679+
if (collision.selection_bit(o2::aod::emevsel::kNoCollInRofStandard)) {
26802680
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 14.0);
26812681
}
2682-
if (collision.selection_bit(o2::aod::evsel::kNoCollInRofStrict)) {
2682+
if (collision.selection_bit(o2::aod::emevsel::kNoCollInRofStrict)) {
26832683
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 15.0);
26842684
}
2685-
if (collision.selection_bit(o2::aod::evsel::kNoHighMultCollInPrevRof)) {
2685+
if (collision.selection_bit(o2::aod::emevsel::kNoHighMultCollInPrevRof)) {
26862686
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 16.0);
26872687
}
2688-
if (collision.selection_bit(o2::aod::evsel::kIsGoodITSLayer3)) {
2688+
if (collision.selection_bit(o2::aod::emevsel::kIsGoodITSLayer3)) {
26892689
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 17.0);
26902690
}
2691-
if (collision.selection_bit(o2::aod::evsel::kIsGoodITSLayer0123)) {
2691+
if (collision.selection_bit(o2::aod::emevsel::kIsGoodITSLayer0123)) {
26922692
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 18.0);
26932693
}
2694-
if (collision.selection_bit(o2::aod::evsel::kIsGoodITSLayersAll)) {
2694+
if (collision.selection_bit(o2::aod::emevsel::kIsGoodITSLayersAll)) {
26952695
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 19.0);
26962696
}
26972697
if (!fEMEventCut.IsSelected(collision)) {
@@ -2708,22 +2708,22 @@ struct DileptonMC {
27082708
void processBC(aod::EMBCs const& bcs)
27092709
{
27102710
for (const auto& bc : bcs) {
2711-
if (bc.selection_bit(o2::aod::evsel::kIsTriggerTVX)) {
2711+
if (bc.selection_bit(o2::aod::emevsel::kIsTriggerTVX)) {
27122712
fRegistry.fill(HIST("BC/hTVXCounter"), 0.f);
27132713

2714-
if (bc.selection_bit(o2::aod::evsel::kNoTimeFrameBorder)) {
2714+
if (bc.selection_bit(o2::aod::emevsel::kNoTimeFrameBorder)) {
27152715
fRegistry.fill(HIST("BC/hTVXCounter"), 1.f);
27162716
}
2717-
if (bc.selection_bit(o2::aod::evsel::kNoITSROFrameBorder)) {
2717+
if (bc.selection_bit(o2::aod::emevsel::kNoITSROFrameBorder)) {
27182718
fRegistry.fill(HIST("BC/hTVXCounter"), 2.f);
27192719
}
27202720
if (rctChecker(bc)) {
27212721
fRegistry.fill(HIST("BC/hTVXCounter"), 3.f);
27222722
}
2723-
if (bc.selection_bit(o2::aod::evsel::kNoTimeFrameBorder) && bc.selection_bit(o2::aod::evsel::kNoITSROFrameBorder)) {
2723+
if (bc.selection_bit(o2::aod::emevsel::kNoTimeFrameBorder) && bc.selection_bit(o2::aod::emevsel::kNoITSROFrameBorder)) {
27242724
fRegistry.fill(HIST("BC/hTVXCounter"), 4.f);
27252725
}
2726-
if (bc.selection_bit(o2::aod::evsel::kNoTimeFrameBorder) && bc.selection_bit(o2::aod::evsel::kNoITSROFrameBorder) && rctChecker(bc)) {
2726+
if (bc.selection_bit(o2::aod::emevsel::kNoTimeFrameBorder) && bc.selection_bit(o2::aod::emevsel::kNoITSROFrameBorder) && rctChecker(bc)) {
27272727
fRegistry.fill(HIST("BC/hTVXCounter"), 5.f);
27282728
}
27292729
}

‎PWGEM/Dilepton/Core/DileptonProducer.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ using namespace o2::aod::pwgem::dilepton::utils;
6969
using namespace o2::aod::pwgem::dilepton::utils::emtrackutil;
7070
using namespace o2::aod::pwgem::dilepton::utils::pairutil;
7171

72-
using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent, aod::EMEventsQvec>;
72+
using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent, aod::EMEventsQvec2, aod::EMEventsQvec3>;
7373
using MyCollision = MyCollisions::iterator;
7474

7575
using MyElectrons = soa::Join<aod::EMPrimaryElectrons, aod::EMPrimaryElectronEMEventIds, aod::EMAmbiguousElectronSelfIds, aod::EMPrimaryElectronsPrefilterBit, aod::EMPrimaryElectronsPrefilterBitDerived>;
@@ -774,7 +774,7 @@ struct DileptonProducer {
774774
continue;
775775
}
776776

777-
normTable(collision.selection_raw(), collision.rct_raw(), collision.posZint16(), collision.centFT0Cuint16());
777+
normTable(collision.selection_raw(), collision.rct_raw(), collision.posZint8(), collision.centFT0Muint8(), collision.centFT0Cuint8(), collision.centNTPVuint8() /*, collision.centNGlobaluint8()*/);
778778

779779
} // end of collision loop
780780
}

‎PWGEM/Dilepton/Core/EMEventCut.h‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#ifndef PWGEM_DILEPTON_CORE_EMEVENTCUT_H_
1717
#define PWGEM_DILEPTON_CORE_EMEVENTCUT_H_
1818

19+
#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
20+
1921
#include "Common/CCDB/EventSelectionParams.h"
2022
#include "Common/CCDB/TriggerAliases.h"
2123

@@ -116,52 +118,52 @@ class EMEventCut : public TNamed
116118
return collision.sel8();
117119

118120
case EMEventCuts::kFT0AND:
119-
return collision.selection_bit(o2::aod::evsel::kIsTriggerTVX);
121+
return collision.selection_bit(o2::aod::emevsel::kIsTriggerTVX);
120122

121123
case EMEventCuts::kZvtx:
122124
return mMinZvtx < collision.posZ() && collision.posZ() < mMaxZvtx;
123125

124126
case EMEventCuts::kNoTFB:
125-
return collision.selection_bit(o2::aod::evsel::kNoTimeFrameBorder);
127+
return collision.selection_bit(o2::aod::emevsel::kNoTimeFrameBorder);
126128

127129
case EMEventCuts::kNoITSROFB:
128-
return collision.selection_bit(o2::aod::evsel::kNoITSROFrameBorder);
130+
return collision.selection_bit(o2::aod::emevsel::kNoITSROFrameBorder);
129131

130132
case EMEventCuts::kNoSameBunchPileup:
131-
return collision.selection_bit(o2::aod::evsel::kNoSameBunchPileup);
133+
return collision.selection_bit(o2::aod::emevsel::kNoSameBunchPileup);
132134

133135
case EMEventCuts::kIsVertexITSTPC:
134-
return collision.selection_bit(o2::aod::evsel::kIsVertexITSTPC);
136+
return collision.selection_bit(o2::aod::emevsel::kIsVertexITSTPC);
135137

136138
case EMEventCuts::kIsVertexTOFmatched:
137-
return collision.selection_bit(o2::aod::evsel::kIsVertexTOFmatched);
139+
return collision.selection_bit(o2::aod::emevsel::kIsVertexTOFmatched);
138140

139141
case EMEventCuts::kIsGoodZvtxFT0vsPV:
140-
return collision.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV);
142+
return collision.selection_bit(o2::aod::emevsel::kIsGoodZvtxFT0vsPV);
141143

142144
case EMEventCuts::kNoCollInTimeRangeStandard:
143-
return collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard);
145+
return collision.selection_bit(o2::aod::emevsel::kNoCollInTimeRangeStandard);
144146

145147
case EMEventCuts::kNoCollInTimeRangeStrict:
146-
return collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStrict);
148+
return collision.selection_bit(o2::aod::emevsel::kNoCollInTimeRangeStrict);
147149

148150
case EMEventCuts::kNoCollInITSROFStandard:
149-
return collision.selection_bit(o2::aod::evsel::kNoCollInRofStandard);
151+
return collision.selection_bit(o2::aod::emevsel::kNoCollInRofStandard);
150152

151153
case EMEventCuts::kNoCollInITSROFStrict:
152-
return collision.selection_bit(o2::aod::evsel::kNoCollInRofStrict);
154+
return collision.selection_bit(o2::aod::emevsel::kNoCollInRofStrict);
153155

154156
case EMEventCuts::kNoHighMultCollInPrevRof:
155-
return collision.selection_bit(o2::aod::evsel::kNoHighMultCollInPrevRof);
157+
return collision.selection_bit(o2::aod::emevsel::kNoHighMultCollInPrevRof);
156158

157159
case EMEventCuts::kIsGoodITSLayer3:
158-
return collision.selection_bit(o2::aod::evsel::kIsGoodITSLayer3);
160+
return collision.selection_bit(o2::aod::emevsel::kIsGoodITSLayer3);
159161

160162
case EMEventCuts::kIsGoodITSLayer0123:
161-
return collision.selection_bit(o2::aod::evsel::kIsGoodITSLayer0123);
163+
return collision.selection_bit(o2::aod::emevsel::kIsGoodITSLayer0123);
162164

163165
case EMEventCuts::kIsGoodITSLayersAll:
164-
return collision.selection_bit(o2::aod::evsel::kIsGoodITSLayersAll);
166+
return collision.selection_bit(o2::aod::emevsel::kIsGoodITSLayersAll);
165167

166168
default:
167169
return true;

0 commit comments

Comments
 (0)