Skip to content

[PWGEM] Fix Event subscription in process functions #15218

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

Merged
mhemmer-cern merged 3 commits into from
Mar 2, 2026
+33 −31
Merged

[PWGEM] Fix Event subscription in process functions #15218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a2293f
Fix Event subscription in process functions
Steffimro Mar 2, 2026
45613e8
Please consider the following formatting changes
alibuild Mar 2, 2026
8e9913f
Merge pull request #1 from alibuild/alibot-cleanup-15218
Steffimro Mar 2, 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
2 changes: 1 addition & 1 deletion PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@ struct Pi0EtaToGammaGamma {
}
PROCESS_SWITCH(Pi0EtaToGammaGamma, processAnalysisJJMC, "process pair analysis", false);

void processDummy(o2::aod::EMEvents const&) {}
void processDummy(o2::aod::EMEvents_004 const&) {}
PROCESS_SWITCH(Pi0EtaToGammaGamma, processDummy, "Dummy function", false);
};
#endif // PWGEM_PHOTONMESON_CORE_PI0ETATOGAMMAGAMMA_H_
2 changes: 1 addition & 1 deletion PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,7 @@ struct Pi0EtaToGammaGammaMC {
}
PROCESS_SWITCH(Pi0EtaToGammaGammaMC, processAnalysisJJMC, "process pair analysis", false);

void processDummy(o2::aod::EMEvents const&) {}
void processDummy(o2::aod::EMEvents_004 const&) {}
PROCESS_SWITCH(Pi0EtaToGammaGammaMC, processDummy, "Dummy function", false);
};
#endif // PWGEM_PHOTONMESON_CORE_PI0ETATOGAMMAGAMMAMC_H_
5 changes: 3 additions & 2 deletions PWGEM/PhotonMeson/DataModel/gammaTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,8 +468,9 @@ DECLARE_SOA_TABLE(DalitzEEs, "AOD", "DALITZEE", //!
// iterators
using DalitzEE = DalitzEEs::iterator;

DECLARE_SOA_TABLE(DalitzEEEMEventIds, "AOD", "EEEMEVENTID", dalitzee::EMEventId); // To be joined with DalitzEEs table at analysis level.
// iterators
DECLARE_SOA_TABLE(DalitzEEEMEventIds_000, "AOD", "EEEMEVENTID", dalitzee::EMEventId); // To be joined with DalitzEEs table at analysis level.
DECLARE_SOA_TABLE_VERSIONED(DalitzEEEMEventIds_001, "AOD", "EEEMEVENTID", 1, dalitzee::EMPhotonEventId); // To be joined with DalitzEEs table at analysis level.
using DalitzEEEMEventIds = DalitzEEEMEventIds_001;
using DalitzEEEMEventId = DalitzEEEMEventIds::iterator;

namespace pwgem::photon::swtinfo
Expand Down
12 changes: 6 additions & 6 deletions PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,32 +387,32 @@ struct AssociatePhotonToEMEvent {
// This struct is for both data and MC.
// Note that reconstructed collisions without mc collisions are already rejected in CreateEMEventPhoton in MC.

void processPCM(aod::EMEvents const& collisions, aod::V0PhotonsKF const& photons)
void processPCM(aod::EMEvents_004 const& collisions, aod::V0PhotonsKF const& photons)
Copy link
Collaborator

@vkucera vkucera Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you need an explicit table version in a subscription?

Copy link
Collaborator

@mhemmer-cern mhemmer-cern Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because in the EM code we were using the same event tables before. Then it was recently changed in a way that the photon/meson code would still use the version 004 while the dileptons went to version 005. Since the dilepton group did not want to cause changes in the photon code, they tried to kept it at 004 for us, but these few subscriptions got overlooked. See the linked PR from my approval comment.

Copy link
Collaborator

@vkucera vkucera Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be a mess to maintain... 🤦

{
fillEventId(collisions, photons, v0kfeventid, perCollisionPCM);
}

void processElectronFromDalitz(aod::EMEvents const& collisions, aod::EMPrimaryElectronsFromDalitz const& tracks)
void processElectronFromDalitz(aod::EMEvents_004 const& collisions, aod::EMPrimaryElectronsFromDalitz const& tracks)
{
fillEventId(collisions, tracks, prmeleventid, perCollisionEl);
}

void processPHOS(aod::EMEvents const& collisions, aod::PHOSClusters const& photons)
void processPHOS(aod::EMEvents_004 const& collisions, aod::PHOSClusters const& photons)
{
fillEventId(collisions, photons, phoseventid, perCollisionPHOS);
}

void processEMC(aod::EMEvents const& collisions, aod::SkimEMCClusters const& photons)
void processEMC(aod::EMEvents_004 const& collisions, aod::SkimEMCClusters const& photons)
{
fillEventId(collisions, photons, emceventid, perCollisionEMC);
}

// void processChargedTrack(aod::EMEvents const& collisions, aod::EMPrimaryTracks const& tracks)
// void processChargedTrack(aod::EMEvents_004 const& collisions, aod::EMPrimaryTracks const& tracks)
// {
// fillEventId(collisions, tracks, prmtrackeventid, perCollision_track);
// }

void processDummy(aod::EMEvents const&) {}
void processDummy(aod::EMEvents_004 const&) {}

PROCESS_SWITCH(AssociatePhotonToEMEvent, processPCM, "process pcm-event indexing", false);
PROCESS_SWITCH(AssociatePhotonToEMEvent, processElectronFromDalitz, "process dalitzee-event indexing", false);
Expand Down
35 changes: 18 additions & 17 deletions PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,23 +237,24 @@ struct PhotonConversionBuilder {
ccdb->setCaching(true);
ccdb->setLocalObjectValidityChecking();
ccdb->setFatalWhenNull(false);

if (useMatCorrType == MatCorrType::TGeo) {
LOGF(info, "TGeo correction requested, loading geometry");
if (!o2::base::GeometryManager::isGeometryLoaded()) {
ccdb->get<TGeoManager>(geoPath);
}
}
if (useMatCorrType == MatCorrType::LUT) {
LOGF(info, "LUT correction requested, loading LUT");
lut = o2::base::MatLayerCylSet::rectifyPtrFromFile(ccdb->get<o2::base::MatLayerCylSet>(lutPath));
}

if (useMatCorrType == MatCorrType::TGeo) {
matCorr = o2::base::Propagator::MatCorrType::USEMatCorrTGeo;
}
if (useMatCorrType == MatCorrType::LUT) {
matCorr = o2::base::Propagator::MatCorrType::USEMatCorrLUT;
switch (useMatCorrType) {
case MatCorrType::TGeo:
LOGF(info, "TGeo correction requested, loading geometry");
if (!o2::base::GeometryManager::isGeometryLoaded()) {
ccdb->get<TGeoManager>(geoPath);
}
matCorr = o2::base::Propagator::MatCorrType::USEMatCorrTGeo;
break;
case MatCorrType::LUT:
LOGF(info, "LUT correction requested, loading LUT");
lut = o2::base::MatLayerCylSet::rectifyPtrFromFile(ccdb->get<o2::base::MatLayerCylSet>(lutPath));
matCorr = o2::base::Propagator::MatCorrType::USEMatCorrLUT;
break;
default:
LOGF(info, "no correction requested, loading LUT by default!");
lut = o2::base::MatLayerCylSet::rectifyPtrFromFile(ccdb->get<o2::base::MatLayerCylSet>(lutPath));
matCorr = o2::base::Propagator::MatCorrType::USEMatCorrLUT;
break;
}

if (applyPCMMl) {
Expand Down
4 changes: 2 additions & 2 deletions PWGEM/PhotonMeson/TableProducer/skimmerDalitzEE.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ using namespace o2::framework;
using namespace o2::framework::expressions;
using namespace o2::constants::physics;

using MyCollisions = soa::Join<aod::EMEvents_004, aod::EMEventsMult_000, aod::EMEventsCent_000>;
using MyCollisions = soa::Join<aod::EMPhotonEvents, aod::EMEventsMult_000, aod::EMEventsCent_000>;
using MyCollision = MyCollisions::iterator;

using MyTracks = soa::Join<aod::EMPrimaryElectrons, aod::EMPrimaryElectronsCov, aod::EMPrimaryElectronDaEMEventIds>;
Expand Down Expand Up @@ -375,7 +375,7 @@ struct skimmerDalitzEE {
}
PROCESS_SWITCH(skimmerDalitzEE, processCEFP, "Process dalitz ee for CEFP", false); // for central event filter processing

void processOnlyNee(soa::Join<aod::EMEvents_004, aod::EMEventsMult_000, aod::EMEventsCent_000> const& collisions)
void processOnlyNee(soa::Join<aod::EMPhotonEvents, aod::EMEventsMult_000, aod::EMEventsCent_000> const& collisions)
{
for (auto& collision : collisions) {
float centralities[3] = {collision.centFT0M(), collision.centFT0A(), collision.centFT0C()};
Expand Down
4 changes: 2 additions & 2 deletions PWGEM/PhotonMeson/Tasks/gammaConversions.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ struct GammaConversions {
}

Preslice<V0DatasAdditional> perCollision = aod::v0photonkf::emphotoneventId;
void processRec(aod::EMEvents::iterator const& theCollision,
void processRec(aod::EMEvents_004::iterator const& theCollision,
V0DatasAdditional const& theV0s,
aod::V0Legs const&)
{
Expand All @@ -645,7 +645,7 @@ struct GammaConversions {

Preslice<aod::McGammasTrue> gperV0 = aod::gammamctrue::v0photonkfId;

void processMc(aod::EMEvents::iterator const& theCollision,
void processMc(aod::EMEvents_004::iterator const& theCollision,
V0DatasAdditional const& theV0s,
V0LegsWithMC const&,
aod::V0DaughterMcParticles const&,
Expand Down
Loading