Skip to content

[PWGEM/Dilepton] reduce data size in Event,Mult,Cent,Qvector #15108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dsekihat wants to merge 10 commits into
base: master
Choose a base branch
from
+1,612 −1,513
Open

[PWGEM/Dilepton] reduce data size in Event,Mult,Cent,Qvector #15108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d8e39a5
PWGEM/Dilepton: reduce data size in Event,Mult,Cent,Qvecot
dsekihat Feb 22, 2026
a329d98
Please consider the following formatting changes
alibuild Feb 22, 2026
42ec3f0
Merge branch 'master' into separate
dsekihat Feb 22, 2026
55cfda2
Merge pull request #79 from alibuild/alibot-cleanup-15108
dsekihat Feb 22, 2026
66804a8
Fix function signature in skimmingMC
dsekihat Feb 22, 2026
d0b2e28
Disable processChargedTrack function and switch
dsekihat Feb 22, 2026
4e2f295
Fix selection bitmask references in Sel8 column
dsekihat Feb 22, 2026
4e20dd7
Add multiple selection criteria to IsSelected function
dsekihat Feb 23, 2026
a319b01
Please consider the following formatting changes
alibuild Feb 23, 2026
a6fa6b0
Merge pull request #81 from alibuild/alibot-cleanup-15108
dsekihat Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions PWGEM/Dilepton/Core/Dilepton.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ using namespace o2::aod::pwgem::dilepton::utils;
using namespace o2::aod::pwgem::dilepton::utils::emtrackutil;
using namespace o2::aod::pwgem::dilepton::utils::pairutil;

using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent, aod::EMEventsQvec>;
using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent, aod::EMEventsQvec2, aod::EMEventsQvec3>;
using MyCollision = MyCollisions::iterator;

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

fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 1.0);
if (collision.selection_bit(o2::aod::evsel::kIsTriggerTVX)) {
if (collision.selection_bit(o2::aod::emevsel::kIsTriggerTVX)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 2.0);
}
if (collision.selection_bit(o2::aod::evsel::kNoTimeFrameBorder)) {
if (collision.selection_bit(o2::aod::emevsel::kNoTimeFrameBorder)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 3.0);
}
if (collision.selection_bit(o2::aod::evsel::kNoITSROFrameBorder)) {
if (collision.selection_bit(o2::aod::emevsel::kNoITSROFrameBorder)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 4.0);
}
if (collision.selection_bit(o2::aod::evsel::kNoSameBunchPileup)) {
if (collision.selection_bit(o2::aod::emevsel::kNoSameBunchPileup)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 5.0);
}
if (collision.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV)) {
if (collision.selection_bit(o2::aod::emevsel::kIsGoodZvtxFT0vsPV)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 6.0);
}
if (collision.selection_bit(o2::aod::evsel::kIsVertexITSTPC)) {
if (collision.selection_bit(o2::aod::emevsel::kIsVertexITSTPC)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 7.0);
}
if (collision.selection_bit(o2::aod::evsel::kIsVertexTRDmatched)) {
if (collision.selection_bit(o2::aod::emevsel::kIsVertexTRDmatched)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 8.0);
}
if (collision.selection_bit(o2::aod::evsel::kIsVertexTOFmatched)) {
if (collision.selection_bit(o2::aod::emevsel::kIsVertexTOFmatched)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 9.0);
}
if (collision.sel8()) {
Expand All @@ -1634,28 +1634,28 @@ struct Dilepton {
if (std::fabs(collision.posZ()) < 10.0) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 11.0);
}
if (collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard)) {
if (collision.selection_bit(o2::aod::emevsel::kNoCollInTimeRangeStandard)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 12.0);
}
if (collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStrict)) {
if (collision.selection_bit(o2::aod::emevsel::kNoCollInTimeRangeStrict)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 13.0);
}
if (collision.selection_bit(o2::aod::evsel::kNoCollInRofStandard)) {
if (collision.selection_bit(o2::aod::emevsel::kNoCollInRofStandard)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 14.0);
}
if (collision.selection_bit(o2::aod::evsel::kNoCollInRofStrict)) {
if (collision.selection_bit(o2::aod::emevsel::kNoCollInRofStrict)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 15.0);
}
if (collision.selection_bit(o2::aod::evsel::kNoHighMultCollInPrevRof)) {
if (collision.selection_bit(o2::aod::emevsel::kNoHighMultCollInPrevRof)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 16.0);
}
if (collision.selection_bit(o2::aod::evsel::kIsGoodITSLayer3)) {
if (collision.selection_bit(o2::aod::emevsel::kIsGoodITSLayer3)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 17.0);
}
if (collision.selection_bit(o2::aod::evsel::kIsGoodITSLayer0123)) {
if (collision.selection_bit(o2::aod::emevsel::kIsGoodITSLayer0123)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 18.0);
}
if (collision.selection_bit(o2::aod::evsel::kIsGoodITSLayersAll)) {
if (collision.selection_bit(o2::aod::emevsel::kIsGoodITSLayersAll)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 19.0);
}
if (!fEMEventCut.IsSelected(collision)) {
Expand All @@ -1672,22 +1672,22 @@ struct Dilepton {
void processBC(aod::EMBCs const& bcs)
{
for (const auto& bc : bcs) {
if (bc.selection_bit(o2::aod::evsel::kIsTriggerTVX)) {
if (bc.selection_bit(o2::aod::emevsel::kIsTriggerTVX)) {
fRegistry.fill(HIST("BC/hTVXCounter"), 0.f);

if (bc.selection_bit(o2::aod::evsel::kNoTimeFrameBorder)) {
if (bc.selection_bit(o2::aod::emevsel::kNoTimeFrameBorder)) {
fRegistry.fill(HIST("BC/hTVXCounter"), 1.f);
}
if (bc.selection_bit(o2::aod::evsel::kNoITSROFrameBorder)) {
if (bc.selection_bit(o2::aod::emevsel::kNoITSROFrameBorder)) {
fRegistry.fill(HIST("BC/hTVXCounter"), 2.f);
}
if (rctChecker(bc)) {
fRegistry.fill(HIST("BC/hTVXCounter"), 3.f);
}
if (bc.selection_bit(o2::aod::evsel::kNoTimeFrameBorder) && bc.selection_bit(o2::aod::evsel::kNoITSROFrameBorder)) {
if (bc.selection_bit(o2::aod::emevsel::kNoTimeFrameBorder) && bc.selection_bit(o2::aod::emevsel::kNoITSROFrameBorder)) {
fRegistry.fill(HIST("BC/hTVXCounter"), 4.f);
}
if (bc.selection_bit(o2::aod::evsel::kNoTimeFrameBorder) && bc.selection_bit(o2::aod::evsel::kNoITSROFrameBorder) && rctChecker(bc)) {
if (bc.selection_bit(o2::aod::emevsel::kNoTimeFrameBorder) && bc.selection_bit(o2::aod::emevsel::kNoITSROFrameBorder) && rctChecker(bc)) {
fRegistry.fill(HIST("BC/hTVXCounter"), 5.f);
}
}
Expand Down
42 changes: 21 additions & 21 deletions PWGEM/Dilepton/Core/DileptonMC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2640,28 +2640,28 @@ struct DileptonMC {
{
for (const auto& collision : collisions) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 1.0);
if (collision.selection_bit(o2::aod::evsel::kIsTriggerTVX)) {
if (collision.selection_bit(o2::aod::emevsel::kIsTriggerTVX)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 2.0);
}
if (collision.selection_bit(o2::aod::evsel::kNoTimeFrameBorder)) {
if (collision.selection_bit(o2::aod::emevsel::kNoTimeFrameBorder)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 3.0);
}
if (collision.selection_bit(o2::aod::evsel::kNoITSROFrameBorder)) {
if (collision.selection_bit(o2::aod::emevsel::kNoITSROFrameBorder)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 4.0);
}
if (collision.selection_bit(o2::aod::evsel::kNoSameBunchPileup)) {
if (collision.selection_bit(o2::aod::emevsel::kNoSameBunchPileup)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 5.0);
}
if (collision.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV)) {
if (collision.selection_bit(o2::aod::emevsel::kIsGoodZvtxFT0vsPV)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 6.0);
}
if (collision.selection_bit(o2::aod::evsel::kIsVertexITSTPC)) {
if (collision.selection_bit(o2::aod::emevsel::kIsVertexITSTPC)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 7.0);
}
if (collision.selection_bit(o2::aod::evsel::kIsVertexTRDmatched)) {
if (collision.selection_bit(o2::aod::emevsel::kIsVertexTRDmatched)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 8.0);
}
if (collision.selection_bit(o2::aod::evsel::kIsVertexTOFmatched)) {
if (collision.selection_bit(o2::aod::emevsel::kIsVertexTOFmatched)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 9.0);
}
if (collision.sel8()) {
Expand All @@ -2670,28 +2670,28 @@ struct DileptonMC {
if (std::fabs(collision.posZ()) < 10.0) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 11.0);
}
if (collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard)) {
if (collision.selection_bit(o2::aod::emevsel::kNoCollInTimeRangeStandard)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 12.0);
}
if (collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStrict)) {
if (collision.selection_bit(o2::aod::emevsel::kNoCollInTimeRangeStrict)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 13.0);
}
if (collision.selection_bit(o2::aod::evsel::kNoCollInRofStandard)) {
if (collision.selection_bit(o2::aod::emevsel::kNoCollInRofStandard)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 14.0);
}
if (collision.selection_bit(o2::aod::evsel::kNoCollInRofStrict)) {
if (collision.selection_bit(o2::aod::emevsel::kNoCollInRofStrict)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 15.0);
}
if (collision.selection_bit(o2::aod::evsel::kNoHighMultCollInPrevRof)) {
if (collision.selection_bit(o2::aod::emevsel::kNoHighMultCollInPrevRof)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 16.0);
}
if (collision.selection_bit(o2::aod::evsel::kIsGoodITSLayer3)) {
if (collision.selection_bit(o2::aod::emevsel::kIsGoodITSLayer3)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 17.0);
}
if (collision.selection_bit(o2::aod::evsel::kIsGoodITSLayer0123)) {
if (collision.selection_bit(o2::aod::emevsel::kIsGoodITSLayer0123)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 18.0);
}
if (collision.selection_bit(o2::aod::evsel::kIsGoodITSLayersAll)) {
if (collision.selection_bit(o2::aod::emevsel::kIsGoodITSLayersAll)) {
fRegistry.fill(HIST("Event/norm/hCollisionCounter"), 19.0);
}
if (!fEMEventCut.IsSelected(collision)) {
Expand All @@ -2708,22 +2708,22 @@ struct DileptonMC {
void processBC(aod::EMBCs const& bcs)
{
for (const auto& bc : bcs) {
if (bc.selection_bit(o2::aod::evsel::kIsTriggerTVX)) {
if (bc.selection_bit(o2::aod::emevsel::kIsTriggerTVX)) {
fRegistry.fill(HIST("BC/hTVXCounter"), 0.f);

if (bc.selection_bit(o2::aod::evsel::kNoTimeFrameBorder)) {
if (bc.selection_bit(o2::aod::emevsel::kNoTimeFrameBorder)) {
fRegistry.fill(HIST("BC/hTVXCounter"), 1.f);
}
if (bc.selection_bit(o2::aod::evsel::kNoITSROFrameBorder)) {
if (bc.selection_bit(o2::aod::emevsel::kNoITSROFrameBorder)) {
fRegistry.fill(HIST("BC/hTVXCounter"), 2.f);
}
if (rctChecker(bc)) {
fRegistry.fill(HIST("BC/hTVXCounter"), 3.f);
}
if (bc.selection_bit(o2::aod::evsel::kNoTimeFrameBorder) && bc.selection_bit(o2::aod::evsel::kNoITSROFrameBorder)) {
if (bc.selection_bit(o2::aod::emevsel::kNoTimeFrameBorder) && bc.selection_bit(o2::aod::emevsel::kNoITSROFrameBorder)) {
fRegistry.fill(HIST("BC/hTVXCounter"), 4.f);
}
if (bc.selection_bit(o2::aod::evsel::kNoTimeFrameBorder) && bc.selection_bit(o2::aod::evsel::kNoITSROFrameBorder) && rctChecker(bc)) {
if (bc.selection_bit(o2::aod::emevsel::kNoTimeFrameBorder) && bc.selection_bit(o2::aod::emevsel::kNoITSROFrameBorder) && rctChecker(bc)) {
fRegistry.fill(HIST("BC/hTVXCounter"), 5.f);
}
}
Expand Down
4 changes: 2 additions & 2 deletions PWGEM/Dilepton/Core/DileptonProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ using namespace o2::aod::pwgem::dilepton::utils;
using namespace o2::aod::pwgem::dilepton::utils::emtrackutil;
using namespace o2::aod::pwgem::dilepton::utils::pairutil;

using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent, aod::EMEventsQvec>;
using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent, aod::EMEventsQvec2, aod::EMEventsQvec3>;
using MyCollision = MyCollisions::iterator;

using MyElectrons = soa::Join<aod::EMPrimaryElectrons, aod::EMPrimaryElectronEMEventIds, aod::EMAmbiguousElectronSelfIds, aod::EMPrimaryElectronsPrefilterBit, aod::EMPrimaryElectronsPrefilterBitDerived>;
Expand Down Expand Up @@ -774,7 +774,7 @@ struct DileptonProducer {
continue;
}

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

} // end of collision loop
}
Expand Down
32 changes: 17 additions & 15 deletions PWGEM/Dilepton/Core/EMEventCut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#ifndef PWGEM_DILEPTON_CORE_EMEVENTCUT_H_
#define PWGEM_DILEPTON_CORE_EMEVENTCUT_H_

#include "PWGEM/Dilepton/DataModel/dileptonTables.h"

#include "Common/CCDB/EventSelectionParams.h"
#include "Common/CCDB/TriggerAliases.h"

Expand Down Expand Up @@ -116,52 +118,52 @@ class EMEventCut : public TNamed
return collision.sel8();

case EMEventCuts::kFT0AND:
return collision.selection_bit(o2::aod::evsel::kIsTriggerTVX);
return collision.selection_bit(o2::aod::emevsel::kIsTriggerTVX);

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

case EMEventCuts::kNoTFB:
return collision.selection_bit(o2::aod::evsel::kNoTimeFrameBorder);
return collision.selection_bit(o2::aod::emevsel::kNoTimeFrameBorder);

case EMEventCuts::kNoITSROFB:
return collision.selection_bit(o2::aod::evsel::kNoITSROFrameBorder);
return collision.selection_bit(o2::aod::emevsel::kNoITSROFrameBorder);

case EMEventCuts::kNoSameBunchPileup:
return collision.selection_bit(o2::aod::evsel::kNoSameBunchPileup);
return collision.selection_bit(o2::aod::emevsel::kNoSameBunchPileup);

case EMEventCuts::kIsVertexITSTPC:
return collision.selection_bit(o2::aod::evsel::kIsVertexITSTPC);
return collision.selection_bit(o2::aod::emevsel::kIsVertexITSTPC);

case EMEventCuts::kIsVertexTOFmatched:
return collision.selection_bit(o2::aod::evsel::kIsVertexTOFmatched);
return collision.selection_bit(o2::aod::emevsel::kIsVertexTOFmatched);

case EMEventCuts::kIsGoodZvtxFT0vsPV:
return collision.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV);
return collision.selection_bit(o2::aod::emevsel::kIsGoodZvtxFT0vsPV);

case EMEventCuts::kNoCollInTimeRangeStandard:
return collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard);
return collision.selection_bit(o2::aod::emevsel::kNoCollInTimeRangeStandard);

case EMEventCuts::kNoCollInTimeRangeStrict:
return collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStrict);
return collision.selection_bit(o2::aod::emevsel::kNoCollInTimeRangeStrict);

case EMEventCuts::kNoCollInITSROFStandard:
return collision.selection_bit(o2::aod::evsel::kNoCollInRofStandard);
return collision.selection_bit(o2::aod::emevsel::kNoCollInRofStandard);

case EMEventCuts::kNoCollInITSROFStrict:
return collision.selection_bit(o2::aod::evsel::kNoCollInRofStrict);
return collision.selection_bit(o2::aod::emevsel::kNoCollInRofStrict);

case EMEventCuts::kNoHighMultCollInPrevRof:
return collision.selection_bit(o2::aod::evsel::kNoHighMultCollInPrevRof);
return collision.selection_bit(o2::aod::emevsel::kNoHighMultCollInPrevRof);

case EMEventCuts::kIsGoodITSLayer3:
return collision.selection_bit(o2::aod::evsel::kIsGoodITSLayer3);
return collision.selection_bit(o2::aod::emevsel::kIsGoodITSLayer3);

case EMEventCuts::kIsGoodITSLayer0123:
return collision.selection_bit(o2::aod::evsel::kIsGoodITSLayer0123);
return collision.selection_bit(o2::aod::emevsel::kIsGoodITSLayer0123);

case EMEventCuts::kIsGoodITSLayersAll:
return collision.selection_bit(o2::aod::evsel::kIsGoodITSLayersAll);
return collision.selection_bit(o2::aod::emevsel::kIsGoodITSLayersAll);

default:
return true;
Expand Down
Loading
Loading