Skip to content

fix: Remove redundant EDM4eic version guards for minimum 8.7 #2838

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
wdconinc merged 4 commits into from
Aug 12, 2026
Merged

fix: Remove redundant EDM4eic version guards for minimum 8.7 #2838

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ccd147
Remove EDM4eic version guards for minimum 8.7
Copilot Aug 6, 2026
a85dfad
Remove redundant EDM4eic version guards for minimum 8.7 (fix: iwyu) (…
epic-capybara Aug 7, 2026
896a3b3
fix: clang-tidy
wdconinc Aug 7, 2026
0ddb719
Merge branch 'main' into copilot/fix-edm4eic-minimum-version-guard
wdconinc Aug 11, 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
6 changes: 1 addition & 5 deletions src/algorithms/digi/CALOROCDigitization.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@
// Copyright (C) 2025 Minho Kim, Wouter Deconinck, Dmitry Kalinkin, Derek Anderson, Simon Gardner, Sylvester Joosten, Maria Zurek
//

#include <edm4eic/EDM4eicVersion.h>
#include <tuple>

#if EDM4EIC_VERSION_MAJOR > 8 || (EDM4EIC_VERSION_MAJOR == 8 && EDM4EIC_VERSION_MINOR >= 7)
#include <edm4eic/CALOROC1ASample.h>
#include <edm4eic/CALOROC1BSample.h>
#include <podio/RelationRange.h>
#include <algorithm>
#include <cmath>
#include <cstddef>
#include <tuple>
#include <vector>

#include "CALOROCDigitization.h"
Expand Down Expand Up @@ -140,4 +137,3 @@ double CALOROCDigitization::get_crossing_time(double thres, double dt, double t,
return (numerator / denominator) + added;
}
} // namespace eicrecon
#endif
5 changes: 1 addition & 4 deletions src/algorithms/tracking/TrackSeeding.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include <Acts/Utilities/KDTree.hpp> // IWYU pragma: keep FIXME KDTree missing in SeedFinderOrthogonal.hpp until Acts v23.0.0
#include <Acts/Utilities/Result.hpp>
#include <edm4eic/Cov6f.h>
#include <edm4eic/EDM4eicVersion.h>
#include <edm4hep/Vector2f.h>
#include <edm4hep/Vector3f.h>
#include <Eigen/Core>
Expand Down Expand Up @@ -136,10 +135,8 @@ void TrackSeeding::process(const Input& input, const Output& output) const {

// Add seed to collection
auto trk_seed = trk_seeds->create();
trk_seed.setPerigee({0.f, 0.f, 0.f});
#if EDM4EIC_VERSION_MAJOR > 8 || (EDM4EIC_VERSION_MAJOR == 8 && EDM4EIC_VERSION_MINOR > 5)
trk_seed.setPerigee({0.F, 0.F, 0.F});
trk_seed.setQuality(seedToAdd.seedQuality());
#endif
trk_seed.setParams(trackParams.value());
trk_seed.addToHits(*sps[0]->externalSpacePoint());
trk_seed.addToHits(*sps[1]->externalSpacePoint());
Expand Down
8 changes: 1 addition & 7 deletions src/detectors/BEMC/BEMC.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <JANA/JApplication.h>
#include <JANA/JApplicationFwd.h>
#include <JANA/Utils/JTypeInfo.h>
#include <edm4eic/EDM4eicVersion.h>
#include <edm4eic/unit_system.h>
#include <edm4hep/SimCalorimeterHit.h>
#include <cmath>
Expand Down Expand Up @@ -33,14 +32,11 @@
#include "factories/calorimetry/ImagingTopoCluster_factory.h"
#include "factories/calorimetry/SimCalorimeterHitProcessor_factory.h"
#include "factories/calorimetry/TruthEnergyPositionClusterMerger_factory.h"
#include "factories/digi/CALOROCDigitization_factory.h"
#include "factories/digi/PulseCombiner_factory.h"
#include "factories/digi/PulseGeneration_factory.h"
#include "factories/digi/PulseNoise_factory.h"

#if EDM4EIC_VERSION_MAJOR > 8 || (EDM4EIC_VERSION_MAJOR == 8 && EDM4EIC_VERSION_MINOR >= 7)
#include "factories/digi/CALOROCDigitization_factory.h"
#endif

extern "C" {
void InitPlugin(JApplication* app) {

Expand Down Expand Up @@ -187,7 +183,6 @@ void InitPlugin(JApplication* app) {
},
app // TODO: Remove me once fixed
));
#if EDM4EIC_VERSION_MAJOR > 8 || (EDM4EIC_VERSION_MAJOR == 8 && EDM4EIC_VERSION_MINOR >= 7)
app->Add(new JOmniFactoryGeneratorT<CALOROCDigitization_factory>(
"EcalBarrelScFiPCALOROCHits", {"EcalBarrelScFiPCombinedPulsesWithNoise"},
{"EcalBarrelScFiPCALOROCHits"},
Expand All @@ -214,7 +209,6 @@ void InitPlugin(JApplication* app) {
},
app // TODO: Remove me once fixed
));
#endif
app->Add(new JOmniFactoryGeneratorT<CalorimeterHitDigi_factory>(
"EcalBarrelScFiRawHits", {"EventHeader", "EcalBarrelScFiHits"},
{"EcalBarrelScFiRawHits", "EcalBarrelScFiRawHitLinks", "EcalBarrelScFiRawHitAssociations"},
Expand Down
3 changes: 0 additions & 3 deletions src/services/io/podio/JEventProcessorPODIO.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include <JANA/Services/JComponentManager.h>
#include <JANA/Services/JParameterManager.h>
#include <JANA/Utils/JTypeInfo.h>
#include <edm4eic/EDM4eicVersion.h>
#include <fmt/format.h>
#include <podio/CollectionBase.h>
#include <podio/Frame.h>
Expand Down Expand Up @@ -372,10 +371,8 @@ JEventProcessorPODIO::JEventProcessorPODIO() {
"EcalBarrelScFiNCombinedPulses",
"EcalBarrelScFiPCombinedPulsesWithNoise",
"EcalBarrelScFiNCombinedPulsesWithNoise",
#if EDM4EIC_VERSION_MAJOR > 8 || (EDM4EIC_VERSION_MAJOR == 8 && EDM4EIC_VERSION_MINOR >= 7)
"EcalBarrelScFiPCALOROCHits",
"EcalBarrelScFiNCALOROCHits",
#endif
"EcalBarrelScFiRecHits",
"EcalBarrelScFiClusters",
"EcalBarrelScFiClusterLinks",
Expand Down
5 changes: 1 addition & 4 deletions src/tests/algorithms_test/digi_CALOROCDigitization.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
// Copyright (C) 2026, Minho Kim

#include <catch2/catch_test_macros.hpp>
#include <edm4eic/EDM4eicVersion.h>
#include <podio/RelationRange.h>
#include <stdint.h>
#include <cstdint>
#include <cstddef>
#include <memory>

#if EDM4EIC_VERSION_MAJOR > 8 || (EDM4EIC_VERSION_MAJOR == 8 && EDM4EIC_VERSION_MINOR >= 7)
#include <edm4eic/RawCALOROCHitCollection.h>
#include <edm4eic/CALOROC1ASample.h>
#include <edm4eic/SimPulseCollection.h>
Expand Down Expand Up @@ -74,4 +72,3 @@ TEST_CASE("Test TOA calculation", "[CALOROCDigitization][TOACalculation]") {
REQUIRE(a_samples[0].timeOfArrival == TOA_expected);
}
}
#endif
Loading