Misc code improvements: override, destructor, small mistakes

Biasing/include/Biasing/DeepEcalProcessFilter.h

@@ -42,24 +42,24 @@ class DeepEcalProcessFilter : public simcore::UserAction {
   virtual ~DeepEcalProcessFilter() = default;
 
   /// Method to set flags in the beginning of the event
-  void BeginOfEventAction(const G4Event* event) final override;
+  void BeginOfEventAction(const G4Event* event) override;
 
   /**
    * Implement the stepping action which performs the target volume biasing.
    * @param step The Geant4 step.
    */
-  void stepping(const G4Step* step) final override;
+  void stepping(const G4Step* step) override;
 
   //  /**
   //   * Method called at the end of every event.
   //   * @param event Geant4 event object.
   //   */
-  //  void EndOfEventAction(const G4Event*) final override;
+  //  void EndOfEventAction(const G4Event*) override;
 
-  void NewStage() final override;
+  void NewStage() override;
 
   /// Retrieve the type of actions this class defines
-  std::vector<simcore::TYPE> getTypes() final override {
+  std::vector<simcore::TYPE> getTypes() override {
     return {simcore::TYPE::STACKING, simcore::TYPE::STEPPING,
             simcore::TYPE::EVENT};
   }

Biasing/include/Biasing/EcalDarkBremFilter.h

@@ -63,7 +63,7 @@ class EcalDarkBremFilter : public simcore::UserAction {
    *
    * @return list of action types this class does
    */
-  std::vector<simcore::TYPE> getTypes() final override {
+  std::vector<simcore::TYPE> getTypes() override {
     return {simcore::TYPE::STACKING, simcore::TYPE::EVENT,
             simcore::TYPE::TRACKING};
   }
@@ -73,7 +73,7 @@ class EcalDarkBremFilter : public simcore::UserAction {
    *
    * @param event unused
    */
-  void BeginOfEventAction(const G4Event* event) final override;
+  void BeginOfEventAction(const G4Event* event) override;
 
   /**
    * We return the classification of the track done by the PartialEnergySorter,
@@ -90,7 +90,7 @@ class EcalDarkBremFilter : public simcore::UserAction {
    */
   G4ClassificationOfNewTrack ClassifyNewTrack(
       const G4Track* aTrack,
-      const G4ClassificationOfNewTrack& currentTrackClass) final override;
+      const G4ClassificationOfNewTrack& currentTrackClass) override;
 
   /**
    * When using the PartialEnergySorter,
@@ -102,7 +102,7 @@ class EcalDarkBremFilter : public simcore::UserAction {
    *
    * @see PartialEnergySort::NewStage
    */
-  void NewStage() final override;
+  void NewStage() override;
 
   /**
    * Make sure A' is saved.
@@ -114,7 +114,7 @@ class EcalDarkBremFilter : public simcore::UserAction {
    *
    * @param track G4Track to check if it is an A'
    */
-  void PostUserTrackingAction(const G4Track* track) final override;
+  void PostUserTrackingAction(const G4Track* track) override;
 
  private:
   /**

Biasing/include/Biasing/EcalProcessFilter.h

@@ -38,9 +38,9 @@ class EcalProcessFilter : public simcore::UserAction {
   /// Destructor
   ~EcalProcessFilter();
 
-  void stepping(const G4Step* step) final override;
+  void stepping(const G4Step* step) override;
 
-  // void PostUserTrackingAction(const G4Track*) final override;
+  // void PostUserTrackingAction(const G4Track*) override;
 
   /**
    * Classify a new track which postpones track processing.
@@ -50,10 +50,10 @@ class EcalProcessFilter : public simcore::UserAction {
    */
   G4ClassificationOfNewTrack ClassifyNewTrack(
       const G4Track* aTrack,
-      const G4ClassificationOfNewTrack& currentTrackClass) final override;
+      const G4ClassificationOfNewTrack& currentTrackClass) override;
 
   /// Retrieve the type of actions this class defines
-  std::vector<simcore::TYPE> getTypes() final override {
+  std::vector<simcore::TYPE> getTypes() override {
     return {simcore::TYPE::STACKING, simcore::TYPE::STEPPING};
   }
 

Biasing/include/Biasing/MidShowerDiMuonBkgdFilter.h

@@ -44,7 +44,7 @@ class MidShowerDiMuonBkgdFilter : public simcore::UserAction {
    *
    * @return list of action types this class does
    */
-  std::vector<simcore::TYPE> getTypes() final override {
+  std::vector<simcore::TYPE> getTypes() override {
     return {simcore::TYPE::STACKING, simcore::TYPE::STEPPING,
             simcore::TYPE::EVENT};
   }
@@ -54,7 +54,7 @@ class MidShowerDiMuonBkgdFilter : public simcore::UserAction {
    *
    * @param[in] event not used
    */
-  void BeginOfEventAction(const G4Event* event) final override;
+  void BeginOfEventAction(const G4Event* event) override;
 
   /**
    * We follow the simulation along each step and check
@@ -72,7 +72,7 @@ class MidShowerDiMuonBkgdFilter : public simcore::UserAction {
    *
    * @param[in] step current G4Step
    */
-  void stepping(const G4Step* step) final override;
+  void stepping(const G4Step* step) override;
 
   /**
    * When using the PartialEnergySorter,
@@ -86,7 +86,7 @@ class MidShowerDiMuonBkgdFilter : public simcore::UserAction {
    * @see PartialEnergySort::NewStage
    * @see AbortEvent
    */
-  void NewStage() final override;
+  void NewStage() override;
 
  private:
   /**

Biasing/include/Biasing/MidShowerNuclearBkgdFilter.h

@@ -46,7 +46,7 @@ class MidShowerNuclearBkgdFilter : public simcore::UserAction {
    *
    * @return list of action types this class does
    */
-  std::vector<simcore::TYPE> getTypes() final override {
+  std::vector<simcore::TYPE> getTypes() override {
     return {simcore::TYPE::STACKING, simcore::TYPE::STEPPING,
             simcore::TYPE::EVENT};
   }
@@ -56,7 +56,7 @@ class MidShowerNuclearBkgdFilter : public simcore::UserAction {
    *
    * @param[in] event not used
    */
-  void BeginOfEventAction(const G4Event* event) final override;
+  void BeginOfEventAction(const G4Event* event) override;
 
   /**
    * We follow the simulation along each step and check
@@ -74,7 +74,7 @@ class MidShowerNuclearBkgdFilter : public simcore::UserAction {
    *
    * @param[in] step current G4Step
    */
-  void stepping(const G4Step* step) final override;
+  void stepping(const G4Step* step) override;
 
   /**
    * When using the PartialEnergySorter,
@@ -88,7 +88,7 @@ class MidShowerNuclearBkgdFilter : public simcore::UserAction {
    * @see PartialEnergySort::NewStage
    * @see AbortEvent
    */
-  void NewStage() final override;
+  void NewStage() override;
 
  private:
   /**

Biasing/include/Biasing/NonFiducialFilter.h

@@ -46,16 +46,16 @@ class NonFiducialFilter : public simcore::UserAction {
    * Implement the stepping action which performs the target volume biasing.
    * @param step The Geant4 step.
    */
-  void stepping(const G4Step* step) final override;
+  void stepping(const G4Step* step) override;
 
   /**
    * Method called at the end of every event.
    * @param event Geant4 event object.
    */
-  void EndOfEventAction(const G4Event*) final override;
+  void EndOfEventAction(const G4Event*) override;
 
   /// Retrieve the type of actions this class defines
-  std::vector<simcore::TYPE> getTypes() final override {
+  std::vector<simcore::TYPE> getTypes() override {
     return {simcore::TYPE::EVENT, simcore::TYPE::STACKING,
             simcore::TYPE::STEPPING};
   }

Biasing/include/Biasing/PhotoNuclearProductsFilter.h

@@ -48,10 +48,10 @@ class PhotoNuclearProductsFilter : public simcore::UserAction {
    * @param[in] step The Geant4 step containing transient information
    *      about the step taken by a track.
    */
-  void stepping(const G4Step* step) final override;
+  void stepping(const G4Step* step) override;
 
   /// Retrieve the type of actions this class defines
-  std::vector<simcore::TYPE> getTypes() final override {
+  std::vector<simcore::TYPE> getTypes() override {
     return {simcore::TYPE::STEPPING};
   }
 

Biasing/include/Biasing/PhotoNuclearTopologyFilters.h

@@ -54,7 +54,7 @@ class PhotoNuclearTopologyFilter : public simcore::UserAction {
   virtual bool rejectEvent(const std::vector<G4Track*>& secondaries) const = 0;
 
   /// Retrieve the type of actions this class defines
-  std::vector<simcore::TYPE> getTypes() final override {
+  std::vector<simcore::TYPE> getTypes() override {
     return {simcore::TYPE::STEPPING};
   }
 

Biasing/include/Biasing/PrimaryToEcalFilter.h

@@ -47,10 +47,10 @@ class PrimaryToEcalFilter : public simcore::UserAction {
    *
    * @param[in] step Geant4 step
    */
-  void stepping(const G4Step* step) final override;
+  void stepping(const G4Step* step) override;
 
   /// Retrieve the type of actions this class defines
-  std::vector<simcore::TYPE> getTypes() final override {
+  std::vector<simcore::TYPE> getTypes() override {
     return {simcore::TYPE::STEPPING};
   }
 

Biasing/include/Biasing/TaggerHitFilter.h

@@ -41,16 +41,16 @@ class TaggerHitFilter : public simcore::UserAction {
    *
    * @param[in] step Geant4 step
    */
-  void stepping(const G4Step* step) final override;
+  void stepping(const G4Step* step) override;
 
   /**
    * Action called once tracking of all particles has concluded. This is being
    * used to clear the hit count set in preparation for the next event.
    */
-  void EndOfEventAction(const G4Event* event) final override;
+  void EndOfEventAction(const G4Event* event) override;
 
   /// Retrieve the type of actions this class defines
-  std::vector<simcore::TYPE> getTypes() final override {
+  std::vector<simcore::TYPE> getTypes() override {
     return {simcore::TYPE::STEPPING, simcore::TYPE::EVENT};
   }
 

Biasing/include/Biasing/TaggerVetoFilter.h

@@ -46,25 +46,25 @@ class TaggerVetoFilter : public simcore::UserAction {
    * Action called at the start of an event to reset
    *
    */
-  void BeginOfEventAction(const G4Event *) final override;
+  void BeginOfEventAction(const G4Event *) override;
   /**
    *
    * Action called at the end of an event to veto events where the primary
    * particle never entered the tagger region.
    *
    */
 
-  void EndOfEventAction(const G4Event *) final override;
+  void EndOfEventAction(const G4Event *) override;
   /**
    * Stepping action called when a step is taken during tracking of
    * a particle.
    *
    * @param[in] step Geant4 step
    */
-  void stepping(const G4Step *step) final override;
+  void stepping(const G4Step *step) override;
 
   /// Retrieve the type of actions this class defines
-  std::vector<simcore::TYPE> getTypes() final override {
+  std::vector<simcore::TYPE> getTypes() override {
     return {simcore::TYPE::STEPPING, simcore::TYPE::EVENT};
   }
 

Biasing/include/Biasing/TargetBremFilter.h

@@ -35,14 +35,14 @@ class TargetBremFilter : public simcore::UserAction {
    * Implement the stepping action which performs the target volume biasing.
    * @param step The Geant4 step.
    */
-  void stepping(const G4Step* step) final override;
+  void stepping(const G4Step* step) override;
 
   /**
    * Method called at the end of every event.
    *
    * @param event Geant4 event object.
    */
-  void EndOfEventAction(const G4Event*) final override;
+  void EndOfEventAction(const G4Event*) override;
 
   /**
    * Classify a new track which postpones track processing.
@@ -52,10 +52,10 @@ class TargetBremFilter : public simcore::UserAction {
    */
   G4ClassificationOfNewTrack ClassifyNewTrack(
       const G4Track* aTrack,
-      const G4ClassificationOfNewTrack& currentTrackClass) final override;
+      const G4ClassificationOfNewTrack& currentTrackClass) override;
 
   /// Retrieve the type of actions this class defines
-  std::vector<simcore::TYPE> getTypes() final override {
+  std::vector<simcore::TYPE> getTypes() override {
     return {simcore::TYPE::EVENT, simcore::TYPE::STACKING,
             simcore::TYPE::STEPPING};
   }

Biasing/include/Biasing/TargetDarkBremFilter.h

@@ -54,14 +54,14 @@ class TargetDarkBremFilter : public simcore::UserAction {
   /**
    * Class destructor.
    */
-  ~TargetDarkBremFilter() {}
+  ~TargetDarkBremFilter() = default;
 
   /**
    * Get the types of actions this class can do
    *
    * @return list of action types this class does
    */
-  std::vector<simcore::TYPE> getTypes() final override {
+  std::vector<simcore::TYPE> getTypes() override {
     return {simcore::TYPE::STEPPING, simcore::TYPE::EVENT};
   }
 
@@ -70,7 +70,7 @@ class TargetDarkBremFilter : public simcore::UserAction {
    *
    * @param[in] e event being started, unused
    */
-  void BeginOfEventAction(const G4Event* e) final override;
+  void BeginOfEventAction(const G4Event* e) override;
 
   /**
    * Looking for A' while primary is stepping.
@@ -83,15 +83,15 @@ class TargetDarkBremFilter : public simcore::UserAction {
    *
    * @param[in] step current G4Step
    */
-  void stepping(const G4Step* step);
+  void stepping(const G4Step* step) override;
 
   /**
    * Check flag signaling finding of A', if false,
    * abort the event so it isn't saved.
    *
    * @param[in] event being ended, check if it is already aborted
    */
-  void EndOfEventAction(const G4Event* event) final override;
+  void EndOfEventAction(const G4Event* event) override;
 
  private:
   /**

Biasing/include/Biasing/TargetENProcessFilter.h

@@ -34,15 +34,15 @@ class TargetENProcessFilter : public simcore::UserAction {
    * Implementmthe stepping action which performs the target volume biasing.
    * @param step The Geant4 step.
    */
-  void stepping(const G4Step* step) final override;
+  void stepping(const G4Step* step) override;
 
   /**
    * End of event action.
    */
-  void EndOfEventAction(const G4Event*) final override;
+  void EndOfEventAction(const G4Event*) override;
 
   /// Retrieve the type of actions this class defines
-  std::vector<simcore::TYPE> getTypes() final override {
+  std::vector<simcore::TYPE> getTypes() override {
     return {simcore::TYPE::EVENT, simcore::TYPE::STEPPING};
   }
 

Biasing/include/Biasing/TargetProcessFilter.h

@@ -38,12 +38,12 @@ class TargetProcessFilter : public simcore::UserAction {
    * Implementmthe stepping action which performs the target volume biasing.
    * @param step The Geant4 step.
    */
-  void stepping(const G4Step *step) final override;
+  void stepping(const G4Step *step) override;
 
   /**
    * End of event action.
    */
-  void EndOfEventAction(const G4Event *) final override;
+  void EndOfEventAction(const G4Event *) override;
 
   /**
    * Classify a new track which postpones track processing.
@@ -53,10 +53,10 @@ class TargetProcessFilter : public simcore::UserAction {
    */
   G4ClassificationOfNewTrack ClassifyNewTrack(
       const G4Track *aTrack,
-      const G4ClassificationOfNewTrack &currentTrackClass) final override;
+      const G4ClassificationOfNewTrack &currentTrackClass) override;
 
   /// Retrieve the type of actions this class defines
-  std::vector<simcore::TYPE> getTypes() final override {
+  std::vector<simcore::TYPE> getTypes() override {
     return {simcore::TYPE::EVENT, simcore::TYPE::STACKING,
             simcore::TYPE::STEPPING};
   }