Skip to content

fix: remove *Associations from PODIO output collections #2822

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
wdconinc wants to merge 13 commits into
base: main
Choose a base branch
from
+0 −61
Open

fix: remove *Associations from PODIO output collections #2822

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
feaea13
Remove all *Associations entries from output collections
wdconinc Aug 3, 2026
4776716
Restore MCScattered*Associations entries to output collections
wdconinc Aug 3, 2026
6a08092
fix: rm ReconstructedChargedParticleAssociations
wdconinc Aug 3, 2026
97a5868
fix: add MC(Non)?ScatteredElectronLinks (keep *Associations)
wdconinc Aug 3, 2026
d563c3b
fix: remove unused *Associations entries from PODIO output collection…
epic-capybara Aug 3, 2026
a940cad
fix(pid): use raw hit links in DRICH IRT PID
wdconinc Aug 3, 2026
64dfe25
fix: re-add ReconstructedChargedParticleAssociations
wdconinc Aug 4, 2026
820a9cb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 4, 2026
c54f4cb
fix: re-add DRICHRawHitsAssociations
wdconinc Aug 12, 2026
c8204ec
fix: rm TOF*SharedHitAssociations
wdconinc Aug 12, 2026
8208378
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 20, 2026
8dc32b4
fix: clean duplicated lines after rebase conflict resolution
wdconinc Aug 20, 2026
fb47d04
fix: remove *Associations from PODIO output collections (fix: iwyu) (…
epic-capybara Aug 20, 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
14 changes: 8 additions & 6 deletions src/detectors/DRICH/DRICH.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,16 @@ void InitPlugin(JApplication* app) {
"DRICHIrtCherenkovParticleID",
{"DRICHAerogelTracks", "DRICHGasTracks", "DRICHMergedTracks", "DRICHRawHits",
"DRICHRawHitsLinks", "DRICHRawHitsAssociations"},
"DRICHRawHitsLinks", "DRICHRawHitsAssociations"
},
{"DRICHAerogelIrtCherenkovParticleID", "DRICHGasIrtCherenkovParticleID"}, irt_cfg, app));
Comment on lines 139 to 141

// merge aerogel and gas PID results
app->Add(new JOmniFactoryGeneratorT<MergeCherenkovParticleID_factory>(
"DRICHMergedIrtCherenkovParticleID",
{"DRICHAerogelIrtCherenkovParticleID", "DRICHGasIrtCherenkovParticleID"},
{"DRICHMergedIrtCherenkovParticleID"}, merge_cfg, app));
// merge aerogel and gas PID results
app->Add(new JOmniFactoryGeneratorT<MergeCherenkovParticleID_factory>(
"DRICHMergedIrtCherenkovParticleID",
{"DRICHAerogelIrtCherenkovParticleID", "DRICHGasIrtCherenkovParticleID"},
{"DRICHMergedIrtCherenkovParticleID"}, merge_cfg, app));

// clang-format on
// clang-format on
}
}
3 changes: 2 additions & 1 deletion src/factories/pid/IrtCherenkovParticleID_factory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,9 @@ class IrtCherenkovParticleID_factory
void Process(int32_t /* run_number */, uint64_t /* event_number */) {
m_algo->process({m_aerogel_tracks_input(), m_gas_tracks_input(), m_merged_tracks_input(),
m_raw_hits_input(), m_raw_hit_links_input(), m_raw_hit_assoc_input()},
m_raw_hits_input(), m_raw_hit_links_input(), m_raw_hit_assoc_input()},
{m_aerogel_particleIDs_output().get(), m_gas_particleIDs_output().get()});
}
}
};

} // namespace eicrecon
1 change: 0 additions & 1 deletion src/global/reco/reco.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <edm4eic/MCRecoParticleLinkCollection.h>
#include <edm4eic/ReconstructedParticle.h>
#include <edm4hep/MCParticle.h>
#include <edm4hep/Vector3f.h>
#include <podio/detail/Link.h>
#include <cmath>
#include <deque>
Expand Down
61 changes: 0 additions & 61 deletions src/services/io/podio/JEventProcessorPODIO.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ JEventProcessorPODIO::JEventProcessorPODIO() {
"CentralTrackerTruthSeeds",
"CentralTrackingRecHits",
"CentralTrackingRawHitLinks",
"CentralTrackingRawHitAssociations",
"CentralTrackSeeds",
"CentralTrackSeedParameters",
"CentralTrackerMeasurements",
Expand Down Expand Up @@ -95,34 +94,27 @@ JEventProcessorPODIO::JEventProcessorPODIO() {
"TrackerEndcapHits",

"SiBarrelRawHitLinks",
"SiBarrelRawHitAssociations",
"SiBarrelVertexRawHitLinks",
"SiBarrelVertexRawHitAssociations",
"SiEndcapTrackerRawHitLinks",
"SiEndcapTrackerRawHitAssociations",

// TOF
"TOFBarrelHits",
"TOFBarrelSharedHits",
"TOFBarrelSharedRawHits",
"TOFBarrelSharedRecHits",
"TOFBarrelSharedRawHitLinks",
"TOFBarrelSharedRawHitAssociations",
"TOFBarrelClusterHits",
"TOFEndcapHits",
"TOFEndcapSharedHits",
"TOFEndcapSharedRawHits",
"TOFEndcapSharedRecHits",
"TOFEndcapSharedRawHitLinks",
"TOFEndcapSharedRawHitAssociations",
"TOFEndcapClusterHits",
"TOFBarrelADCTDC",
"TOFEndcapADCTDC",

"TOFBarrelRawHitLinks",
"TOFBarrelRawHitAssociations",
"TOFEndcapRawHitLinks",
"TOFEndcapRawHitAssociations",

"CombinedTOFTruthSeededParticleIDs",
"CombinedTOFParticleIDs",
Expand All @@ -141,7 +133,6 @@ JEventProcessorPODIO::JEventProcessorPODIO() {
// PFRICH
"RICHEndcapNRawHits",
"RICHEndcapNRawHitsLinks",
"RICHEndcapNRawHitsAssociations",
"RICHEndcapNTruthSeededParticleIDs",
"RICHEndcapNParticleIDs",

Expand All @@ -162,13 +153,9 @@ JEventProcessorPODIO::JEventProcessorPODIO() {
"ForwardMPGDEndcapHits",

"MPGDBarrelRawHitLinks",
"MPGDBarrelRawHitAssociations",
"OuterMPGDBarrelRawHitLinks",
"OuterMPGDBarrelRawHitAssociations",
"BackwardMPGDEndcapRawHitLinks",
"BackwardMPGDEndcapRawHitAssociations",
"ForwardMPGDEndcapRawHitLinks",
"ForwardMPGDEndcapRawHitAssociations",

// LOWQ2 hits
"TaggerTrackerHits",
Expand All @@ -178,7 +165,6 @@ JEventProcessorPODIO::JEventProcessorPODIO() {
"TaggerTrackerCombinedPulsesWithNoise",
"TaggerTrackerRawHits",
"TaggerTrackerRawHitLinks",
"TaggerTrackerRawHitAssociations",
"TaggerTrackerM1L0ClusterPositions",
"TaggerTrackerM1L1ClusterPositions",
"TaggerTrackerM1L2ClusterPositions",
Expand All @@ -190,23 +176,18 @@ JEventProcessorPODIO::JEventProcessorPODIO() {
"TaggerTrackerM1LocalTracks",
"TaggerTrackerM2LocalTracks",
"TaggerTrackerM1LocalTrackLinks",
"TaggerTrackerM1LocalTrackAssociations",
"TaggerTrackerM2LocalTrackLinks",
"TaggerTrackerM2LocalTrackAssociations",
"TaggerTrackerLocalTracks",
"TaggerTrackerLocalTrackLinks",
"TaggerTrackerLocalTrackAssociations",
"TaggerTrackerReconstructedParticles",
"TaggerTrackerReconstructedParticleLinks",
"TaggerTrackerReconstructedParticleAssociations",

// Forward & Far forward hits
"B0TrackerTruthSeeds",
"B0TrackerRecHits",
"B0TrackerRawHits",
"B0TrackerHits",
"B0TrackerRawHitLinks",
"B0TrackerRawHitAssociations",
"B0TrackerSeeds",
"B0TrackerSeedParameters",
"B0TrackerMeasurements",
Expand All @@ -221,21 +202,17 @@ JEventProcessorPODIO::JEventProcessorPODIO() {
"ForwardRomanPotHits",
"ForwardRomanPotRawHits",
"ForwardRomanPotRawHitLinks",
"ForwardRomanPotRawHitAssociations",
"ForwardOffMTrackerHits",
"ForwardOffMTrackerRawHits",
"ForwardOffMTrackerRawHitLinks",
"ForwardOffMTrackerRawHitAssociations",

// Reconstructed data
"GeneratedParticles",
"GeneratedBreitFrameParticles",
"ReconstructedParticles",
"ReconstructedParticleLinks",
"ReconstructedParticleAssociations",
"ReconstructedTruthSeededChargedParticles",
"ReconstructedTruthSeededChargedParticleLinks",
"ReconstructedTruthSeededChargedParticleAssociations",
"ReconstructedChargedRealPIDParticles",
"ReconstructedChargedRealPIDParticleIDs",
"ReconstructedChargedParticles",
Expand All @@ -249,7 +226,6 @@ JEventProcessorPODIO::JEventProcessorPODIO() {

"ReconstructedNeutralParticles",
"ReconstructedNeutralParticleLinks",
"ReconstructedNeutralParticleAssociations",
"ReconstructedNeutralJets",

// Central tracking
Expand All @@ -258,49 +234,41 @@ JEventProcessorPODIO::JEventProcessorPODIO() {
"CentralCKFTruthSeededTrajectories",
"CentralCKFTruthSeededTracks",
"CentralCKFTruthSeededTrackLinks",
"CentralCKFTruthSeededTrackAssociations",
"CentralCKFTruthSeededTrackParameters",
"CentralCKFTrajectories",
"CentralCKFTracks",
"CentralCKFTrackLinks",
"CentralCKFTrackAssociations",
"CentralCKFTrackParameters",
// tracking properties - true seeding
"CentralCKFTruthSeededTrajectoriesUnfiltered",
"CentralCKFTruthSeededTracksUnfiltered",
"CentralCKFTruthSeededTrackUnfilteredLinks",
"CentralCKFTruthSeededTrackUnfilteredAssociations",
"CentralCKFTruthSeededTrackParametersUnfiltered",
// tracking properties - realistic seeding
"CentralCKFTrajectoriesUnfiltered",
"CentralCKFTracksUnfiltered",
"CentralCKFTrackUnfilteredLinks",
"CentralCKFTrackUnfilteredAssociations",
"CentralCKFTrackParametersUnfiltered",

// B0 tracking
"B0TrackerCKFTruthSeededTrajectories",
"B0TrackerCKFTruthSeededTracks",
"B0TrackerCKFTruthSeededTrackLinks",
"B0TrackerCKFTruthSeededTrackAssociations",
"B0TrackerCKFTruthSeededTrackParameters",
"B0TrackerCKFTrajectories",
"B0TrackerCKFTracks",
"B0TrackerCKFTrackLinks",
"B0TrackerCKFTrackAssociations",
"B0TrackerCKFTrackParameters",
// tracking properties - true seeding
"B0TrackerCKFTruthSeededTrajectoriesUnfiltered",
"B0TrackerCKFTruthSeededTracksUnfiltered",
"B0TrackerCKFTruthSeededTrackUnfilteredLinks",
"B0TrackerCKFTruthSeededTrackUnfilteredAssociations",
"B0TrackerCKFTruthSeededTrackParametersUnfiltered",
// tracking properties - realistic seeding
"B0TrackerCKFTrajectoriesUnfiltered",
"B0TrackerCKFTrackParametersUnfiltered",
"B0TrackerCKFTracksUnfiltered",
"B0TrackerCKFTrackUnfilteredLinks",
"B0TrackerCKFTrackUnfilteredAssociations",

"CentralAndB0TrackVertices",

Expand Down Expand Up @@ -338,39 +306,29 @@ JEventProcessorPODIO::JEventProcessorPODIO() {
"EcalEndcapNRecHits",
"EcalEndcapNTruthClusters",
"EcalEndcapNTruthClusterLinks",
"EcalEndcapNTruthClusterAssociations",
"EcalEndcapNClusters",
"EcalEndcapNClusterLinks",
"EcalEndcapNClusterAssociations",
"EcalEndcapNSplitMergeClusters",
"EcalEndcapNSplitMergeClusterLinks",
"EcalEndcapNSplitMergeClusterAssociations",
"EcalEndcapPRawHits",
"EcalEndcapPRecHits",
"EcalEndcapPTruthClusters",
"EcalEndcapPTruthClusterLinks",
"EcalEndcapPTruthClusterAssociations",
"EcalEndcapPClusters",
"EcalEndcapPClusterLinks",
"EcalEndcapPClusterAssociations",
"EcalEndcapPSplitMergeClusters",
"EcalEndcapPSplitMergeClusterLinks",
"EcalEndcapPSplitMergeClusterAssociations",
"EcalBarrelClusters",
"EcalBarrelClusterLinks",
"EcalBarrelClusterAssociations",
"EcalBarrelTruthClusters",
"EcalBarrelTruthClusterLinks",
"EcalBarrelTruthClusterAssociations",
"EcalBarrelImagingProcessedHits",
"EcalBarrelImagingProcessedHitContributions",
"EcalBarrelImagingRawHits",
"EcalBarrelImagingRawHitLinks",
"EcalBarrelImagingRawHitAssociations",
"EcalBarrelImagingRecHits",
"EcalBarrelImagingClusters",
"EcalBarrelImagingClusterLinks",
"EcalBarrelImagingClusterAssociations",
"EcalBarrelScFiPAttenuatedHits",
"EcalBarrelScFiPAttenuatedHitContributions",
"EcalBarrelScFiNAttenuatedHits",
Expand All @@ -383,85 +341,66 @@ JEventProcessorPODIO::JEventProcessorPODIO() {
"EcalBarrelScFiRecHits",
"EcalBarrelScFiClusters",
"EcalBarrelScFiClusterLinks",
"EcalBarrelScFiClusterAssociations",
"EcalBarrelScFiTopoClusters",
"EcalBarrelScFiTopoClusterLinks",
"EcalBarrelScFiTopoClusterAssociations",
"EcalLumiSpecRawHits",
"EcalLumiSpecRecHits",
"EcalLumiSpecTruthClusters",
"EcalLumiSpecTruthClusterLinks",
"EcalLumiSpecTruthClusterAssociations",
"EcalLumiSpecClusters",
"EcalLumiSpecClusterLinks",
"EcalLumiSpecClusterAssociations",
"HcalEndcapNRawHits",
"HcalEndcapNRecHits",
"HcalEndcapNMergedHits",
"HcalEndcapNClusters",
"HcalEndcapNClusterLinks",
"HcalEndcapNClusterAssociations",
"HcalEndcapNSplitMergeClusters",
"HcalEndcapNSplitMergeClusterLinks",
"HcalEndcapNSplitMergeClusterAssociations",
"HcalEndcapPInsertRawHits",
"HcalEndcapPInsertRecHits",
"HcalEndcapPInsertMergedHits",
"HcalEndcapPInsertClusters",
"HcalEndcapPInsertClusterLinks",
"HcalEndcapPInsertClusterAssociations",
"LFHCALRawHits",
"LFHCALRecHits",
"LFHCALClusters",
"LFHCALClusterLinks",
"LFHCALClusterAssociations",
"LFHCALSplitMergeClusters",
"LFHCALSplitMergeClusterLinks",
"LFHCALSplitMergeClusterAssociations",
"HcalBarrelRawHits",
"HcalBarrelRecHits",
"HcalBarrelMergedHits",
"HcalBarrelClusters",
"HcalBarrelClusterLinks",
"HcalBarrelClusterAssociations",
"HcalBarrelSplitMergeClusters",
"HcalBarrelSplitMergeClusterLinks",
"HcalBarrelSplitMergeClusterAssociations",
"B0ECalRawHits",
"B0ECalRecHits",
"B0ECalClusters",
"B0ECalClusterLinks",
"B0ECalClusterAssociations",
"HcalEndcapNTruthClusters",
"HcalEndcapNTruthClusterLinks",
"HcalEndcapNTruthClusterAssociations",
"HcalBarrelTruthClusters",
"HcalBarrelTruthClusterLinks",
"HcalBarrelTruthClusterAssociations",

//ZDC Ecal
"EcalFarForwardZDCRawHits",
"EcalFarForwardZDCRecHits",
"EcalFarForwardZDCClusters",
"EcalFarForwardZDCClusterLinks",
"EcalFarForwardZDCClusterAssociations",
"EcalFarForwardZDCTruthClusters",
"EcalFarForwardZDCTruthClusterLinks",
"EcalFarForwardZDCTruthClusterAssociations",

//ZDC HCal
"HcalFarForwardZDCRawHits",
"HcalFarForwardZDCRecHits",
"HcalFarForwardZDCSubcellHits",
"HcalFarForwardZDCClusters",
"HcalFarForwardZDCClusterLinks",
"HcalFarForwardZDCClusterAssociations",
"HcalFarForwardZDCClustersBaseline",
"HcalFarForwardZDCClusterLinksBaseline",
"HcalFarForwardZDCClusterAssociationsBaseline",
"HcalFarForwardZDCTruthClusters",
"HcalFarForwardZDCTruthClusterLinks",
"HcalFarForwardZDCTruthClusterAssociations",
"ReconstructedHcalFarForwardZDCNeutrals",
"ReconstructedB0EcalNeutrals",
"ReconstructedEcalEndcapPNeutrals",
Expand Down
Loading