Pure clang-format

EinarElen · tomeichlersmith · commit 55704b0838ee · 2023-08-09T09:09:12.000-05:00
diff --git a/include/SimCore/Generators/GeneralParticleSource.h b/include/SimCore/Generators/GeneralParticleSource.h
@@ -37,7 +37,8 @@ class GeneralParticleSource : public simcore::PrimaryGenerator {
    * Parameters:
    *  initCommands : vector of Geant4 strings to initialize the GPS
    */
-  GeneralParticleSource(const std::string& name, const framework::config::Parameters& parameters);
+  GeneralParticleSource(const std::string& name,
+                        const framework::config::Parameters& parameters);
 
   /// Destructor
   virtual ~GeneralParticleSource() = default;
@@ -64,7 +65,7 @@ class GeneralParticleSource : public simcore::PrimaryGenerator {
 
 };  // GeneralParticleSource
 
-}  // namesapce generators
+}  // namespace generators
 }  // namespace simcore
 
 #endif  // SIMCORE_GENERALPARTICLESOURCE_H
diff --git a/include/SimCore/Generators/LHEPrimaryGenerator.h b/include/SimCore/Generators/LHEPrimaryGenerator.h
@@ -27,7 +27,8 @@ class LHEPrimaryGenerator : public simcore::PrimaryGenerator {
    * Class constructor.
    * @param reader The LHE reader with the event data.
    */
-  LHEPrimaryGenerator(const std::string& name, const framework::config::Parameters& parameters);
+  LHEPrimaryGenerator(const std::string& name,
+                      const framework::config::Parameters& parameters);
 
   /**
    * Class destructor.
diff --git a/include/SimCore/Generators/ParticleGun.h b/include/SimCore/Generators/ParticleGun.h
@@ -4,7 +4,6 @@
  * @author Omar Moreno, SLAC National Accelerator Laboratory
  * @author Tom Eichlersmith, University of Minnesota
  */
-
 #ifndef SIMCORE_PARTICLE_GUN_H
 #define SIMCORE_PARTICLE_GUN_H
 
@@ -43,7 +42,8 @@ class ParticleGun : public simcore::PrimaryGenerator {
    *  time     : time to shoot at (ns)
    *  direction: direction to shoot in (unitless three-vector)
    */
-  ParticleGun(const std::string& name, const framework::config::Parameters& parameters);
+  ParticleGun(const std::string& name,
+              const framework::config::Parameters& parameters);
 
   /// Destructor
   virtual ~ParticleGun() = default;
diff --git a/include/SimCore/Generators/RootSimFromEcalSP.h b/include/SimCore/Generators/RootSimFromEcalSP.h
@@ -56,7 +56,8 @@ class RootSimFromEcalSP : public PrimaryGenerator {
    * collection for Ecal Scoring Plane hits ecalSPHitsPassName : name of pass
    * for Ecal Scoring Plane hits
    */
-  RootSimFromEcalSP(const std::string& name, const framework::config::Parameters& parameters);
+  RootSimFromEcalSP(const std::string& name,
+                    const framework::config::Parameters& parameters);
 
   /**
    * Class destructor.
diff --git a/include/SimCore/LHE/LHEParticle.h b/include/SimCore/LHE/LHEParticle.h
@@ -137,6 +137,6 @@ class LHEParticle {
   int spinup_;
 };
 
-}  // namespace simcore
+}  // namespace simcore::lhe
 
 #endif
diff --git a/include/SimCore/TrackMap.h b/include/SimCore/TrackMap.h
@@ -10,8 +10,8 @@
 
 // LDMX
 #include "SimCore/Event/SimParticle.h"
-#include "SimCore/UserTrackInformation.h"
 #include "SimCore/UserPrimaryParticleInformation.h"
+#include "SimCore/UserTrackInformation.h"
 
 namespace simcore {
 
@@ -92,9 +92,7 @@ class TrackMap {
   /**
    * Get the map of particles to be stored in output event.
    */
-  std::map<int,ldmx::SimParticle> &getParticleMap() {
-    return particle_map_;
-  }
+  std::map<int, ldmx::SimParticle>& getParticleMap() { return particle_map_; }
 
  private:
   /**
@@ -125,13 +123,13 @@ class TrackMap {
    * @see isInCalorimeterRegion for how we check if a track
    * originated in the calorimeter region.
    */
-  std::unordered_map<int,std::pair<int,bool>> ancestry_;
+  std::unordered_map<int, std::pair<int, bool>> ancestry_;
 
   /// descendents map of particles in event (parent -> children)
-  std::unordered_map<int,std::vector<int>> descendents_;
+  std::unordered_map<int, std::vector<int>> descendents_;
 
   /// map of SimParticles that will be stored
-  std::map<int,ldmx::SimParticle> particle_map_;
+  std::map<int, ldmx::SimParticle> particle_map_;
 };
 
 }  // namespace simcore
diff --git a/include/SimCore/UserAction.h b/include/SimCore/UserAction.h
@@ -20,9 +20,9 @@
 /*   Framework   */
 /*~~~~~~~~~~~~~~~*/
 #include "Framework/Configure/Parameters.h"
-#include "SimCore/UserEventInformation.h"
 #include "SimCore/Event/SimParticle.h"
 #include "SimCore/Factory.h"
+#include "SimCore/UserEventInformation.h"
 
 // Forward Declarations
 class G4Event;
@@ -50,10 +50,9 @@ class UserAction {
              framework::config::Parameters& parameters);
 
   /// factory for user actions
-  using Factory = ::simcore::Factory<UserAction,
-                                     std::shared_ptr<UserAction>,
-                                     const std::string&,
-                                     framework::config::Parameters&>;
+  using Factory =
+      ::simcore::Factory<UserAction, std::shared_ptr<UserAction>,
+                         const std::string&, framework::config::Parameters&>;
 
   /// Destructor
   virtual ~UserAction() = default;
@@ -175,7 +174,7 @@ class UserAction {
    * already fully processed and chosen to be saved. The ancestry
    * of the particles will not have been traced yet.
    */
-  const std::map<int,ldmx::SimParticle>& getCurrentParticleMap() const;
+  const std::map<int, ldmx::SimParticle>& getCurrentParticleMap() const;
 
  protected:
   /// Name of the UserAction
diff --git a/include/SimCore/UserEventInformation.h b/include/SimCore/UserEventInformation.h
@@ -2,7 +2,6 @@
 #define SIMCORE_USEREVENTINFORMATION_H
 
 #include "G4VUserEventInformation.hh"
-
 namespace simcore {
 
 /**
diff --git a/src/SimCore/Generators/GeneralParticleSource.cxx b/src/SimCore/Generators/GeneralParticleSource.cxx
@@ -20,10 +20,11 @@
 namespace simcore {
 namespace generators {
 
-GeneralParticleSource::GeneralParticleSource(const std::string& name,
-                                             const framework::config::Parameters& parameters)
+GeneralParticleSource::GeneralParticleSource(
+    const std::string& name, const framework::config::Parameters& parameters)
     : PrimaryGenerator(name, parameters) {
-  init_commands_ = parameters.getParameter<std::vector<std::string>>("initCommands");
+  init_commands_ =
+      parameters.getParameter<std::vector<std::string>>("initCommands");
   for (const auto& cmd : init_commands_) {
     int g4Ret = G4UImanager::GetUIpointer()->ApplyCommand(cmd);
     if (g4Ret > 0) {
@@ -41,11 +42,14 @@ void GeneralParticleSource::GeneratePrimaryVertex(G4Event* event) {
   return;
 }
 
-void GeneralParticleSource::RecordConfig(const std::string& id, ldmx::RunHeader& rh) {
-  rh.setStringParameter(id+" Class", "simcore::generators::GeneralParticleSource");
-  std::string init_prefix{id+" Init Cmd "};
+void GeneralParticleSource::RecordConfig(const std::string& id,
+                                         ldmx::RunHeader& rh) {
+  rh.setStringParameter(id + " Class",
+                        "simcore::generators::GeneralParticleSource");
+  std::string init_prefix{id + " Init Cmd "};
   for (std::size_t i{0}; i < init_commands_.size(); i++) {
-    rh.setStringParameter(init_prefix+std::to_string(i), init_commands_.at(i));
+    rh.setStringParameter(init_prefix + std::to_string(i),
+                          init_commands_.at(i));
   }
 }
 
diff --git a/src/SimCore/Generators/LHEPrimaryGenerator.cxx b/src/SimCore/Generators/LHEPrimaryGenerator.cxx
@@ -22,8 +22,8 @@
 namespace simcore {
 namespace generators {
 
-LHEPrimaryGenerator::LHEPrimaryGenerator(const std::string& name,
-                                         const framework::config::Parameters& parameters)
+LHEPrimaryGenerator::LHEPrimaryGenerator(
+    const std::string& name, const framework::config::Parameters& parameters)
     : PrimaryGenerator(name, parameters) {
   file_path_ = parameters.getParameter<std::string>("filePath");
   reader_ = new simcore::lhe::LHEReader(file_path_);
@@ -43,9 +43,9 @@ void LHEPrimaryGenerator::GeneratePrimaryVertex(G4Event* anEvent) {
     std::map<simcore::lhe::LHEParticle*, G4PrimaryParticle*> particleMap;
 
     int particleIndex = 0;
-    const std::vector<simcore::lhe::LHEParticle*>& particles = lheEvent->getParticles();
-    for (auto it = particles.begin();
-         it != particles.end(); it++) {
+    const std::vector<simcore::lhe::LHEParticle*>& particles =
+        lheEvent->getParticles();
+    for (auto it = particles.begin(); it != particles.end(); it++) {
       simcore::lhe::LHEParticle* particle = (*it);
 
       if (particle->getISTUP() > 0) {
@@ -106,9 +106,11 @@ void LHEPrimaryGenerator::GeneratePrimaryVertex(G4Event* anEvent) {
   delete lheEvent;
 }
 
-void LHEPrimaryGenerator::RecordConfig(const std::string& id, ldmx::RunHeader& rh) {
-  rh.setStringParameter(id+" Class", "simcore::generators::LHEPrimaryGenerator");
-  rh.setStringParameter(id+" LHE File", file_path_);
+void LHEPrimaryGenerator::RecordConfig(const std::string& id,
+                                       ldmx::RunHeader& rh) {
+  rh.setStringParameter(id + " Class",
+                        "simcore::generators::LHEPrimaryGenerator");
+  rh.setStringParameter(id + " LHE File", file_path_);
 }
 
 }  // namespace generators
diff --git a/src/SimCore/Generators/MultiParticleGunPrimaryGenerator.cxx b/src/SimCore/Generators/MultiParticleGunPrimaryGenerator.cxx
@@ -73,8 +73,10 @@ void MultiParticleGunPrimaryGenerator::GeneratePrimaryVertex(G4Event* anEvent) {
   }
 }
 
-void MultiParticleGunPrimaryGenerator::RecordConfig(const std::string& id, ldmx::RunHeader& rh) {
-  rh.setStringParameter(id + " Class", "simcore::generators::MultiParticleGunPrimaryGenerator");
+void MultiParticleGunPrimaryGenerator::RecordConfig(const std::string& id,
+                                                    ldmx::RunHeader& rh) {
+  rh.setStringParameter(
+      id + " Class", "simcore::generators::MultiParticleGunPrimaryGenerator");
   rh.setIntParameter(id + " Poisson Enabled", mpgEnablePoisson_);
   rh.setFloatParameter(id + " N Particles", mpgNParticles_);
   rh.setIntParameter(id + " PDG ID", mpgPdgID_);
diff --git a/src/SimCore/Generators/ParticleGun.cxx b/src/SimCore/Generators/ParticleGun.cxx
@@ -28,8 +28,8 @@
 namespace simcore {
 namespace generators {
 
-ParticleGun::ParticleGun(const std::string& name, 
-    const framework::config::Parameters& parameters)
+ParticleGun::ParticleGun(const std::string& name,
+                         const framework::config::Parameters& parameters)
     : PrimaryGenerator(name, parameters) {
   verbosity_ = parameters.getParameter<int>("verbosity");
 
@@ -87,14 +87,18 @@ void ParticleGun::GeneratePrimaryVertex(G4Event* event) {
 void ParticleGun::RecordConfig(const std::string& id, ldmx::RunHeader& rh) {
   rh.setStringParameter(id + " Class", "simcore::generators::ParticleGun");
   rh.setFloatParameter(id + " Time [ns]", theGun_.GetParticleTime());
-  rh.setFloatParameter(id + " Energy [GeV]", theGun_.GetParticleEnergy()/GeV);
-  rh.setStringParameter(id + " Particle", theGun_.GetParticleDefinition()->GetParticleName());
+  rh.setFloatParameter(id + " Energy [GeV]", theGun_.GetParticleEnergy() / GeV);
+  rh.setStringParameter(id + " Particle",
+                        theGun_.GetParticleDefinition()->GetParticleName());
   rh.setFloatParameter(id + " X [mm]", theGun_.GetParticlePosition().x());
   rh.setFloatParameter(id + " Y [mm]", theGun_.GetParticlePosition().y());
   rh.setFloatParameter(id + " Z [mm]", theGun_.GetParticlePosition().z());
-  rh.setFloatParameter(id + " Direction X", theGun_.GetParticleMomentumDirection().x());
-  rh.setFloatParameter(id + " Direction Y", theGun_.GetParticleMomentumDirection().y());
-  rh.setFloatParameter(id + " Direction Z", theGun_.GetParticleMomentumDirection().z());
+  rh.setFloatParameter(id + " Direction X",
+                       theGun_.GetParticleMomentumDirection().x());
+  rh.setFloatParameter(id + " Direction Y",
+                       theGun_.GetParticleMomentumDirection().y());
+  rh.setFloatParameter(id + " Direction Z",
+                       theGun_.GetParticleMomentumDirection().z());
 }
 
 }  // namespace generators
diff --git a/src/SimCore/Generators/RootSimFromEcalSP.cxx b/src/SimCore/Generators/RootSimFromEcalSP.cxx
@@ -31,19 +31,17 @@
 namespace simcore {
 namespace generators {
 
-RootSimFromEcalSP::RootSimFromEcalSP(const std::string& name,
-                                     const framework::config::Parameters& parameters)
+RootSimFromEcalSP::RootSimFromEcalSP(
+    const std::string& name, const framework::config::Parameters& parameters)
     : PrimaryGenerator(name, parameters), ievent_("InputReSim") {
   framework::config::Parameters file_params;
-  file_params.addParameter<std::string>("tree_name","LDMX_Events");
+  file_params.addParameter<std::string>("tree_name", "LDMX_Events");
   std::string filename = parameters.getParameter<std::string>("filePath");
-  ifile_ = std::make_unique<framework::EventFile>(file_params,filename);
+  ifile_ = std::make_unique<framework::EventFile>(file_params, filename);
   ifile_->setupEvent(&ievent_);
 
   timeCutoff_ = parameters.getParameter<double>("time_cutoff");
-
-  ecalSPHitsCollName_ =
-      parameters.getParameter<std::string>("collection_name");
+  ecalSPHitsCollName_ = parameters.getParameter<std::string>("collection_name");
   ecalSPHitsPassName_ = parameters.getParameter<std::string>("pass_name");
 }
 
@@ -123,8 +121,10 @@ void RootSimFromEcalSP::GeneratePrimaryVertex(G4Event* anEvent) {
   G4Random::restoreFullState(iss);
 }
 
-void RootSimFromEcalSP::RecordConfig(const std::string& id, ldmx::RunHeader& rh) {
-  rh.setStringParameter(id + " Class", "simcore::generators::RootSimFromEcalSP");
+void RootSimFromEcalSP::RecordConfig(const std::string& id,
+                                     ldmx::RunHeader& rh) {
+  rh.setStringParameter(id + " Class",
+                        "simcore::generators::RootSimFromEcalSP");
   rh.setStringParameter(id + " File Path", ifile_->getFileName());
   rh.setFloatParameter(id + " Time Cutoff [ns]", timeCutoff_);
 }
diff --git a/src/SimCore/LHE/LHEParticle.cxx b/src/SimCore/LHE/LHEParticle.cxx
@@ -1,8 +1,10 @@
 #include "SimCore/LHE/LHEParticle.h"
+
 #include "Framework/Exception/Exception.h"
 
 // STL
 #include <stdlib.h>
+
 #include <iostream>
 #include <sstream>
 #include <vector>
@@ -42,8 +44,8 @@ LHEParticle::LHEParticle(std::string& line) {
   vtimup_ = atof(tokens[11].c_str());
   spinup_ = atof(tokens[12].c_str());
 
-  mothers_[0] = NULL;
-  mothers_[1] = NULL;
+  mothers_[0] = nullptr;
+  mothers_[1] = nullptr;
 }
 
 int LHEParticle::getIDUP() const { return idup_; }
@@ -82,4 +84,4 @@ std::ostream& operator<<(std::ostream& stream, const LHEParticle& particle) {
   return stream;
 }
 
-}  // namespace simcore
+}  // namespace simcore::lhe
diff --git a/src/SimCore/LHE/LHEReader.cxx b/src/SimCore/LHE/LHEReader.cxx
@@ -25,7 +25,7 @@ LHEEvent* LHEReader::readNextEvent() {
   if (!foundEventElement) {
     std::cerr << "WARNING: No next <event> element was found by the LHE reader."
               << std::endl;
-    return NULL;
+    return nullptr;
   }
 
   getline(ifs_, line);
@@ -68,4 +68,4 @@ LHEEvent* LHEReader::readNextEvent() {
   return nextEvent;
 }
 
-}  // namespace simcore
+}  // namespace simcore::lhe
diff --git a/src/SimCore/TrackMap.cxx b/src/SimCore/TrackMap.cxx
@@ -7,15 +7,16 @@
 namespace simcore {
 
 void TrackMap::insert(const G4Track* track) {
-  ancestry_[track->GetTrackID()] = std::make_pair(track->GetParentID(),isInCalorimeterRegion(track));
+  ancestry_[track->GetTrackID()] =
+      std::make_pair(track->GetParentID(), isInCalorimeterRegion(track));
   descendents_[track->GetParentID()].push_back(track->GetTrackID());
 }
 
 int TrackMap::findIncident(G4int trackID) const {
   int currTrackID = trackID;
   bool foundIncident{false};
   while (not foundIncident) {
-    auto &[parentID, inCalRegion] = ancestry_.at(currTrackID);
+    auto& [parentID, inCalRegion] = ancestry_.at(currTrackID);
     if (not inCalRegion or parentID == 0) {
       // current track ID is nearest ancestor
       // originating outside cal region
@@ -51,7 +52,8 @@ void TrackMap::save(const G4Track* track) {
   particle.setPdgID(particle_def->GetPDGEncoding());
   particle.setCharge(particle_def->GetPDGCharge());
   particle.setMass(track->GetDynamicParticle()->GetMass());
-  particle.setEnergy(track->GetVertexKineticEnergy()+track->GetDynamicParticle()->GetMass());
+  particle.setEnergy(track->GetVertexKineticEnergy() +
+                     track->GetDynamicParticle()->GetMass());
 
   auto track_info{UserTrackInformation::get(track)};
   particle.setVertexVolume(track_info->getVertexVolume());
@@ -82,16 +84,16 @@ void TrackMap::save(const G4Track* track) {
 }
 
 void TrackMap::traceAncestry() {
-  for (auto & [id, particle] : particle_map_) {
+  for (auto& [id, particle] : particle_map_) {
     particle.addParent(ancestry_.at(id).first);
-    
+
     /**
      * Use [] instead of at() for descendents_
      * so that if it wasn't previously created,
      * we will just silently create an empty
      * vector and move on.
      */
-    for (auto &child : descendents_[id]) {
+    for (auto& child : descendents_[id]) {
       particle.addDaughter(child);
     }
   }
diff --git a/src/SimCore/UserAction.cxx b/src/SimCore/UserAction.cxx
