diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7923345f6c..a35dba05eb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: hooks: - id: codespell - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v16.0.6 + rev: v20.1.0 hooks: - id: clang-format - repo: https://github.com/Lucas-C/pre-commit-hooks diff --git a/src/algorithms/calorimetry/CalorimeterClusterRecoCoG.h b/src/algorithms/calorimetry/CalorimeterClusterRecoCoG.h index c021143441..845996f053 100644 --- a/src/algorithms/calorimetry/CalorimeterClusterRecoCoG.h +++ b/src/algorithms/calorimetry/CalorimeterClusterRecoCoG.h @@ -69,19 +69,19 @@ class CalorimeterClusterRecoCoG : public CalorimeterClusterRecoCoGAlgorithm, public WithPodConfig { public: - CalorimeterClusterRecoCoG(std::string_view name) : CalorimeterClusterRecoCoGAlgorithm { - name, + CalorimeterClusterRecoCoG(std::string_view name) + : CalorimeterClusterRecoCoGAlgorithm{ + name, #if EDM4EIC_VERSION_MAJOR >= 7 - {"inputProtoClusterCollection", "mcRawHitAssocations"}, + {"inputProtoClusterCollection", "mcRawHitAssocations"}, #else - {"inputProtoClusterCollection", "mcHits"}, + {"inputProtoClusterCollection", "mcHits"}, #endif - {"outputClusterCollection", "outputAssociations"}, - "Reconstruct a cluster with the Center of Gravity method. For " - "simulation results it optionally creates a Cluster <-> MCParticle " - "association provided both optional arguments are provided." + {"outputClusterCollection", "outputAssociations"}, + "Reconstruct a cluster with the Center of Gravity method. For " + "simulation results it optionally creates a Cluster <-> MCParticle " + "association provided both optional arguments are provided."} { } - {} public: void init() final; diff --git a/src/algorithms/calorimetry/CalorimeterClusterShape.cc b/src/algorithms/calorimetry/CalorimeterClusterShape.cc index dde302c4f0..b76ff61a1f 100644 --- a/src/algorithms/calorimetry/CalorimeterClusterShape.cc +++ b/src/algorithms/calorimetry/CalorimeterClusterShape.cc @@ -155,7 +155,7 @@ void CalorimeterClusterShape::process(const CalorimeterClusterShape::Input& inpu axis_eigen(2, 0).real(), }; } // end if weight sum is nonzero - } // end if n hits > 1 + } // end if n hits > 1 // set shape parameters out_clust.addToShapeParameters(radius); @@ -200,7 +200,7 @@ void CalorimeterClusterShape::process(const CalorimeterClusterShape::Input& inpu out_assoc.setWeight(in_assoc.getWeight()); } } // end input association loop - } // end input cluster loop + } // end input cluster loop debug("Completed processing input clusters"); } // end 'process(Input&, Output&)' diff --git a/src/algorithms/calorimetry/CalorimeterHitDigi.h b/src/algorithms/calorimetry/CalorimeterHitDigi.h index e42b1c77fa..c0c541cf37 100644 --- a/src/algorithms/calorimetry/CalorimeterHitDigi.h +++ b/src/algorithms/calorimetry/CalorimeterHitDigi.h @@ -46,17 +46,18 @@ class CalorimeterHitDigi : public CalorimeterHitDigiAlgorithm, public WithPodConfig { public: - CalorimeterHitDigi(std::string_view name) : CalorimeterHitDigiAlgorithm { - name, {"inputHitCollection"}, + CalorimeterHitDigi(std::string_view name) + : CalorimeterHitDigiAlgorithm{ + name, + {"inputHitCollection"}, #if EDM4EIC_VERSION_MAJOR >= 7 - {"outputRawHitCollection", "outputRawHitAssociationCollection"}, + {"outputRawHitCollection", "outputRawHitAssociationCollection"}, #else - {"outputRawHitCollection"}, + {"outputRawHitCollection"}, #endif - "Smear energy deposit, digitize within ADC range, add pedestal, " - "convert time with smearing resolution, and sum signals." + "Smear energy deposit, digitize within ADC range, add pedestal, " + "convert time with smearing resolution, and sum signals."} { } - {} void init() final; void process(const Input&, const Output&) const final; diff --git a/src/algorithms/calorimetry/CalorimeterHitsMerger.cc b/src/algorithms/calorimetry/CalorimeterHitsMerger.cc index d08526354c..32bea8ec8e 100644 --- a/src/algorithms/calorimetry/CalorimeterHitsMerger.cc +++ b/src/algorithms/calorimetry/CalorimeterHitsMerger.cc @@ -82,7 +82,7 @@ void CalorimeterHitsMerger::init() { // loop through provided readout fields auto& svc = algorithms::ServiceSvc::instance(); - for (std::size_t iField = 0; std::string & field : fields) { + for (std::size_t iField = 0; std::string& field : fields) { // grab provided transformation and field const std::string field_transform = transforms.at(iField); diff --git a/src/algorithms/calorimetry/ImagingClusterReco.h b/src/algorithms/calorimetry/ImagingClusterReco.h index 44deb426a0..a7a96ef310 100644 --- a/src/algorithms/calorimetry/ImagingClusterReco.h +++ b/src/algorithms/calorimetry/ImagingClusterReco.h @@ -61,17 +61,17 @@ class ImagingClusterReco : public ImagingClusterRecoAlgorithm, public WithPodConfig { public: - ImagingClusterReco(std::string_view name) : ImagingClusterRecoAlgorithm { - name, + ImagingClusterReco(std::string_view name) + : ImagingClusterRecoAlgorithm{ + name, #if EDM4EIC_VERSION_MAJOR >= 7 - {"inputProtoClusterCollection", "mcRawHitAssocations"}, + {"inputProtoClusterCollection", "mcRawHitAssocations"}, #else - {"inputProtoClusterCollection", "mcHits"}, + {"inputProtoClusterCollection", "mcHits"}, #endif - {"outputClusterCollection", "outputClusterAssociations", "outputLayerCollection"}, - "Reconstruct the cluster/layer info for imaging calorimeter." + {"outputClusterCollection", "outputClusterAssociations", "outputLayerCollection"}, + "Reconstruct the cluster/layer info for imaging calorimeter."} { } - {} public: void init() {} diff --git a/src/algorithms/calorimetry/TrackClusterMergeSplitter.cc b/src/algorithms/calorimetry/TrackClusterMergeSplitter.cc index efe2f09228..7768f1a15e 100644 --- a/src/algorithms/calorimetry/TrackClusterMergeSplitter.cc +++ b/src/algorithms/calorimetry/TrackClusterMergeSplitter.cc @@ -173,7 +173,7 @@ void TrackClusterMergeSplitter::process(const TrackClusterMergeSplitter::Input& "pointing to merged cluster", mapClustToMerge[clustSeed].size(), eClustSum, sigSum, vecMatchProj.size()); } // end cluster loop - } // end matched cluster-projection loop + } // end matched cluster-projection loop // ------------------------------------------------------------------------ // 4. Create an output protocluster for each merged cluster and for @@ -222,7 +222,7 @@ void TrackClusterMergeSplitter::get_projections(const edm4eic::TrackSegmentColle relevant_projects.push_back(point); } } // end point loop - } // end projection loop + } // end projection loop debug("Collected relevant projections: {} to process", relevant_projects.size()); } // end 'get_projections(edm4eic::CalorimeterHit&, edm4eic::TrackSegmentCollection&, VecTrkPoint&)' @@ -355,7 +355,7 @@ void TrackClusterMergeSplitter::merge_and_split_clusters( } } // end hits to merge loop - } // end clusters to merge loop + } // end clusters to merge loop } // end 'merge_and_split_clusters(VecClust&, VecProj&, edm4eic::MutableCluster&)' diff --git a/src/algorithms/digi/EICROCDigitization.h b/src/algorithms/digi/EICROCDigitization.h index 4c00dc8859..38da213e03 100644 --- a/src/algorithms/digi/EICROCDigitization.h +++ b/src/algorithms/digi/EICROCDigitization.h @@ -27,7 +27,7 @@ class EICROCDigitization : public EICROCDigitizationAlgorithm, public: EICROCDigitization(std::string_view name) : EICROCDigitizationAlgorithm{name, {"EICROC"}, {"ADCTDCOutput"}, {}} {} - void init(){}; + void init() {}; void process(const Input&, const Output&) const final; }; diff --git a/src/algorithms/meta/CollectionCollector.h b/src/algorithms/meta/CollectionCollector.h index f1b9627d5d..9f478d3e32 100644 --- a/src/algorithms/meta/CollectionCollector.h +++ b/src/algorithms/meta/CollectionCollector.h @@ -26,7 +26,7 @@ template class CollectionCollector : public CollectionCollectorAlgorit "Merge content of collections into one subset collection"} { } - void init() final{}; + void init() final {}; void process(const typename CollectionCollector::Input& input, const typename CollectionCollector::Output& output) const final { diff --git a/src/algorithms/meta/FilterMatching.h b/src/algorithms/meta/FilterMatching.h index 205c6452df..a30502a9e6 100644 --- a/src/algorithms/meta/FilterMatching.h +++ b/src/algorithms/meta/FilterMatching.h @@ -37,7 +37,7 @@ class FilterMatching : public FilterMatchingAlgorithm::Input& input, diff --git a/src/algorithms/meta/SubDivideCollection.h b/src/algorithms/meta/SubDivideCollection.h index 267d42512e..f76ff6761c 100644 --- a/src/algorithms/meta/SubDivideCollection.h +++ b/src/algorithms/meta/SubDivideCollection.h @@ -30,9 +30,9 @@ class SubDivideCollection : public SubDivideCollectionAlgorithm, {"inputCollection"}, {"outputCollection"}, "Sub-Divide collection"} - , WithPodConfig>(){}; + , WithPodConfig>() {}; - void init() final{}; + void init() final {}; void process(const typename SubDivideCollectionAlgorithm::Input& input, const typename SubDivideCollectionAlgorithm::Output& output) const final { diff --git a/src/algorithms/meta/SubDivideFunctors.h b/src/algorithms/meta/SubDivideFunctors.h index f985d7bd7f..c26de86917 100644 --- a/src/algorithms/meta/SubDivideFunctors.h +++ b/src/algorithms/meta/SubDivideFunctors.h @@ -12,7 +12,7 @@ namespace eicrecon { // ---------------------------------------------------------------------------- template class RangeSplit { public: - RangeSplit(std::vector> ranges) : m_ranges(ranges){}; + RangeSplit(std::vector> ranges) : m_ranges(ranges) {}; template std::vector operator()(T& instance) const { std::vector ids; @@ -42,7 +42,7 @@ class GeometrySplit { , m_divisions(divisions) , is_init(std::make_shared()) , m_id_dec(std::make_shared()) - , m_div_ids(std::make_shared>()){}; + , m_div_ids(std::make_shared>()) {}; template std::vector operator()(T& instance) const { @@ -87,7 +87,7 @@ class GeometrySplit { // ---------------------------------------------------------------------------- template class ValueSplit { public: - ValueSplit(std::vector> ids) : m_ids(ids){}; + ValueSplit(std::vector> ids) : m_ids(ids) {}; template std::vector operator()(T& instance) const { std::vector ids; diff --git a/src/algorithms/pid/MergeTracks.h b/src/algorithms/pid/MergeTracks.h index 853ec1eb1c..ce465482a0 100644 --- a/src/algorithms/pid/MergeTracks.h +++ b/src/algorithms/pid/MergeTracks.h @@ -31,7 +31,7 @@ class MergeTracks : public MergeTracksAlgorithm { {"outputTrackSegments"}, "Effectively 'zip' the input track segments."} {} - void init() final{}; + void init() final {}; void process(const Input&, const Output&) const final; }; } // namespace eicrecon diff --git a/src/algorithms/pid/Tools.h b/src/algorithms/pid/Tools.h index fe38737945..f6edddd501 100644 --- a/src/algorithms/pid/Tools.h +++ b/src/algorithms/pid/Tools.h @@ -100,7 +100,7 @@ class Tools { for (double e = e0 + step; e < e1; e += step) ret.push_back(std::make_pair(e, a * e + b)); } //if - } //for entry + } //for entry return ret; } diff --git a/src/algorithms/reco/JetReconstruction.cc b/src/algorithms/reco/JetReconstruction.cc index 09dad9e089..a90fa990bb 100644 --- a/src/algorithms/reco/JetReconstruction.cc +++ b/src/algorithms/reco/JetReconstruction.cc @@ -154,7 +154,7 @@ void JetReconstruction::process( for (unsigned j = 0; j < csts.size(); j++) { jet_output.addToParticles(input_collection->at(csts[j].user_index())); } // for constituent j - } // for jet i + } // for jet i // return the jets return; diff --git a/src/algorithms/reco/MatchClusters.h b/src/algorithms/reco/MatchClusters.h index d99ae7dd64..5fab3420b8 100644 --- a/src/algorithms/reco/MatchClusters.h +++ b/src/algorithms/reco/MatchClusters.h @@ -37,7 +37,7 @@ class MatchClusters : public MatchClustersAlgorithm { {"ReconstructedParticles", "ReconstructedParticleAssociations"}, "Match tracks with clusters, and assign associations."} {} - void init() final{}; + void init() final {}; void process(const Input&, const Output&) const final; private: diff --git a/src/algorithms/reco/TrackClusterMatch.h b/src/algorithms/reco/TrackClusterMatch.h index a9286faa0a..507619503a 100644 --- a/src/algorithms/reco/TrackClusterMatch.h +++ b/src/algorithms/reco/TrackClusterMatch.h @@ -33,7 +33,7 @@ class TrackClusterMatch : public TrackClusterMatchAlgorithm, : TrackClusterMatchAlgorithm{ name, {"inputTracks", "inputClusters"}, {"outputParticles"}, ""} {} - void init() final{}; + void init() final {}; void process(const Input&, const Output&) const final; }; } // namespace eicrecon diff --git a/src/algorithms/reco/TransformBreitFrame.h b/src/algorithms/reco/TransformBreitFrame.h index 26ab2d06f7..ef627e7024 100644 --- a/src/algorithms/reco/TransformBreitFrame.h +++ b/src/algorithms/reco/TransformBreitFrame.h @@ -31,7 +31,7 @@ class TransformBreitFrame : public TransformBreitFrameAlgorithm, public WithPodC "Transforms a set of particles from the lab frame to the Breit frame"} {} // algorithm initialization - void init() final{}; + void init() final {}; // run algorithm void process(const Input&, const Output&) const final; diff --git a/src/algorithms/tracking/IterativeVertexFinder.cc b/src/algorithms/tracking/IterativeVertexFinder.cc index 1e6bd87975..5d7c093ad6 100644 --- a/src/algorithms/tracking/IterativeVertexFinder.cc +++ b/src/algorithms/tracking/IterativeVertexFinder.cc @@ -176,10 +176,10 @@ std::unique_ptr eicrecon::IterativeVertexFinder::prod par.getLoc().a / edm4eic::unit::mm, par.getLoc().b / edm4eic::unit::mm); eicvertex.addToAssociatedParticles(part); } // endif - } // end for par - } // end for trk - } // end for part - } // end for t + } // end for par + } // end for trk + } // end for part + } // end for t m_log->debug("One vertex found at (x,y,z) = ({}, {}, {}) mm.", vtx.position().x() / Acts::UnitConstants::mm, vtx.position().y() / Acts::UnitConstants::mm, diff --git a/src/benchmarks/reconstruction/tracking_efficiency/scripts/draw_Performance.C b/src/benchmarks/reconstruction/tracking_efficiency/scripts/draw_Performance.C index 78ecad12a8..ccc2d63abc 100644 --- a/src/benchmarks/reconstruction/tracking_efficiency/scripts/draw_Performance.C +++ b/src/benchmarks/reconstruction/tracking_efficiency/scripts/draw_Performance.C @@ -25,7 +25,7 @@ void draw_Performance(Int_t nevent = -1) { //=======Reading the root file DD4HEP=========== TFile* file = new TFile("tracking_test_gun.edm4eic.root"); // Tree with tracks and hits - // Create the tree reader and its data containers + // Create the tree reader and its data containers TTreeReader myReader("events", file); // name of tree and file TTreeReaderArray charge(myReader, "MCParticles.charge"); diff --git a/src/detectors/B0ECAL/B0ECAL.cc b/src/detectors/B0ECAL/B0ECAL.cc index 6d96aa9a1c..fbd123245b 100644 --- a/src/detectors/B0ECAL/B0ECAL.cc +++ b/src/detectors/B0ECAL/B0ECAL.cc @@ -79,14 +79,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "B0ECalClustersWithoutShapes", - { - "B0ECalIslandProtoClusters", // edm4eic::ProtoClusterCollection + {"B0ECalIslandProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "B0ECalRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "B0ECalRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "B0ECalHits" - }, // edm4hep::SimCalorimeterHitCollection + "B0ECalHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"B0ECalClustersWithoutShapes", // edm4eic::Cluster "B0ECalClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -100,14 +97,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "B0ECalTruthClustersWithoutShapes", - { - "B0ECalTruthProtoClusters", // edm4eic::ProtoClusterCollection + {"B0ECalTruthProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "B0ECalRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "B0ECalRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "B0ECalHits" - }, // edm4hep::SimCalorimeterHitCollection + "B0ECalHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"B0ECalTruthClustersWithoutShapes", // edm4eic::Cluster "B0ECalTruthClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation diff --git a/src/detectors/BEMC/BEMC.cc b/src/detectors/BEMC/BEMC.cc index a192b09e61..c90e3277d9 100644 --- a/src/detectors/BEMC/BEMC.cc +++ b/src/detectors/BEMC/BEMC.cc @@ -92,14 +92,11 @@ void InitPlugin(JApplication* app) { )); app->Add(new JOmniFactoryGeneratorT( "EcalBarrelScFiClustersWithoutShapes", - { - "EcalBarrelScFiProtoClusters", // edm4eic::ProtoClusterCollection + {"EcalBarrelScFiProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "EcalBarrelScFiRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociation + "EcalBarrelScFiRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociation #else - "EcalBarrelScFiHits" - }, // edm4hep::SimCalorimeterHitCollection + "EcalBarrelScFiHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"EcalBarrelScFiClustersWithoutShapes", // edm4eic::Cluster "EcalBarrelScFiClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -176,14 +173,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "EcalBarrelImagingClusters", - { - "EcalBarrelImagingProtoClusters", + {"EcalBarrelImagingProtoClusters", #if EDM4EIC_VERSION_MAJOR >= 7 - "EcalBarrelImagingRawHitAssociations" - }, + "EcalBarrelImagingRawHitAssociations"}, #else - "EcalBarrelImagingHits" - }, + "EcalBarrelImagingHits"}, #endif {"EcalBarrelImagingClusters", "EcalBarrelImagingClusterAssociations", "EcalBarrelImagingLayers"}, diff --git a/src/detectors/BHCAL/BHCAL.cc b/src/detectors/BHCAL/BHCAL.cc index e85fd87152..9e2b32c2fe 100644 --- a/src/detectors/BHCAL/BHCAL.cc +++ b/src/detectors/BHCAL/BHCAL.cc @@ -120,14 +120,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "HcalBarrelClustersWithoutShapes", - { - "HcalBarrelIslandProtoClusters", // edm4eic::ProtoClusterCollection + {"HcalBarrelIslandProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "HcalBarrelRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "HcalBarrelRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "HcalBarrelHits" - }, // edm4hep::SimCalorimeterHitCollection + "HcalBarrelHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"HcalBarrelClustersWithoutShapes", // edm4eic::Cluster "HcalBarrelClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -143,14 +140,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "HcalBarrelTruthClustersWithoutShapes", - { - "HcalBarrelTruthProtoClusters", // edm4eic::ProtoClusterCollection + {"HcalBarrelTruthProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "HcalBarrelRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "HcalBarrelRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "HcalBarrelHits" - }, // edm4hep::SimCalorimeterHitCollection + "HcalBarrelHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"HcalBarrelTruthClustersWithoutShapes", // edm4eic::Cluster "HcalBarrelTruthClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -180,14 +174,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "HcalBarrelSplitMergeClustersWithoutShapes", - { - "HcalBarrelSplitMergeProtoClusters", // edm4eic::ProtoClusterCollection + {"HcalBarrelSplitMergeProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "HcalBarrelRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "HcalBarrelRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "HcalBarrelHits" - }, // edm4hep::SimCalorimeterHitCollection + "HcalBarrelHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"HcalBarrelSplitMergeClustersWithoutShapes", // edm4eic::Cluster "HcalBarrelSplitMergeClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation diff --git a/src/detectors/EEMC/EEMC.cc b/src/detectors/EEMC/EEMC.cc index efa9dc060b..c9da9832ac 100644 --- a/src/detectors/EEMC/EEMC.cc +++ b/src/detectors/EEMC/EEMC.cc @@ -99,14 +99,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "EcalEndcapNTruthClustersWithoutShapes", - { - "EcalEndcapNTruthProtoClusters", // edm4eic::ProtoClusterCollection + {"EcalEndcapNTruthProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "EcalEndcapNRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "EcalEndcapNRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "EcalEndcapNHits" - }, // edm4hep::SimCalorimeterHitCollection + "EcalEndcapNHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"EcalEndcapNTruthClustersWithoutShapes", // edm4eic::Cluster "EcalEndcapNTruthClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -126,14 +123,11 @@ void InitPlugin(JApplication* app) { #else "EcalEndcapNClustersWithoutShapes", #endif - { - "EcalEndcapNIslandProtoClusters", // edm4eic::ProtoClusterCollection + {"EcalEndcapNIslandProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "EcalEndcapNRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "EcalEndcapNRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "EcalEndcapNHits" - }, // edm4hep::SimCalorimeterHitCollection + "EcalEndcapNHits"}, // edm4hep::SimCalorimeterHitCollection #endif #if EDM4EIC_VERSION_MAJOR >= 8 {"EcalEndcapNClustersWithoutPIDAndShapes", // edm4eic::Cluster @@ -220,14 +214,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "EcalEndcapNSplitMergeClustersWithoutShapes", - { - "EcalEndcapNSplitMergeProtoClusters", // edm4eic::ProtoClusterCollection + {"EcalEndcapNSplitMergeProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "EcalEndcapNRawHitAssociations" - }, // edm4hep::MCRecoCalorimeterHitAssociationCollection + "EcalEndcapNRawHitAssociations"}, // edm4hep::MCRecoCalorimeterHitAssociationCollection #else - "EcalEndcapNHits" - }, // edm4hep::SimCalorimeterHitCollection + "EcalEndcapNHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"EcalEndcapNSplitMergeClustersWithoutShapes", // edm4eic::Cluster "EcalEndcapNSplitMergeClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation diff --git a/src/detectors/EHCAL/EHCAL.cc b/src/detectors/EHCAL/EHCAL.cc index f8262514ea..84ff207788 100644 --- a/src/detectors/EHCAL/EHCAL.cc +++ b/src/detectors/EHCAL/EHCAL.cc @@ -98,14 +98,11 @@ void InitPlugin(JApplication* app) { )); app->Add(new JOmniFactoryGeneratorT( "HcalEndcapNTruthClustersWithoutShapes", - { - "HcalEndcapNTruthProtoClusters", // edm4eic::ProtoClusterCollection + {"HcalEndcapNTruthProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "HcalEndcapNRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "HcalEndcapNRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "HcalEndcapNHits" - }, // edm4hep::SimCalorimeterHitCollection + "HcalEndcapNHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"HcalEndcapNTruthClustersWithoutShapes", // edm4eic::Cluster "HcalEndcapNTruthClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -119,14 +116,11 @@ void InitPlugin(JApplication* app) { {.energyWeight = "log", .logWeightBase = 6.2}, app)); app->Add(new JOmniFactoryGeneratorT( "HcalEndcapNClustersWithoutShapes", - { - "HcalEndcapNIslandProtoClusters", // edm4eic::ProtoClusterCollection + {"HcalEndcapNIslandProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "HcalEndcapNRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "HcalEndcapNRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "HcalEndcapNHits" - }, // edm4hep::SimCalorimeterHitCollection + "HcalEndcapNHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"HcalEndcapNClustersWithoutShapes", // edm4eic::Cluster "HcalEndcapNClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -158,14 +152,11 @@ void InitPlugin(JApplication* app) { )); app->Add(new JOmniFactoryGeneratorT( "HcalEndcapNSplitMergeClustersWithoutShapes", - { - "HcalEndcapNSplitMergeProtoClusters", // edm4eic::ProtoClusterCollection + {"HcalEndcapNSplitMergeProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "HcalEndcapNRawHitAssociations" - }, // edm4hep::MCRecoCalorimeterHitAssociationCollection + "HcalEndcapNRawHitAssociations"}, // edm4hep::MCRecoCalorimeterHitAssociationCollection #else - "HcalEndcapNHits" - }, // edm4hep::SimCalorimeterHitCollection + "HcalEndcapNHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"HcalEndcapNSplitMergeClustersWithoutShapes", // edm4eic::Cluster "HcalEndcapNSplitMergeClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation diff --git a/src/detectors/FEMC/FEMC.cc b/src/detectors/FEMC/FEMC.cc index 805cdfb51b..f67171f602 100644 --- a/src/detectors/FEMC/FEMC.cc +++ b/src/detectors/FEMC/FEMC.cc @@ -92,14 +92,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "EcalEndcapPTruthClustersWithoutShapes", - { - "EcalEndcapPTruthProtoClusters", // edm4eic::ProtoClusterCollection + {"EcalEndcapPTruthProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "EcalEndcapPRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "EcalEndcapPRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "EcalEndcapPHits" - }, // edm4hep::SimCalorimeterHitCollection + "EcalEndcapPHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"EcalEndcapPTruthClustersWithoutShapes", // edm4eic::Cluster "EcalEndcapPTruthClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -115,14 +112,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "EcalEndcapPClustersWithoutShapes", - { - "EcalEndcapPIslandProtoClusters", // edm4eic::ProtoClusterCollection + {"EcalEndcapPIslandProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "EcalEndcapPRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "EcalEndcapPRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "EcalEndcapPHits" - }, // edm4hep::SimCalorimeterHitCollection + "EcalEndcapPHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"EcalEndcapPClustersWithoutShapes", // edm4eic::Cluster "EcalEndcapPClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -157,14 +151,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "EcalEndcapPSplitMergeClustersWithoutShapes", - { - "EcalEndcapPSplitMergeProtoClusters", // edm4eic::ProtoClusterCollection + {"EcalEndcapPSplitMergeProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "EcalEndcapPRawHitAssociations" - }, // edm4hep::MCRecoCalorimeterHitAssociationCollection + "EcalEndcapPRawHitAssociations"}, // edm4hep::MCRecoCalorimeterHitAssociationCollection #else - "EcalEndcapPHits" - }, // edm4hep::SimCalorimeterHitCollection + "EcalEndcapPHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"EcalEndcapPSplitMergeClustersWithoutShapes", // edm4eic::Cluster "EcalEndcapPSplitMergeClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -242,14 +233,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "EcalEndcapPInsertTruthClustersWithoutShapes", - { - "EcalEndcapPInsertTruthProtoClusters", // edm4eic::ProtoClusterCollection + {"EcalEndcapPInsertTruthProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "EcalEndcapPInsertRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitCollection + "EcalEndcapPInsertRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitCollection #else - "EcalEndcapPInsertHits" - }, // edm4hep::SimCalorimeterHitCollection + "EcalEndcapPInsertHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"EcalEndcapPInsertTruthClustersWithoutShapes", // edm4eic::Cluster "EcalEndcapPInsertTruthClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -266,14 +254,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "EcalEndcapPInsertClustersWithoutShapes", - { - "EcalEndcapPInsertIslandProtoClusters", // edm4eic::ProtoClusterCollection + {"EcalEndcapPInsertIslandProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "EcalEndcapPInsertRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitCollection + "EcalEndcapPInsertRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitCollection #else - "EcalEndcapPInsertHits" - }, // edm4hep::SimCalorimeterHitCollection + "EcalEndcapPInsertHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"EcalEndcapPInsertClustersWithoutShapes", // edm4eic::Cluster "EcalEndcapPInsertClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation diff --git a/src/detectors/FHCAL/FHCAL.cc b/src/detectors/FHCAL/FHCAL.cc index 2d48fab350..c653994327 100644 --- a/src/detectors/FHCAL/FHCAL.cc +++ b/src/detectors/FHCAL/FHCAL.cc @@ -131,14 +131,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "HcalEndcapPInsertTruthClustersWithoutShapes", - { - "HcalEndcapPInsertTruthProtoClusters", // edm4eic::ProtoClusterCollection + {"HcalEndcapPInsertTruthProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "HcalEndcapPInsertRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "HcalEndcapPInsertRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "HcalEndcapPInsertHits" - }, // edm4hep::SimCalorimeterHitCollection + "HcalEndcapPInsertHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"HcalEndcapPInsertTruthClustersWithoutShapes", // edm4eic::Cluster "HcalEndcapPInsertTruthClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -155,14 +152,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "HcalEndcapPInsertClustersWithoutShapes", - { - "HcalEndcapPInsertImagingProtoClusters", // edm4eic::ProtoClusterCollection + {"HcalEndcapPInsertImagingProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "HcalEndcapPInsertRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "HcalEndcapPInsertRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "HcalEndcapPInsertHits" - }, // edm4hep::SimCalorimeterHitCollection + "HcalEndcapPInsertHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"HcalEndcapPInsertClustersWithoutShapes", // edm4eic::Cluster "HcalEndcapPInsertClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -272,14 +266,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "LFHCALTruthClustersWithoutShapes", - { - "LFHCALTruthProtoClusters", // edm4eic::ProtoClusterCollection + {"LFHCALTruthProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "LFHCALRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "LFHCALRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "LFHCALHits" - }, // edm4hep::SimCalorimeterHitCollection + "LFHCALHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"LFHCALTruthClustersWithoutShapes", // edm4eic::Cluster "LFHCALTruthClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -295,14 +286,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "LFHCALClustersWithoutShapes", - { - "LFHCALIslandProtoClusters", // edm4eic::ProtoClusterCollection + {"LFHCALIslandProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "LFHCALRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "LFHCALRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "LFHCALHits" - }, // edm4hep::SimCalorimeterHitCollection + "LFHCALHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"LFHCALClustersWithoutShapes", // edm4eic::Cluster "LFHCALClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -335,14 +323,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "LFHCALSplitMergeClustersWithoutShapes", - { - "LFHCALSplitMergeProtoClusters", // edm4eic::ProtoClusterCollection + {"LFHCALSplitMergeProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "LFHCALRawHitAssociations" - }, // edm4hep::MCRecoCalorimeterHitAssociationCollection + "LFHCALRawHitAssociations"}, // edm4hep::MCRecoCalorimeterHitAssociationCollection #else - "LFHCALHits" - }, // edm4hep::SimCalorimeterHitCollection + "LFHCALHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"LFHCALSplitMergeClustersWithoutShapes", // edm4eic::Cluster "LFHCALSplitMergeClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation diff --git a/src/detectors/LUMISPECCAL/LUMISPECCAL.cc b/src/detectors/LUMISPECCAL/LUMISPECCAL.cc index 520cee0f91..80679d5926 100644 --- a/src/detectors/LUMISPECCAL/LUMISPECCAL.cc +++ b/src/detectors/LUMISPECCAL/LUMISPECCAL.cc @@ -85,14 +85,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "EcalLumiSpecClustersWithoutShapes", - { - "EcalLumiSpecIslandProtoClusters", // edm4eic::ProtoClusterCollection + {"EcalLumiSpecIslandProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "EcalLumiSpecRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "EcalLumiSpecRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "EcalLumiSpecHits" - }, // edm4hep::SimCalorimeterHitCollection + "EcalLumiSpecHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"EcalLumiSpecClustersWithoutShapes", // edm4eic::Cluster "EcalLumiSpecClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -107,14 +104,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "EcalLumiSpecTruthClustersWithoutShapes", - { - "EcalLumiSpecTruthProtoClusters", // edm4eic::ProtoClusterCollection + {"EcalLumiSpecTruthProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "EcalLumiSpecRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "EcalLumiSpecRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "EcalLumiSpecHits" - }, // edm4hep::SimCalorimeterHitCollection + "EcalLumiSpecHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"EcalLumiSpecTruthClustersWithoutShapes", // edm4eic::Cluster "EcalLumiSpecTruthClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation diff --git a/src/detectors/ZDC/ZDC.cc b/src/detectors/ZDC/ZDC.cc index 2a12a25952..b554e74330 100644 --- a/src/detectors/ZDC/ZDC.cc +++ b/src/detectors/ZDC/ZDC.cc @@ -84,14 +84,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "EcalFarForwardZDCTruthClustersWithoutShapes", - { - "EcalFarForwardZDCTruthProtoClusters", // edm4eic::ProtoClusterCollection + {"EcalFarForwardZDCTruthProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "EcalFarForwardZDCRawHitAssociations" - }, // edm4eic::MCRecoClusterHitAssociationCollection + "EcalFarForwardZDCRawHitAssociations"}, // edm4eic::MCRecoClusterHitAssociationCollection #else - "EcalFarForwardZDCHits" - }, // edm4hep::SimCalorimeterHitCollection + "EcalFarForwardZDCHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"EcalFarForwardZDCTruthClustersWithoutShapes", // edm4eic::Cluster "EcalFarForwardZDCTruthClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -108,14 +105,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "EcalFarForwardZDCClustersWithoutShapes", - { - "EcalFarForwardZDCIslandProtoClusters", // edm4eic::ProtoClusterCollection + {"EcalFarForwardZDCIslandProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "EcalFarForwardZDCRawHitAssociations" - }, // edm4eic::MCRecoClusterHitAssociationCollection + "EcalFarForwardZDCRawHitAssociations"}, // edm4eic::MCRecoClusterHitAssociationCollection #else - "EcalFarForwardZDCHits" - }, // edm4hep::SimCalorimeterHitCollection + "EcalFarForwardZDCHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"EcalFarForwardZDCClustersWithoutShapes", // edm4eic::Cluster "EcalFarForwardZDCClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -219,14 +213,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "HcalFarForwardZDCClustersWithoutShapes", - { - "HcalFarForwardZDCImagingProtoClusters", // edm4eic::ProtoClusterCollection + {"HcalFarForwardZDCImagingProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "HcalFarForwardZDCRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "HcalFarForwardZDCRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "HcalFarForwardZDCHits" - }, // edm4hep::SimCalorimeterHitCollection + "HcalFarForwardZDCHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"HcalFarForwardZDCClustersWithoutShapes", // edm4eic::Cluster "HcalFarForwardZDCClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -273,14 +264,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "HcalFarForwardZDCTruthClustersWithoutShapes", - { - "HcalFarForwardZDCTruthProtoClusters", // edm4eic::ProtoClusterCollection + {"HcalFarForwardZDCTruthProtoClusters", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "HcalFarForwardZDCRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "HcalFarForwardZDCRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "HcalFarForwardZDCHits" - }, // edm4hep::SimCalorimeterHitCollection + "HcalFarForwardZDCHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"HcalFarForwardZDCTruthClustersWithoutShapes", // edm4eic::Cluster "HcalFarForwardZDCTruthClusterAssociationsWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation @@ -297,14 +285,11 @@ void InitPlugin(JApplication* app) { app->Add(new JOmniFactoryGeneratorT( "HcalFarForwardZDCClustersBaselineWithoutShapes", - { - "HcalFarForwardZDCIslandProtoClustersBaseline", // edm4eic::ProtoClusterCollection + {"HcalFarForwardZDCIslandProtoClustersBaseline", // edm4eic::ProtoClusterCollection #if EDM4EIC_VERSION_MAJOR >= 7 - "HcalFarForwardZDCRawHitAssociations" - }, // edm4eic::MCRecoCalorimeterHitAssociationCollection + "HcalFarForwardZDCRawHitAssociations"}, // edm4eic::MCRecoCalorimeterHitAssociationCollection #else - "HcalFarForwardZDCHits" - }, // edm4hep::SimCalorimeterHitCollection + "HcalFarForwardZDCHits"}, // edm4hep::SimCalorimeterHitCollection #endif {"HcalFarForwardZDCClustersBaselineWithoutShapes", // edm4eic::Cluster "HcalFarForwardZDCClusterAssociationsBaselineWithoutShapes"}, // edm4eic::MCRecoClusterParticleAssociation diff --git a/src/factories/calorimetry/TrackClusterMergeSplitter_factory.h b/src/factories/calorimetry/TrackClusterMergeSplitter_factory.h index b48379eb28..05416a6fac 100644 --- a/src/factories/calorimetry/TrackClusterMergeSplitter_factory.h +++ b/src/factories/calorimetry/TrackClusterMergeSplitter_factory.h @@ -53,8 +53,7 @@ class TrackClusterMergeSplitter_factory m_algo->init(m_geoSvc().detector()); } - void ChangeRun(int64_t run_number) { /* nothing to do here */ - } + void ChangeRun(int64_t run_number) { /* nothing to do here */ } void Process(int64_t run_number, uint64_t event_number) { m_algo->process({m_protoclusters_input(), m_track_projections_input()}, diff --git a/src/factories/meta/FilterMatching_factory.h b/src/factories/meta/FilterMatching_factory.h index 802296bfca..912d4624ce 100644 --- a/src/factories/meta/FilterMatching_factory.h +++ b/src/factories/meta/FilterMatching_factory.h @@ -16,7 +16,7 @@ class FilterMatching_factory public: using AlgoT = eicrecon::FilterMatching; + FilterByObjectT, FilterByMemberFunctionPtr>; using FactoryT = JOmniFactory>; diff --git a/src/factories/reco/JetReconstruction_factory.h b/src/factories/reco/JetReconstruction_factory.h index 05052f08ba..ece6aee57d 100644 --- a/src/factories/reco/JetReconstruction_factory.h +++ b/src/factories/reco/JetReconstruction_factory.h @@ -58,8 +58,7 @@ class JetReconstruction_factory m_algo->init(); } - void ChangeRun(int64_t run_number) { /* nothing to do */ - } + void ChangeRun(int64_t run_number) { /* nothing to do */ } void Process(int64_t run_number, int64_t event_number) { m_algo->process({m_input()}, {m_output().get()}); diff --git a/src/factories/reco/TransformBreitFrame_factory.h b/src/factories/reco/TransformBreitFrame_factory.h index 030fe16acc..944360ef2e 100644 --- a/src/factories/reco/TransformBreitFrame_factory.h +++ b/src/factories/reco/TransformBreitFrame_factory.h @@ -44,8 +44,7 @@ class TransformBreitFrame_factory : public JOmniFactoryinit(); } - void ChangeRun(int64_t run_number) { /* nothing to do */ - } + void ChangeRun(int64_t run_number) { /* nothing to do */ } void Process(int64_t run_number, int64_t event_number) { m_algo->process({m_in_mcpart(), m_in_kine(), m_in_part()}, {m_out_part().get()}); diff --git a/src/global/pid/MatchToRICHPID_factory.h b/src/global/pid/MatchToRICHPID_factory.h index 2c19e2a0b7..98ca5f4c01 100644 --- a/src/global/pid/MatchToRICHPID_factory.h +++ b/src/global/pid/MatchToRICHPID_factory.h @@ -35,7 +35,7 @@ class MatchToRICHPID_factory : public JOmniFactoryinit(); }; - void ChangeRun(int64_t run_number){}; + void ChangeRun(int64_t run_number) {}; void Process(int64_t run_number, uint64_t event_number) { m_algo->process( diff --git a/src/global/reco/ChargedMCParticleSelector_factory.h b/src/global/reco/ChargedMCParticleSelector_factory.h index d533942055..a8c30944f8 100644 --- a/src/global/reco/ChargedMCParticleSelector_factory.h +++ b/src/global/reco/ChargedMCParticleSelector_factory.h @@ -27,8 +27,7 @@ class ChargedMCParticleSelector_factory m_algo->init(logger()); } - void ChangeRun(int64_t run_number) { /* nothing to do */ - } + void ChangeRun(int64_t run_number) { /* nothing to do */ } void Process(int64_t run_number, int64_t event_number) { m_pars_out() = m_algo->process(m_pars_in()); diff --git a/src/global/reco/ChargedReconstructedParticleSelector_factory.h b/src/global/reco/ChargedReconstructedParticleSelector_factory.h index d985863786..a9850376b6 100644 --- a/src/global/reco/ChargedReconstructedParticleSelector_factory.h +++ b/src/global/reco/ChargedReconstructedParticleSelector_factory.h @@ -27,8 +27,7 @@ class ChargedReconstructedParticleSelector_factory m_algo->init(logger()); } - void ChangeRun(int64_t run_number) { /* nothing to do */ - } + void ChangeRun(int64_t run_number) { /* nothing to do */ } void Process(int64_t run_number, int64_t event_number) { m_pars_out() = m_algo->process(m_pars_in()); diff --git a/src/global/tracking/ActsToTracks_factory.h b/src/global/tracking/ActsToTracks_factory.h index 2ed21fe3b5..88f1f2444f 100644 --- a/src/global/tracking/ActsToTracks_factory.h +++ b/src/global/tracking/ActsToTracks_factory.h @@ -32,7 +32,7 @@ class ActsToTracks_factory : public JOmniFactory { m_algo->init(); }; - void ChangeRun(int64_t run_number){}; + void ChangeRun(int64_t run_number) {}; void Process(int64_t run_number, uint64_t event_number) { std::vector> acts_trajectories_input; diff --git a/src/global/tracking/TracksToParticles_factory.h b/src/global/tracking/TracksToParticles_factory.h index 8a8dc64216..8ce0792176 100644 --- a/src/global/tracking/TracksToParticles_factory.h +++ b/src/global/tracking/TracksToParticles_factory.h @@ -33,7 +33,7 @@ class TracksToParticles_factory : public JOmniFactoryinit(); }; - void ChangeRun(int64_t run_number){}; + void ChangeRun(int64_t run_number) {}; void Process(int64_t run_number, uint64_t event_number) { m_algo->process({m_tracks_input(), m_trackassocs_input()}, diff --git a/src/services/algorithms_init/AlgorithmsInit_service.h b/src/services/algorithms_init/AlgorithmsInit_service.h index 0d59be44b3..933c2344b5 100644 --- a/src/services/algorithms_init/AlgorithmsInit_service.h +++ b/src/services/algorithms_init/AlgorithmsInit_service.h @@ -23,8 +23,8 @@ */ class AlgorithmsInit_service : public JService { public: - AlgorithmsInit_service(JApplication* app){}; - virtual ~AlgorithmsInit_service(){}; + AlgorithmsInit_service(JApplication* app) {}; + virtual ~AlgorithmsInit_service() {}; void acquire_services(JServiceLocator* srv_locator) override { auto& serviceSvc = algorithms::ServiceSvc::instance(); diff --git a/src/services/geometry/acts/ACTSGeo_service.cc b/src/services/geometry/acts/ACTSGeo_service.cc index 11c4b5ac2c..d95583b679 100644 --- a/src/services/geometry/acts/ACTSGeo_service.cc +++ b/src/services/geometry/acts/ACTSGeo_service.cc @@ -19,7 +19,7 @@ // Virtual destructor implementation to pin vtable and typeinfo to this // translation unit -ACTSGeo_service::~ACTSGeo_service(){}; +ACTSGeo_service::~ACTSGeo_service() {}; //---------------------------------------------------------------- // detector diff --git a/src/services/geometry/richgeo/IrtGeoPFRICH.cc b/src/services/geometry/richgeo/IrtGeoPFRICH.cc index c9d872db05..a69ee107d0 100644 --- a/src/services/geometry/richgeo/IrtGeoPFRICH.cc +++ b/src/services/geometry/richgeo/IrtGeoPFRICH.cc @@ -173,7 +173,7 @@ void richgeo::IrtGeoPFRICH::DD4hep_to_IRT() { } } // if sensor found - } // search for sensors + } // search for sensors // set reference refractive indices // NOTE: numbers may be overridden externally std::map rIndices; diff --git a/src/services/geometry/richgeo/ReadoutGeo.cc b/src/services/geometry/richgeo/ReadoutGeo.cc index f2fb30885e..36c239f578 100644 --- a/src/services/geometry/richgeo/ReadoutGeo.cc +++ b/src/services/geometry/richgeo/ReadoutGeo.cc @@ -82,7 +82,7 @@ richgeo::ReadoutGeo::ReadoutGeo(std::string detName_, gsl::not_null lambda, float p) { diff --git a/src/services/geometry/richgeo/RichGeo.h b/src/services/geometry/richgeo/RichGeo.h index 25776e5e69..dea41c33ee 100644 --- a/src/services/geometry/richgeo/RichGeo.h +++ b/src/services/geometry/richgeo/RichGeo.h @@ -19,8 +19,8 @@ using CellIDType = decltype(edm4hep::SimTrackerHitData::cellID); */ class Sensor { public: - Sensor(){}; - ~Sensor(){}; + Sensor() {}; + ~Sensor() {}; double size; dd4hep::Position surface_centroid; dd4hep::Direction surface_offset; // surface centroid = volume centroid + `surface_offset` diff --git a/src/services/io/podio/JEventProcessorPODIO.cc b/src/services/io/podio/JEventProcessorPODIO.cc index d6e24dc547..d0ec72e4ff 100644 --- a/src/services/io/podio/JEventProcessorPODIO.cc +++ b/src/services/io/podio/JEventProcessorPODIO.cc @@ -41,313 +41,313 @@ JEventProcessorPODIO::JEventProcessorPODIO() { // Get the list of output collections to include/exclude std::vector output_collections = { - // Header and other metadata - "EventHeader", - - // Truth record - "MCParticles", - "MCBeamElectrons", - "MCBeamProtons", - "MCScatteredElectrons", - "MCScatteredProtons", - "MCParticlesHeadOnFrameNoBeamFX", - - // All tracking hits combined - "CentralTrackTruthSeeds", - "CentralTrackingRecHits", - "CentralTrackingRawHitAssociations", - "CentralTrackSeedingResults", - "CentralTrackerMeasurements", - - // Si tracker hits - "SiBarrelTrackerRecHits", - "SiBarrelVertexRecHits", - "SiEndcapTrackerRecHits", - - "SiBarrelRawHits", - "SiBarrelVertexRawHits", - "SiEndcapTrackerRawHits", - - "SiBarrelHits", - "VertexBarrelHits", - "TrackerEndcapHits", - - "SiBarrelRawHitAssociations", - "SiBarrelVertexRawHitAssociations", - "SiEndcapTrackerRawHitAssociations", - - // TOF - "TOFBarrelRecHits", - "TOFEndcapRecHits", - - "TOFBarrelRawHits", - "TOFEndcapRawHits", - - "TOFBarrelHits", - "TOFBarrelADCTDC", - "TOFEndcapHits", - - "TOFBarrelRawHitAssociations", - "TOFEndcapRawHitAssociations", - - "CombinedTOFTruthSeededParticleIDs", - "CombinedTOFParticleIDs", - - // DRICH - "DRICHRawHits", - "DRICHRawHitsAssociations", - "DRICHAerogelTracks", - "DRICHGasTracks", - "DRICHAerogelIrtCherenkovParticleID", - "DRICHGasIrtCherenkovParticleID", - "DRICHTruthSeededParticleIDs", - "DRICHParticleIDs", - - // PFRICH - "RICHEndcapNRawHits", - "RICHEndcapNRawHitsAssociations", - "RICHEndcapNTruthSeededParticleIDs", - "RICHEndcapNParticleIDs", - - // MPGD - "MPGDBarrelRecHits", - "OuterMPGDBarrelRecHits", - "BackwardMPGDEndcapRecHits", - "ForwardMPGDEndcapRecHits", - - "MPGDBarrelRawHits", - "OuterMPGDBarrelRawHits", - "BackwardMPGDEndcapRawHits", - "ForwardMPGDEndcapRawHits", - - "MPGDBarrelHits", - "OuterMPGDBarrelHits", - "BackwardMPGDEndcapHits", - "ForwardMPGDEndcapHits", - - "MPGDBarrelRawHitAssociations", - "OuterMPGDBarrelRawHitAssociations", - "BackwardMPGDEndcapRawHitAssociations", - "ForwardMPGDEndcapRawHitAssociations", - - // LOWQ2 hits - "TaggerTrackerHits", - "TaggerTrackerHitPulses", - "TaggerTrackerCombinedPulses", - "TaggerTrackerCombinedPulsesWithNoise", - "TaggerTrackerRawHits", - "TaggerTrackerRawHitAssociations", - "TaggerTrackerM1L0ClusterPositions", - "TaggerTrackerM1L1ClusterPositions", - "TaggerTrackerM1L2ClusterPositions", - "TaggerTrackerM1L3ClusterPositions", - "TaggerTrackerM2L0ClusterPositions", - "TaggerTrackerM2L1ClusterPositions", - "TaggerTrackerM2L2ClusterPositions", - "TaggerTrackerM2L3ClusterPositions", - "TaggerTrackerM1Tracks", - "TaggerTrackerM2Tracks", - "TaggerTrackerProjectedTracks", - "TaggerTrackerTracks", - "TaggerTrackerTrajectories", - "TaggerTrackerTrackParameters", - "TaggerTrackerReconstructedParticles", - - // Forward & Far forward hits - "B0TrackerRecHits", - "B0TrackerRawHits", - "B0TrackerHits", - "B0TrackerRawHitAssociations", - - "ForwardRomanPotRecHits", - "ForwardOffMTrackerRecHits", - - "ForwardRomanPotRecParticles", - "ForwardOffMRecParticles", - - "ForwardRomanPotRawHitAssociations", - "ForwardOffMTrackerRawHitAssociations", - - // Reconstructed data - "GeneratedParticles", - "GeneratedBreitFrameParticles", - "ReconstructedParticles", - "ReconstructedParticleAssociations", - "ReconstructedTruthSeededChargedParticles", - "ReconstructedTruthSeededChargedParticleAssociations", - "ReconstructedChargedRealPIDParticles", - "ReconstructedChargedParticles", - "ReconstructedChargedParticleAssociations", - "MCScatteredElectronAssociations", // Remove if/when used internally - "MCNonScatteredElectronAssociations", // Remove if/when used internally - "ReconstructedChargedParticleIDs", - "ReconstructedBreitFrameParticles", - "CentralTrackSegments", - "CentralTrackVertices", - "CentralCKFTruthSeededTrajectories", - "CentralCKFTruthSeededTracks", - "CentralCKFTruthSeededTrackAssociations", - "CentralCKFTruthSeededTrackParameters", - "CentralCKFTrajectories", - "CentralCKFTracks", - "CentralCKFTrackAssociations", - "CentralCKFTrackParameters", - //tracking properties - true seeding - "CentralCKFTruthSeededTrajectoriesUnfiltered", - "CentralCKFTruthSeededTracksUnfiltered", - "CentralCKFTruthSeededTrackUnfilteredAssociations", - "CentralCKFTruthSeededTrackParametersUnfiltered", - //tracking properties - realistic seeding - "CentralCKFTrajectoriesUnfiltered", - "CentralCKFTracksUnfiltered", - "CentralCKFTrackUnfilteredAssociations", - "CentralCKFTrackParametersUnfiltered", - "InclusiveKinematicsDA", - "InclusiveKinematicsJB", - "InclusiveKinematicsML", - "InclusiveKinematicsSigma", - "InclusiveKinematicseSigma", // Deprecated, use ESigma - "InclusiveKinematicsESigma", - "InclusiveKinematicsElectron", - "InclusiveKinematicsTruth", - "GeneratedJets", - "GeneratedChargedJets", - "GeneratedCentauroJets", - "ReconstructedJets", - "ReconstructedChargedJets", - "ReconstructedCentauroJets", - "ReconstructedElectrons", - "ScatteredElectronsTruth", - "ScatteredElectronsEMinusPz", - "PrimaryVertices", - "BarrelClusters", + // Header and other metadata + "EventHeader", + + // Truth record + "MCParticles", + "MCBeamElectrons", + "MCBeamProtons", + "MCScatteredElectrons", + "MCScatteredProtons", + "MCParticlesHeadOnFrameNoBeamFX", + + // All tracking hits combined + "CentralTrackTruthSeeds", + "CentralTrackingRecHits", + "CentralTrackingRawHitAssociations", + "CentralTrackSeedingResults", + "CentralTrackerMeasurements", + + // Si tracker hits + "SiBarrelTrackerRecHits", + "SiBarrelVertexRecHits", + "SiEndcapTrackerRecHits", + + "SiBarrelRawHits", + "SiBarrelVertexRawHits", + "SiEndcapTrackerRawHits", + + "SiBarrelHits", + "VertexBarrelHits", + "TrackerEndcapHits", + + "SiBarrelRawHitAssociations", + "SiBarrelVertexRawHitAssociations", + "SiEndcapTrackerRawHitAssociations", + + // TOF + "TOFBarrelRecHits", + "TOFEndcapRecHits", + + "TOFBarrelRawHits", + "TOFEndcapRawHits", + + "TOFBarrelHits", + "TOFBarrelADCTDC", + "TOFEndcapHits", + + "TOFBarrelRawHitAssociations", + "TOFEndcapRawHitAssociations", + + "CombinedTOFTruthSeededParticleIDs", + "CombinedTOFParticleIDs", + + // DRICH + "DRICHRawHits", + "DRICHRawHitsAssociations", + "DRICHAerogelTracks", + "DRICHGasTracks", + "DRICHAerogelIrtCherenkovParticleID", + "DRICHGasIrtCherenkovParticleID", + "DRICHTruthSeededParticleIDs", + "DRICHParticleIDs", + + // PFRICH + "RICHEndcapNRawHits", + "RICHEndcapNRawHitsAssociations", + "RICHEndcapNTruthSeededParticleIDs", + "RICHEndcapNParticleIDs", + + // MPGD + "MPGDBarrelRecHits", + "OuterMPGDBarrelRecHits", + "BackwardMPGDEndcapRecHits", + "ForwardMPGDEndcapRecHits", + + "MPGDBarrelRawHits", + "OuterMPGDBarrelRawHits", + "BackwardMPGDEndcapRawHits", + "ForwardMPGDEndcapRawHits", + + "MPGDBarrelHits", + "OuterMPGDBarrelHits", + "BackwardMPGDEndcapHits", + "ForwardMPGDEndcapHits", + + "MPGDBarrelRawHitAssociations", + "OuterMPGDBarrelRawHitAssociations", + "BackwardMPGDEndcapRawHitAssociations", + "ForwardMPGDEndcapRawHitAssociations", + + // LOWQ2 hits + "TaggerTrackerHits", + "TaggerTrackerHitPulses", + "TaggerTrackerCombinedPulses", + "TaggerTrackerCombinedPulsesWithNoise", + "TaggerTrackerRawHits", + "TaggerTrackerRawHitAssociations", + "TaggerTrackerM1L0ClusterPositions", + "TaggerTrackerM1L1ClusterPositions", + "TaggerTrackerM1L2ClusterPositions", + "TaggerTrackerM1L3ClusterPositions", + "TaggerTrackerM2L0ClusterPositions", + "TaggerTrackerM2L1ClusterPositions", + "TaggerTrackerM2L2ClusterPositions", + "TaggerTrackerM2L3ClusterPositions", + "TaggerTrackerM1Tracks", + "TaggerTrackerM2Tracks", + "TaggerTrackerProjectedTracks", + "TaggerTrackerTracks", + "TaggerTrackerTrajectories", + "TaggerTrackerTrackParameters", + "TaggerTrackerReconstructedParticles", + + // Forward & Far forward hits + "B0TrackerRecHits", + "B0TrackerRawHits", + "B0TrackerHits", + "B0TrackerRawHitAssociations", + + "ForwardRomanPotRecHits", + "ForwardOffMTrackerRecHits", + + "ForwardRomanPotRecParticles", + "ForwardOffMRecParticles", + + "ForwardRomanPotRawHitAssociations", + "ForwardOffMTrackerRawHitAssociations", + + // Reconstructed data + "GeneratedParticles", + "GeneratedBreitFrameParticles", + "ReconstructedParticles", + "ReconstructedParticleAssociations", + "ReconstructedTruthSeededChargedParticles", + "ReconstructedTruthSeededChargedParticleAssociations", + "ReconstructedChargedRealPIDParticles", + "ReconstructedChargedParticles", + "ReconstructedChargedParticleAssociations", + "MCScatteredElectronAssociations", // Remove if/when used internally + "MCNonScatteredElectronAssociations", // Remove if/when used internally + "ReconstructedChargedParticleIDs", + "ReconstructedBreitFrameParticles", + "CentralTrackSegments", + "CentralTrackVertices", + "CentralCKFTruthSeededTrajectories", + "CentralCKFTruthSeededTracks", + "CentralCKFTruthSeededTrackAssociations", + "CentralCKFTruthSeededTrackParameters", + "CentralCKFTrajectories", + "CentralCKFTracks", + "CentralCKFTrackAssociations", + "CentralCKFTrackParameters", + //tracking properties - true seeding + "CentralCKFTruthSeededTrajectoriesUnfiltered", + "CentralCKFTruthSeededTracksUnfiltered", + "CentralCKFTruthSeededTrackUnfilteredAssociations", + "CentralCKFTruthSeededTrackParametersUnfiltered", + //tracking properties - realistic seeding + "CentralCKFTrajectoriesUnfiltered", + "CentralCKFTracksUnfiltered", + "CentralCKFTrackUnfilteredAssociations", + "CentralCKFTrackParametersUnfiltered", + "InclusiveKinematicsDA", + "InclusiveKinematicsJB", + "InclusiveKinematicsML", + "InclusiveKinematicsSigma", + "InclusiveKinematicseSigma", // Deprecated, use ESigma + "InclusiveKinematicsESigma", + "InclusiveKinematicsElectron", + "InclusiveKinematicsTruth", + "GeneratedJets", + "GeneratedChargedJets", + "GeneratedCentauroJets", + "ReconstructedJets", + "ReconstructedChargedJets", + "ReconstructedCentauroJets", + "ReconstructedElectrons", + "ScatteredElectronsTruth", + "ScatteredElectronsEMinusPz", + "PrimaryVertices", + "BarrelClusters", #if EDM4EIC_VERSION_MAJOR >= 6 - "HadronicFinalState", + "HadronicFinalState", #endif - // Track projections - "CalorimeterTrackProjections", - - // Ecal stuff - "EcalEndcapNRawHits", - "EcalEndcapNRecHits", - "EcalEndcapNTruthClusters", - "EcalEndcapNTruthClusterAssociations", - "EcalEndcapNClusters", - "EcalEndcapNClusterAssociations", - "EcalEndcapNSplitMergeClusters", - "EcalEndcapNSplitMergeClusterAssociations", - "EcalEndcapPRawHits", - "EcalEndcapPRecHits", - "EcalEndcapPTruthClusters", - "EcalEndcapPTruthClusterAssociations", - "EcalEndcapPClusters", - "EcalEndcapPClusterAssociations", - "EcalEndcapPSplitMergeClusters", - "EcalEndcapPSplitMergeClusterAssociations", - "EcalEndcapPInsertRawHits", - "EcalEndcapPInsertRecHits", - "EcalEndcapPInsertTruthClusters", - "EcalEndcapPInsertTruthClusterAssociations", - "EcalEndcapPInsertClusters", - "EcalEndcapPInsertClusterAssociations", - "EcalBarrelClusters", - "EcalBarrelClusterAssociations", - "EcalBarrelTruthClusters", - "EcalBarrelTruthClusterAssociations", - "EcalBarrelImagingRawHits", - "EcalBarrelImagingRecHits", - "EcalBarrelImagingClusters", - "EcalBarrelImagingClusterAssociations", - "EcalBarrelScFiRawHits", - "EcalBarrelScFiRecHits", - "EcalBarrelScFiClusters", - "EcalBarrelScFiClusterAssociations", - "EcalLumiSpecRawHits", - "EcalLumiSpecRecHits", - "EcalLumiSpecTruthClusters", - "EcalLumiSpecTruthClusterAssociations", - "EcalLumiSpecClusters", - "EcalLumiSpecClusterAssociations", - "HcalEndcapNRawHits", - "HcalEndcapNRecHits", - "HcalEndcapNMergedHits", - "HcalEndcapNClusters", - "HcalEndcapNClusterAssociations", - "HcalEndcapNSplitMergeClusters", - "HcalEndcapNSplitMergeClusterAssociations", - "HcalEndcapPInsertRawHits", - "HcalEndcapPInsertRecHits", - "HcalEndcapPInsertMergedHits", - "HcalEndcapPInsertClusters", - "HcalEndcapPInsertClusterAssociations", - "LFHCALRawHits", - "LFHCALRecHits", - "LFHCALClusters", - "LFHCALClusterAssociations", - "LFHCALSplitMergeClusters", - "LFHCALSplitMergeClusterAssociations", - "HcalBarrelRawHits", - "HcalBarrelRecHits", - "HcalBarrelMergedHits", - "HcalBarrelClusters", - "HcalBarrelClusterAssociations", - "HcalBarrelSplitMergeClusters", - "HcalBarrelSplitMergeClusterAssociations", - "B0ECalRawHits", - "B0ECalRecHits", - "B0ECalClusters", - "B0ECalClusterAssociations", - "HcalEndcapNTruthClusters", - "HcalEndcapNTruthClusterAssociations", - "HcalBarrelTruthClusters", - "HcalBarrelTruthClusterAssociations", - - //ZDC Ecal - "EcalFarForwardZDCRawHits", - "EcalFarForwardZDCRecHits", - "EcalFarForwardZDCClusters", - "EcalFarForwardZDCClusterAssociations", - "EcalFarForwardZDCTruthClusters", - "EcalFarForwardZDCTruthClusterAssociations", - - //ZDC HCal - "HcalFarForwardZDCRawHits", - "HcalFarForwardZDCRecHits", - "HcalFarForwardZDCSubcellHits", - "HcalFarForwardZDCClusters", - "HcalFarForwardZDCClusterAssociations", - "HcalFarForwardZDCClustersBaseline", - "HcalFarForwardZDCClusterAssociationsBaseline", - "HcalFarForwardZDCTruthClusters", - "HcalFarForwardZDCTruthClusterAssociations", - "ReconstructedFarForwardZDCNeutrals", - "ReconstructedFarForwardZDCLambdas", - "ReconstructedFarForwardZDCLambdaDecayProductsCM", - - // DIRC - "DIRCRawHits", - "DIRCPID", - "DIRCTruthSeededParticleIDs", - "DIRCParticleIDs", + // Track projections + "CalorimeterTrackProjections", + + // Ecal stuff + "EcalEndcapNRawHits", + "EcalEndcapNRecHits", + "EcalEndcapNTruthClusters", + "EcalEndcapNTruthClusterAssociations", + "EcalEndcapNClusters", + "EcalEndcapNClusterAssociations", + "EcalEndcapNSplitMergeClusters", + "EcalEndcapNSplitMergeClusterAssociations", + "EcalEndcapPRawHits", + "EcalEndcapPRecHits", + "EcalEndcapPTruthClusters", + "EcalEndcapPTruthClusterAssociations", + "EcalEndcapPClusters", + "EcalEndcapPClusterAssociations", + "EcalEndcapPSplitMergeClusters", + "EcalEndcapPSplitMergeClusterAssociations", + "EcalEndcapPInsertRawHits", + "EcalEndcapPInsertRecHits", + "EcalEndcapPInsertTruthClusters", + "EcalEndcapPInsertTruthClusterAssociations", + "EcalEndcapPInsertClusters", + "EcalEndcapPInsertClusterAssociations", + "EcalBarrelClusters", + "EcalBarrelClusterAssociations", + "EcalBarrelTruthClusters", + "EcalBarrelTruthClusterAssociations", + "EcalBarrelImagingRawHits", + "EcalBarrelImagingRecHits", + "EcalBarrelImagingClusters", + "EcalBarrelImagingClusterAssociations", + "EcalBarrelScFiRawHits", + "EcalBarrelScFiRecHits", + "EcalBarrelScFiClusters", + "EcalBarrelScFiClusterAssociations", + "EcalLumiSpecRawHits", + "EcalLumiSpecRecHits", + "EcalLumiSpecTruthClusters", + "EcalLumiSpecTruthClusterAssociations", + "EcalLumiSpecClusters", + "EcalLumiSpecClusterAssociations", + "HcalEndcapNRawHits", + "HcalEndcapNRecHits", + "HcalEndcapNMergedHits", + "HcalEndcapNClusters", + "HcalEndcapNClusterAssociations", + "HcalEndcapNSplitMergeClusters", + "HcalEndcapNSplitMergeClusterAssociations", + "HcalEndcapPInsertRawHits", + "HcalEndcapPInsertRecHits", + "HcalEndcapPInsertMergedHits", + "HcalEndcapPInsertClusters", + "HcalEndcapPInsertClusterAssociations", + "LFHCALRawHits", + "LFHCALRecHits", + "LFHCALClusters", + "LFHCALClusterAssociations", + "LFHCALSplitMergeClusters", + "LFHCALSplitMergeClusterAssociations", + "HcalBarrelRawHits", + "HcalBarrelRecHits", + "HcalBarrelMergedHits", + "HcalBarrelClusters", + "HcalBarrelClusterAssociations", + "HcalBarrelSplitMergeClusters", + "HcalBarrelSplitMergeClusterAssociations", + "B0ECalRawHits", + "B0ECalRecHits", + "B0ECalClusters", + "B0ECalClusterAssociations", + "HcalEndcapNTruthClusters", + "HcalEndcapNTruthClusterAssociations", + "HcalBarrelTruthClusters", + "HcalBarrelTruthClusterAssociations", + + //ZDC Ecal + "EcalFarForwardZDCRawHits", + "EcalFarForwardZDCRecHits", + "EcalFarForwardZDCClusters", + "EcalFarForwardZDCClusterAssociations", + "EcalFarForwardZDCTruthClusters", + "EcalFarForwardZDCTruthClusterAssociations", + + //ZDC HCal + "HcalFarForwardZDCRawHits", + "HcalFarForwardZDCRecHits", + "HcalFarForwardZDCSubcellHits", + "HcalFarForwardZDCClusters", + "HcalFarForwardZDCClusterAssociations", + "HcalFarForwardZDCClustersBaseline", + "HcalFarForwardZDCClusterAssociationsBaseline", + "HcalFarForwardZDCTruthClusters", + "HcalFarForwardZDCTruthClusterAssociations", + "ReconstructedFarForwardZDCNeutrals", + "ReconstructedFarForwardZDCLambdas", + "ReconstructedFarForwardZDCLambdaDecayProductsCM", + + // DIRC + "DIRCRawHits", + "DIRCPID", + "DIRCTruthSeededParticleIDs", + "DIRCParticleIDs", #if EDM4EIC_VERSION_MAJOR >= 7 - "B0ECalRawHitAssociations", - "EcalBarrelScFiRawHitAssociations", - "EcalBarrelImagingRawHitAssociations", - "HcalBarrelRawHitAssociations", - "EcalEndcapNRawHitAssociations", - "HcalEndcapNRawHitAssociations", - "EcalEndcapPRawHitAssociations", - "EcalEndcapPInsertRawHitAssociations", - "HcalEndcapPInsertRawHitAssociations", - "LFHCALRawHitAssociations", - "EcalLumiSpecRawHitAssociations", - "EcalFarForwardZDCRawHitAssociations", - "HcalFarForwardZDCRawHitAssociations", + "B0ECalRawHitAssociations", + "EcalBarrelScFiRawHitAssociations", + "EcalBarrelImagingRawHitAssociations", + "HcalBarrelRawHitAssociations", + "EcalEndcapNRawHitAssociations", + "HcalEndcapNRawHitAssociations", + "EcalEndcapPRawHitAssociations", + "EcalEndcapPInsertRawHitAssociations", + "HcalEndcapPInsertRawHitAssociations", + "LFHCALRawHitAssociations", + "EcalLumiSpecRawHitAssociations", + "EcalFarForwardZDCRawHitAssociations", + "HcalFarForwardZDCRawHitAssociations", #endif #if EDM4EIC_VERSION_MAJOR >= 8 - "TrackClusterMatches", + "TrackClusterMatches", #endif }; diff --git a/src/services/io/podio/JEventSourcePODIO.cc b/src/services/io/podio/JEventSourcePODIO.cc index 57753d789c..7312874a7b 100644 --- a/src/services/io/podio/JEventSourcePODIO.cc +++ b/src/services/io/podio/JEventSourcePODIO.cc @@ -46,7 +46,7 @@ struct InsertingVisitor { const std::string& m_collection_name; InsertingVisitor(JEvent& event, const std::string& collection_name) - : m_event(event), m_collection_name(collection_name){}; + : m_event(event), m_collection_name(collection_name) {}; template void operator()(const T& collection) { diff --git a/src/services/log/Log_service.cc b/src/services/log/Log_service.cc index 5787b62b54..85aca38a6b 100644 --- a/src/services/log/Log_service.cc +++ b/src/services/log/Log_service.cc @@ -82,7 +82,7 @@ Log_service::Log_service(JApplication* app) { // Virtual destructor implementation to pin vtable and typeinfo to this // translation unit -Log_service::~Log_service(){}; +Log_service::~Log_service() {}; std::shared_ptr Log_service::logger(const std::string& name, const std::optional default_level) { diff --git a/src/services/pid_lut/PIDLookupTable.h b/src/services/pid_lut/PIDLookupTable.h index 7b50fbc5ab..ba6720bbc1 100644 --- a/src/services/pid_lut/PIDLookupTable.h +++ b/src/services/pid_lut/PIDLookupTable.h @@ -43,7 +43,7 @@ class PIDLookupTable : public algorithms::LoggerMixin { bool m_symmetrizing_charges; public: - PIDLookupTable() : algorithms::LoggerMixin("PIDLookupTable"){}; + PIDLookupTable() : algorithms::LoggerMixin("PIDLookupTable") {}; const Entry* Lookup(int pdg, int charge, double momentum, double theta_deg, double phi_deg) const; diff --git a/src/services/pid_lut/PIDLookupTableSvc.h b/src/services/pid_lut/PIDLookupTableSvc.h index 81bdbcab87..8bb3eee768 100644 --- a/src/services/pid_lut/PIDLookupTableSvc.h +++ b/src/services/pid_lut/PIDLookupTableSvc.h @@ -14,7 +14,7 @@ namespace eicrecon { class PIDLookupTableSvc : public algorithms::LoggedService { public: - void init(){}; + void init() {}; const PIDLookupTable* load(std::string filename, const PIDLookupTable::Binning& binning) { std::lock_guard lock(m_mutex); diff --git a/src/utilities/janatop/JEventProcessorJANATOP.h b/src/utilities/janatop/JEventProcessorJANATOP.h index d129ddd7b2..1b8a274baa 100644 --- a/src/utilities/janatop/JEventProcessorJANATOP.h +++ b/src/utilities/janatop/JEventProcessorJANATOP.h @@ -74,9 +74,9 @@ class JEventProcessorJANATOP : public JEventProcessor { auto app = japp; }; - void Init() override{}; + void Init() override {}; - void BeginRun(const std::shared_ptr& event) override{}; + void BeginRun(const std::shared_ptr& event) override {}; void Process(const std::shared_ptr& event) override { // Get the call stack for ths event and add the results to our stats @@ -134,7 +134,7 @@ class JEventProcessorJANATOP : public JEventProcessor { } }; - void EndRun() override{}; + void EndRun() override {}; void Finish() override { // In order to get the total time we have to first get a list of