[pre-commit.ci] pre-commit autoupdate

.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

src/algorithms/calorimetry/CalorimeterClusterRecoCoG.h

@@ -69,19 +69,19 @@ class CalorimeterClusterRecoCoG : public CalorimeterClusterRecoCoGAlgorithm,
                                   public WithPodConfig<CalorimeterClusterRecoCoGConfig> {
 
 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;

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&)'

src/algorithms/calorimetry/CalorimeterHitDigi.h

@@ -46,17 +46,18 @@ class CalorimeterHitDigi : public CalorimeterHitDigiAlgorithm,
                            public WithPodConfig<CalorimeterHitDigiConfig> {
 
 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;

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);

src/algorithms/calorimetry/ImagingClusterReco.h

@@ -61,17 +61,17 @@ class ImagingClusterReco : public ImagingClusterRecoAlgorithm,
                            public WithPodConfig<ImagingClusterRecoConfig> {
 
 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() {}

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&)'
 

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;
 };
 

src/algorithms/meta/CollectionCollector.h

@@ -26,7 +26,7 @@ template <class T> 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 {

src/algorithms/meta/FilterMatching.h

@@ -37,7 +37,7 @@ class FilterMatching : public FilterMatchingAlgorithm<ToFilterObjectT, FilterByO
             {"outputMatchedAssociations", "outputUnmatchedAssociations"},
             "Filter by matching to a collection"} {};
 
-  void init() final{};
+  void init() final {};
 
   void
   process(const typename FilterMatchingAlgorithm<ToFilterObjectT, FilterByObjectT>::Input& input,

src/algorithms/meta/SubDivideCollection.h

@@ -30,9 +30,9 @@ class SubDivideCollection : public SubDivideCollectionAlgorithm<T>,
                                         {"inputCollection"},
                                         {"outputCollection"},
                                         "Sub-Divide collection"}
-      , WithPodConfig<SubDivideCollectionConfig<T>>(){};
+      , WithPodConfig<SubDivideCollectionConfig<T>>() {};
 
-  void init() final{};
+  void init() final {};
 
   void process(const typename SubDivideCollectionAlgorithm<T>::Input& input,
                const typename SubDivideCollectionAlgorithm<T>::Output& output) const final {

src/algorithms/meta/SubDivideFunctors.h

@@ -12,7 +12,7 @@ namespace eicrecon {
 // ----------------------------------------------------------------------------
 template <auto MemberFunctionPtr> class RangeSplit {
 public:
-  RangeSplit(std::vector<std::pair<double, double>> ranges) : m_ranges(ranges){};
+  RangeSplit(std::vector<std::pair<double, double>> ranges) : m_ranges(ranges) {};
 
   template <typename T> std::vector<int> operator()(T& instance) const {
     std::vector<int> ids;
@@ -42,7 +42,7 @@ class GeometrySplit {
       , m_divisions(divisions)
       , is_init(std::make_shared<std::once_flag>())
       , m_id_dec(std::make_shared<dd4hep::DDSegmentation::BitFieldCoder*>())
-      , m_div_ids(std::make_shared<std::vector<size_t>>()){};
+      , m_div_ids(std::make_shared<std::vector<size_t>>()) {};
 
   template <typename T> std::vector<int> operator()(T& instance) const {
 
@@ -87,7 +87,7 @@ class GeometrySplit {
 // ----------------------------------------------------------------------------
 template <auto... MemberFunctionPtrs> class ValueSplit {
 public:
-  ValueSplit(std::vector<std::vector<int>> ids) : m_ids(ids){};
+  ValueSplit(std::vector<std::vector<int>> ids) : m_ids(ids) {};
 
   template <typename T> std::vector<int> operator()(T& instance) const {
     std::vector<int> ids;

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

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;
   }

src/algorithms/reco/JetReconstruction.cc

@@ -154,7 +154,7 @@ void JetReconstruction<InputT>::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;

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:

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

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;

src/algorithms/tracking/IterativeVertexFinder.cc

@@ -176,10 +176,10 @@ std::unique_ptr<edm4eic::VertexCollection> 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,

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<Float_t> charge(myReader, "MCParticles.charge");

src/detectors/B0ECAL/B0ECAL.cc

@@ -79,14 +79,11 @@ void InitPlugin(JApplication* app) {
 
   app->Add(new JOmniFactoryGeneratorT<CalorimeterClusterRecoCoG_factory>(
       "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<CalorimeterClusterRecoCoG_factory>(
       "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

src/detectors/BEMC/BEMC.cc

@@ -92,14 +92,11 @@ void InitPlugin(JApplication* app) {
       ));
   app->Add(new JOmniFactoryGeneratorT<CalorimeterClusterRecoCoG_factory>(
       "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<ImagingClusterReco_factory>(
       "EcalBarrelImagingClusters",
-      {
-        "EcalBarrelImagingProtoClusters",
+      {"EcalBarrelImagingProtoClusters",
 #if EDM4EIC_VERSION_MAJOR >= 7
-            "EcalBarrelImagingRawHitAssociations"
-      },
+       "EcalBarrelImagingRawHitAssociations"},
 #else
-            "EcalBarrelImagingHits"
-      },
+       "EcalBarrelImagingHits"},
 #endif
       {"EcalBarrelImagingClusters", "EcalBarrelImagingClusterAssociations",
        "EcalBarrelImagingLayers"},