One last round of virtual/override/destructors

Author: EinarElen

include/SimCore/Generators/GeneralParticleSource.h

@@ -40,7 +40,7 @@ class GeneralParticleSource : public simcore::PrimaryGenerator {
   GeneralParticleSource(const std::string& name, const framework::config::Parameters& parameters);
 
   /// Destructor
-  ~GeneralParticleSource();
+  virtual ~GeneralParticleSource() = default;
 
   /**
    * Generate the primary vertices in the Geant4 event.

include/SimCore/Generators/LHEPrimaryGenerator.h

@@ -38,9 +38,10 @@ class LHEPrimaryGenerator : public simcore::PrimaryGenerator {
    * Generate vertices in the Geant4 event.
    * @param anEvent The Geant4 event.
    */
-  void GeneratePrimaryVertex(G4Event* anEvent);
+  void GeneratePrimaryVertex(G4Event* anEvent) final override;
 
   void RecordConfig(const std::string& id, ldmx::RunHeader& rh) final override;
+
  private:
   /**
    * The LHE reader with the event data.

include/SimCore/Generators/MultiParticleGunPrimaryGenerator.h

@@ -64,20 +64,20 @@ class MultiParticleGunPrimaryGenerator : public simcore::PrimaryGenerator {
    *  pdgID         : pdgID of particle to shoot
    *  enablePoisson : whether to poisson distribute the number of particles
    */
-  MultiParticleGunPrimaryGenerator(const std::string& name,
-                                   const framework::config::Parameters& parameters);
+  MultiParticleGunPrimaryGenerator(
+      const std::string& name, const framework::config::Parameters& parameters);
 
   /** Destructor */
   virtual ~MultiParticleGunPrimaryGenerator();
-
   /**
    * Generate vertices in the Geant4 event.
    *
    * @param anEvent The Geant4 event.
    */
-  void GeneratePrimaryVertex(G4Event* anEvent);
+  void GeneratePrimaryVertex(G4Event* anEvent) final override;
 
   void RecordConfig(const std::string& id, ldmx::RunHeader& rh) final override;
+
  private:
   /** Random number generator. */
   TRandom* random_;

include/SimCore/Generators/ParticleGun.h

@@ -46,7 +46,7 @@ class ParticleGun : public simcore::PrimaryGenerator {
   ParticleGun(const std::string& name, const framework::config::Parameters& parameters);
 
   /// Destructor
-  ~ParticleGun();
+  virtual ~ParticleGun() = default;
 
   /**
    * Generate the primary vertices in the Geant4 event.

include/SimCore/Generators/RootSimFromEcalSP.h

@@ -67,9 +67,10 @@ class RootSimFromEcalSP : public PrimaryGenerator {
    * Generate vertices in the Geant4 event.
    * @param anEvent The Geant4 event.
    */
-  void GeneratePrimaryVertex(G4Event* anEvent);
+  void GeneratePrimaryVertex(G4Event* anEvent) final override;
 
   void RecordConfig(const std::string& id, ldmx::RunHeader& rh) final override;
+
  private:
   /**
    * The cutoff time

include/SimCore/UserAction.h

@@ -56,7 +56,7 @@ class UserAction {
                                      framework::config::Parameters&>;
 
   /// Destructor
-  virtual ~UserAction();
+  virtual ~UserAction() = default;
 
   /**
    * Method called at the beginning of every event.

include/SimCore/UserEventInformation.h

@@ -11,10 +11,10 @@ namespace simcore {
 class UserEventInformation : public G4VUserEventInformation {
  public:
   /// Constructor
-  UserEventInformation();
+  UserEventInformation() = default;
 
   /// Destructor
-  ~UserEventInformation();
+  virtual ~UserEventInformation() = default;
 
   /// Print the information associated with the track
   void Print() const final override;

src/SimCore/Generators/GeneralParticleSource.cxx

@@ -35,8 +35,6 @@ GeneralParticleSource::GeneralParticleSource(const std::string& name,
   }
 }
 
-GeneralParticleSource::~GeneralParticleSource() {}
-
 void GeneralParticleSource::GeneratePrimaryVertex(G4Event* event) {
   // just pass to the Geant4 implementation
   theG4Source_.GeneratePrimaryVertex(event);

src/SimCore/Generators/ParticleGun.cxx

@@ -79,8 +79,6 @@ ParticleGun::ParticleGun(const std::string& name,
   }
 }
 
-ParticleGun::~ParticleGun() {}
-
 void ParticleGun::GeneratePrimaryVertex(G4Event* event) {
   // Call G4 class method to generate primaries.
   theGun_.GeneratePrimaryVertex(event);

src/SimCore/UserAction.cxx

@@ -19,8 +19,6 @@ UserAction::UserAction(const std::string& name,
   parameters_ = parameters;
 }
 
-UserAction::~UserAction() {}
-
 UserEventInformation* UserAction::getEventInfo() const {
   return static_cast<UserEventInformation*>(
       G4EventManager::GetEventManager()->GetUserInformation());