From feaea13180c45dc383a8695e466af8a4702f9e83 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 3 Aug 2026 15:14:06 -0500 Subject: [PATCH 01/13] Remove all *Associations entries from output collections Removed 62 entries ending with 'Associations' from the output_collections vector in JEventProcessorPODIO.cc to exclude these collections from PODIO output files. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- src/services/io/podio/JEventProcessorPODIO.cc | 66 +------------------ 1 file changed, 1 insertion(+), 65 deletions(-) diff --git a/src/services/io/podio/JEventProcessorPODIO.cc b/src/services/io/podio/JEventProcessorPODIO.cc index 4db9a2c1e2..61f6aee793 100644 --- a/src/services/io/podio/JEventProcessorPODIO.cc +++ b/src/services/io/podio/JEventProcessorPODIO.cc @@ -67,7 +67,6 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "CentralTrackerTruthSeeds", "CentralTrackingRecHits", "CentralTrackingRawHitLinks", - "CentralTrackingRawHitAssociations", "CentralTrackSeeds", "CentralTrackSeedParameters", "CentralTrackerMeasurements", @@ -95,11 +94,8 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "TrackerEndcapHits", "SiBarrelRawHitLinks", - "SiBarrelRawHitAssociations", "SiBarrelVertexRawHitLinks", - "SiBarrelVertexRawHitAssociations", "SiEndcapTrackerRawHitLinks", - "SiEndcapTrackerRawHitAssociations", // TOF "TOFBarrelHits", @@ -120,9 +116,7 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "TOFEndcapADCTDC", "TOFBarrelRawHitLinks", - "TOFBarrelRawHitAssociations", "TOFEndcapRawHitLinks", - "TOFEndcapRawHitAssociations", "CombinedTOFTruthSeededParticleIDs", "CombinedTOFParticleIDs", @@ -130,7 +124,6 @@ JEventProcessorPODIO::JEventProcessorPODIO() { // DRICH "DRICHRawHits", "DRICHRawHitsLinks", - "DRICHRawHitsAssociations", "DRICHAerogelTracks", "DRICHGasTracks", "DRICHAerogelIrtCherenkovParticleID", @@ -141,7 +134,6 @@ JEventProcessorPODIO::JEventProcessorPODIO() { // PFRICH "RICHEndcapNRawHits", "RICHEndcapNRawHitsLinks", - "RICHEndcapNRawHitsAssociations", "RICHEndcapNTruthSeededParticleIDs", "RICHEndcapNParticleIDs", @@ -162,13 +154,9 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "ForwardMPGDEndcapHits", "MPGDBarrelRawHitLinks", - "MPGDBarrelRawHitAssociations", "OuterMPGDBarrelRawHitLinks", - "OuterMPGDBarrelRawHitAssociations", "BackwardMPGDEndcapRawHitLinks", - "BackwardMPGDEndcapRawHitAssociations", "ForwardMPGDEndcapRawHitLinks", - "ForwardMPGDEndcapRawHitAssociations", // LOWQ2 hits "TaggerTrackerHits", @@ -178,7 +166,6 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "TaggerTrackerCombinedPulsesWithNoise", "TaggerTrackerRawHits", "TaggerTrackerRawHitLinks", - "TaggerTrackerRawHitAssociations", "TaggerTrackerM1L0ClusterPositions", "TaggerTrackerM1L1ClusterPositions", "TaggerTrackerM1L2ClusterPositions", @@ -190,15 +177,11 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "TaggerTrackerM1LocalTracks", "TaggerTrackerM2LocalTracks", "TaggerTrackerM1LocalTrackLinks", - "TaggerTrackerM1LocalTrackAssociations", "TaggerTrackerM2LocalTrackLinks", - "TaggerTrackerM2LocalTrackAssociations", "TaggerTrackerLocalTracks", "TaggerTrackerLocalTrackLinks", - "TaggerTrackerLocalTrackAssociations", "TaggerTrackerReconstructedParticles", "TaggerTrackerReconstructedParticleLinks", - "TaggerTrackerReconstructedParticleAssociations", // Forward & Far forward hits "B0TrackerTruthSeeds", @@ -206,7 +189,6 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "B0TrackerRawHits", "B0TrackerHits", "B0TrackerRawHitLinks", - "B0TrackerRawHitAssociations", "B0TrackerSeeds", "B0TrackerSeedParameters", "B0TrackerMeasurements", @@ -221,35 +203,25 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "ForwardRomanPotHits", "ForwardRomanPotRawHits", "ForwardRomanPotRawHitLinks", - "ForwardRomanPotRawHitAssociations", "ForwardOffMTrackerHits", "ForwardOffMTrackerRawHits", "ForwardOffMTrackerRawHitLinks", - "ForwardOffMTrackerRawHitAssociations", // Reconstructed data "GeneratedParticles", "GeneratedBreitFrameParticles", "ReconstructedParticles", "ReconstructedParticleLinks", - "ReconstructedParticleAssociations", "ReconstructedTruthSeededChargedParticles", "ReconstructedTruthSeededChargedParticleLinks", - "ReconstructedTruthSeededChargedParticleAssociations", "ReconstructedChargedRealPIDParticles", "ReconstructedChargedRealPIDParticleIDs", "ReconstructedChargedParticles", "ReconstructedChargedParticleLinks", - "ReconstructedChargedParticleAssociations", // Used by associations below - "MCScatteredElectronLinks", // Remove if/when used internally - "MCScatteredElectronAssociations", // Remove if/when used internally - "MCNonScatteredElectronLinks", // Remove if/when used internally - "MCNonScatteredElectronAssociations", // Remove if/when used internally "ReconstructedBreitFrameParticles", "ReconstructedNeutralParticles", "ReconstructedNeutralParticleLinks", - "ReconstructedNeutralParticleAssociations", "ReconstructedNeutralJets", // Central tracking @@ -258,49 +230,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", @@ -338,39 +302,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", @@ -383,71 +337,55 @@ 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", @@ -455,13 +393,11 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "HcalFarForwardZDCSubcellHits", "HcalFarForwardZDCClusters", "HcalFarForwardZDCClusterLinks", - "HcalFarForwardZDCClusterAssociations", "HcalFarForwardZDCClustersBaseline", "HcalFarForwardZDCClusterLinksBaseline", - "HcalFarForwardZDCClusterAssociationsBaseline", "HcalFarForwardZDCTruthClusters", "HcalFarForwardZDCTruthClusterLinks", - "HcalFarForwardZDCTruthClusterAssociations", + "ReconstructedHcalFarForwardZDCNeutrals", "ReconstructedB0EcalNeutrals", "ReconstructedEcalEndcapPNeutrals", From 4776716c875c3304e956fcfaad47d1cde14f3253 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 3 Aug 2026 15:19:45 -0500 Subject: [PATCH 02/13] Restore MCScattered*Associations entries to output collections Keep MCScatteredElectronAssociations and MCNonScatteredElectronAssociations in the output_collections list as requested, removing only other Associations entries that are not currently used internally. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- src/services/io/podio/JEventProcessorPODIO.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/services/io/podio/JEventProcessorPODIO.cc b/src/services/io/podio/JEventProcessorPODIO.cc index 61f6aee793..93a68fa60c 100644 --- a/src/services/io/podio/JEventProcessorPODIO.cc +++ b/src/services/io/podio/JEventProcessorPODIO.cc @@ -218,6 +218,9 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "ReconstructedChargedRealPIDParticleIDs", "ReconstructedChargedParticles", "ReconstructedChargedParticleLinks", + "ReconstructedChargedParticleAssociations", + "MCScatteredElectronAssociations", // Remove if/when used internally + "MCNonScatteredElectronAssociations", // Remove if/when used internally "ReconstructedBreitFrameParticles", "ReconstructedNeutralParticles", @@ -397,7 +400,6 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "HcalFarForwardZDCClusterLinksBaseline", "HcalFarForwardZDCTruthClusters", "HcalFarForwardZDCTruthClusterLinks", - "ReconstructedHcalFarForwardZDCNeutrals", "ReconstructedB0EcalNeutrals", "ReconstructedEcalEndcapPNeutrals", From 6a08092f741c90bf4d7e05ed7bfad625cbec1c8a Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 3 Aug 2026 15:39:17 -0500 Subject: [PATCH 03/13] fix: rm ReconstructedChargedParticleAssociations Removed 'ReconstructedChargedParticleAssociations' from the list. --- src/services/io/podio/JEventProcessorPODIO.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/services/io/podio/JEventProcessorPODIO.cc b/src/services/io/podio/JEventProcessorPODIO.cc index 93a68fa60c..ae126e192c 100644 --- a/src/services/io/podio/JEventProcessorPODIO.cc +++ b/src/services/io/podio/JEventProcessorPODIO.cc @@ -218,7 +218,6 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "ReconstructedChargedRealPIDParticleIDs", "ReconstructedChargedParticles", "ReconstructedChargedParticleLinks", - "ReconstructedChargedParticleAssociations", "MCScatteredElectronAssociations", // Remove if/when used internally "MCNonScatteredElectronAssociations", // Remove if/when used internally "ReconstructedBreitFrameParticles", From 97a5868a6af7d158e4a4272a1f79a90397483204 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 3 Aug 2026 15:47:50 -0500 Subject: [PATCH 04/13] fix: add MC(Non)?ScatteredElectronLinks (keep *Associations) --- src/services/io/podio/JEventProcessorPODIO.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/services/io/podio/JEventProcessorPODIO.cc b/src/services/io/podio/JEventProcessorPODIO.cc index ae126e192c..7143413f1e 100644 --- a/src/services/io/podio/JEventProcessorPODIO.cc +++ b/src/services/io/podio/JEventProcessorPODIO.cc @@ -218,7 +218,9 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "ReconstructedChargedRealPIDParticleIDs", "ReconstructedChargedParticles", "ReconstructedChargedParticleLinks", + "MCScatteredElectronLinks", // Remove if/when used internally "MCScatteredElectronAssociations", // Remove if/when used internally + "MCNonScatteredElectronLinks", // Remove if/when used internally "MCNonScatteredElectronAssociations", // Remove if/when used internally "ReconstructedBreitFrameParticles", From d563c3bb8972ca29a2efea5f741ad1d98630242b Mon Sep 17 00:00:00 2001 From: epic-capybara <139920704+epic-capybara@users.noreply.github.com> Date: Mon, 3 Aug 2026 18:12:17 -0400 Subject: [PATCH 05/13] fix: remove unused *Associations entries from PODIO output collections (fix: iwyu) (#2825) This PR applies the include-what-you-use fixes as suggested by https://github.com/eic/EICrecon/actions/runs/30852065609. Please merge this PR into the branch `wdconinc-fluffy-invention` to resolve failures in PR #2822. Auto-generated by [create-pull-request][1] [1]: https://github.com/peter-evans/create-pull-request Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/global/reco/reco.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/global/reco/reco.cc b/src/global/reco/reco.cc index 0f707d7621..2f7ed716b1 100644 --- a/src/global/reco/reco.cc +++ b/src/global/reco/reco.cc @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include From a940cad583d2024a68687d727f33e2675b5ed64d Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 3 Aug 2026 17:31:21 -0500 Subject: [PATCH 06/13] fix(pid): use raw hit links in DRICH IRT PID Switch IrtCherenkovParticleID input wiring from RawHitsAssociations to RawHitsLinks to avoid dangling references after association collections were removed from default output selections. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- src/detectors/DRICH/DRICH.cc | 1 + src/factories/pid/IrtCherenkovParticleID_factory.h | 1 + 2 files changed, 2 insertions(+) diff --git a/src/detectors/DRICH/DRICH.cc b/src/detectors/DRICH/DRICH.cc index d5f7ee5cf1..1d12adbeda 100644 --- a/src/detectors/DRICH/DRICH.cc +++ b/src/detectors/DRICH/DRICH.cc @@ -138,6 +138,7 @@ void InitPlugin(JApplication* app) { "DRICHIrtCherenkovParticleID", {"DRICHAerogelTracks", "DRICHGasTracks", "DRICHMergedTracks", "DRICHRawHits", "DRICHRawHitsLinks", "DRICHRawHitsAssociations"}, + "DRICHRawHitsLinks", "DRICHRawHitsAssociations"}, {"DRICHAerogelIrtCherenkovParticleID", "DRICHGasIrtCherenkovParticleID"}, irt_cfg, app)); // merge aerogel and gas PID results diff --git a/src/factories/pid/IrtCherenkovParticleID_factory.h b/src/factories/pid/IrtCherenkovParticleID_factory.h index bf410fb13f..06edb46950 100644 --- a/src/factories/pid/IrtCherenkovParticleID_factory.h +++ b/src/factories/pid/IrtCherenkovParticleID_factory.h @@ -75,6 +75,7 @@ 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()}); } }; From 64dfe259cfbc3847a1d2d7ed71fe7aa0be6e0016 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 3 Aug 2026 19:27:12 -0500 Subject: [PATCH 07/13] fix: re-add ReconstructedChargedParticleAssociations --- src/services/io/podio/JEventProcessorPODIO.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/services/io/podio/JEventProcessorPODIO.cc b/src/services/io/podio/JEventProcessorPODIO.cc index 7143413f1e..b19fc6bbd3 100644 --- a/src/services/io/podio/JEventProcessorPODIO.cc +++ b/src/services/io/podio/JEventProcessorPODIO.cc @@ -218,6 +218,7 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "ReconstructedChargedRealPIDParticleIDs", "ReconstructedChargedParticles", "ReconstructedChargedParticleLinks", + "ReconstructedChargedParticleAssociations", // Used by associations below "MCScatteredElectronLinks", // Remove if/when used internally "MCScatteredElectronAssociations", // Remove if/when used internally "MCNonScatteredElectronLinks", // Remove if/when used internally From 820a9cbfb2c7952b0bf0ec0074054f99a0a9e17f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 4 Aug 2026 00:27:52 +0000 Subject: [PATCH 08/13] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/services/io/podio/JEventProcessorPODIO.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/services/io/podio/JEventProcessorPODIO.cc b/src/services/io/podio/JEventProcessorPODIO.cc index b19fc6bbd3..4b164a9903 100644 --- a/src/services/io/podio/JEventProcessorPODIO.cc +++ b/src/services/io/podio/JEventProcessorPODIO.cc @@ -219,10 +219,10 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "ReconstructedChargedParticles", "ReconstructedChargedParticleLinks", "ReconstructedChargedParticleAssociations", // Used by associations below - "MCScatteredElectronLinks", // Remove if/when used internally - "MCScatteredElectronAssociations", // Remove if/when used internally - "MCNonScatteredElectronLinks", // Remove if/when used internally - "MCNonScatteredElectronAssociations", // Remove if/when used internally + "MCScatteredElectronLinks", // Remove if/when used internally + "MCScatteredElectronAssociations", // Remove if/when used internally + "MCNonScatteredElectronLinks", // Remove if/when used internally + "MCNonScatteredElectronAssociations", // Remove if/when used internally "ReconstructedBreitFrameParticles", "ReconstructedNeutralParticles", From c54f4cba622cef36fb95979bd54733a2c9355008 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Wed, 12 Aug 2026 15:22:01 -0500 Subject: [PATCH 09/13] fix: re-add DRICHRawHitsAssociations --- src/services/io/podio/JEventProcessorPODIO.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/services/io/podio/JEventProcessorPODIO.cc b/src/services/io/podio/JEventProcessorPODIO.cc index 4b164a9903..871aaec588 100644 --- a/src/services/io/podio/JEventProcessorPODIO.cc +++ b/src/services/io/podio/JEventProcessorPODIO.cc @@ -124,6 +124,7 @@ JEventProcessorPODIO::JEventProcessorPODIO() { // DRICH "DRICHRawHits", "DRICHRawHitsLinks", + "DRICHRawHitsAssociations", "DRICHAerogelTracks", "DRICHGasTracks", "DRICHAerogelIrtCherenkovParticleID", From c8204ec8c0a623c2cf909a3854464d0acca6608d Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Wed, 12 Aug 2026 15:55:17 -0500 Subject: [PATCH 10/13] fix: rm TOF*SharedHitAssociations --- src/services/io/podio/JEventProcessorPODIO.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/services/io/podio/JEventProcessorPODIO.cc b/src/services/io/podio/JEventProcessorPODIO.cc index 871aaec588..88445935fd 100644 --- a/src/services/io/podio/JEventProcessorPODIO.cc +++ b/src/services/io/podio/JEventProcessorPODIO.cc @@ -103,14 +103,12 @@ JEventProcessorPODIO::JEventProcessorPODIO() { "TOFBarrelSharedRawHits", "TOFBarrelSharedRecHits", "TOFBarrelSharedRawHitLinks", - "TOFBarrelSharedRawHitAssociations", "TOFBarrelClusterHits", "TOFEndcapHits", "TOFEndcapSharedHits", "TOFEndcapSharedRawHits", "TOFEndcapSharedRecHits", "TOFEndcapSharedRawHitLinks", - "TOFEndcapSharedRawHitAssociations", "TOFEndcapClusterHits", "TOFBarrelADCTDC", "TOFEndcapADCTDC", From 82083785fc7d76b647ac28e5ac5ba19ed2ef7f75 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 20 Aug 2026 02:57:41 +0000 Subject: [PATCH 11/13] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/detectors/DRICH/DRICH.cc | 15 ++++++++------- .../pid/IrtCherenkovParticleID_factory.h | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/detectors/DRICH/DRICH.cc b/src/detectors/DRICH/DRICH.cc index 1d12adbeda..c69db6697b 100644 --- a/src/detectors/DRICH/DRICH.cc +++ b/src/detectors/DRICH/DRICH.cc @@ -138,15 +138,16 @@ void InitPlugin(JApplication* app) { "DRICHIrtCherenkovParticleID", {"DRICHAerogelTracks", "DRICHGasTracks", "DRICHMergedTracks", "DRICHRawHits", "DRICHRawHitsLinks", "DRICHRawHitsAssociations"}, - "DRICHRawHitsLinks", "DRICHRawHitsAssociations"}, + "DRICHRawHitsLinks", "DRICHRawHitsAssociations" +}, {"DRICHAerogelIrtCherenkovParticleID", "DRICHGasIrtCherenkovParticleID"}, irt_cfg, app)); - // merge aerogel and gas PID results - app->Add(new JOmniFactoryGeneratorT( - "DRICHMergedIrtCherenkovParticleID", - {"DRICHAerogelIrtCherenkovParticleID", "DRICHGasIrtCherenkovParticleID"}, - {"DRICHMergedIrtCherenkovParticleID"}, merge_cfg, app)); +// merge aerogel and gas PID results +app->Add(new JOmniFactoryGeneratorT( + "DRICHMergedIrtCherenkovParticleID", + {"DRICHAerogelIrtCherenkovParticleID", "DRICHGasIrtCherenkovParticleID"}, + {"DRICHMergedIrtCherenkovParticleID"}, merge_cfg, app)); - // clang-format on +// clang-format on } } diff --git a/src/factories/pid/IrtCherenkovParticleID_factory.h b/src/factories/pid/IrtCherenkovParticleID_factory.h index 06edb46950..7788a46a5f 100644 --- a/src/factories/pid/IrtCherenkovParticleID_factory.h +++ b/src/factories/pid/IrtCherenkovParticleID_factory.h @@ -77,7 +77,7 @@ class IrtCherenkovParticleID_factory 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 From 8dc32b4389d9dec424725aedf9c7ca91ea62b320 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Wed, 19 Aug 2026 22:04:36 -0500 Subject: [PATCH 12/13] fix: clean duplicated lines after rebase conflict resolution Remove duplicated input wiring lines introduced during conflict resolution in DRICH plugin wiring and IrtCherenkovParticleID factory. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- src/detectors/DRICH/DRICH.cc | 14 ++++++-------- src/factories/pid/IrtCherenkovParticleID_factory.h | 3 +-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/detectors/DRICH/DRICH.cc b/src/detectors/DRICH/DRICH.cc index c69db6697b..d5f7ee5cf1 100644 --- a/src/detectors/DRICH/DRICH.cc +++ b/src/detectors/DRICH/DRICH.cc @@ -138,16 +138,14 @@ void InitPlugin(JApplication* app) { "DRICHIrtCherenkovParticleID", {"DRICHAerogelTracks", "DRICHGasTracks", "DRICHMergedTracks", "DRICHRawHits", "DRICHRawHitsLinks", "DRICHRawHitsAssociations"}, - "DRICHRawHitsLinks", "DRICHRawHitsAssociations" -}, {"DRICHAerogelIrtCherenkovParticleID", "DRICHGasIrtCherenkovParticleID"}, irt_cfg, app)); -// merge aerogel and gas PID results -app->Add(new JOmniFactoryGeneratorT( - "DRICHMergedIrtCherenkovParticleID", - {"DRICHAerogelIrtCherenkovParticleID", "DRICHGasIrtCherenkovParticleID"}, - {"DRICHMergedIrtCherenkovParticleID"}, merge_cfg, app)); + // merge aerogel and gas PID results + app->Add(new JOmniFactoryGeneratorT( + "DRICHMergedIrtCherenkovParticleID", + {"DRICHAerogelIrtCherenkovParticleID", "DRICHGasIrtCherenkovParticleID"}, + {"DRICHMergedIrtCherenkovParticleID"}, merge_cfg, app)); -// clang-format on + // clang-format on } } diff --git a/src/factories/pid/IrtCherenkovParticleID_factory.h b/src/factories/pid/IrtCherenkovParticleID_factory.h index 7788a46a5f..bf410fb13f 100644 --- a/src/factories/pid/IrtCherenkovParticleID_factory.h +++ b/src/factories/pid/IrtCherenkovParticleID_factory.h @@ -75,9 +75,8 @@ 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 From fb47d04022cdee7ea1d944eb6e5f0cb150b5caaf Mon Sep 17 00:00:00 2001 From: epic-capybara <139920704+epic-capybara@users.noreply.github.com> Date: Wed, 19 Aug 2026 23:43:44 -0400 Subject: [PATCH 13/13] fix: remove *Associations from PODIO output collections (fix: iwyu) (#2877) This PR applies the include-what-you-use fixes as suggested by https://github.com/eic/EICrecon/actions/runs/32326935761. Please merge this PR into the branch `wdconinc-fluffy-invention` to resolve failures in PR #2822. Auto-generated by [create-pull-request][1] [1]: https://github.com/peter-evans/create-pull-request Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/global/reco/reco.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/global/reco/reco.cc b/src/global/reco/reco.cc index 2f7ed716b1..0f707d7621 100644 --- a/src/global/reco/reco.cc +++ b/src/global/reco/reco.cc @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include