More override/final/virtual

LDMX-Software · Nov 1, 2023 · 033cad8 · 033cad8
1 parent f6ab4d8
commit 033cad8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/Recon/include/Recon/Examples/MyProcessor.h b/Recon/include/Recon/Examples/MyProcessor.h
@@ -29,7 +29,7 @@ class MyProcessor : public framework::Producer {
   MyProcessor(const std::string &name, framework::Process &process);
 
   /// Destructor
-  ~MyProcessor();
+  virtual ~MyProcessor() = default;
 
   /**
    * Configure the processor using the given user specified parameters.
@@ -40,14 +40,14 @@ class MyProcessor : public framework::Producer {
    *
    * @param parameters Set of parameters used to configure this processor.
    */
-  void configure(framework::config::Parameters &parameters) final override;
+  void configure(framework::config::Parameters &parameters) override;
 
   /**
    * Process the event and put new data products into it.
    *
    * @param event The event to process.
    */
-  void produce(framework::Event &event);
+  void produce(framework::Event &event) override;
 
 };  // MyProcessor
 

diff --git a/Recon/include/Recon/OverlayProducer.h b/Recon/include/Recon/OverlayProducer.h
@@ -26,18 +26,18 @@ class OverlayProducer : public framework::Producer {
       : framework::Producer(name, process), overlayEvent_{"overlay"} {}
 
   // Destructor
-  ~OverlayProducer() = default;
+  virtual ~OverlayProducer() = default;
 
   /**
    * Configure the processor with input parameters from the python cofig
    */
-  void configure(framework::config::Parameters &parameters) final override;
+  void configure(framework::config::Parameters &parameters) override;
 
   /**
    * At the start of the run, the pileup overlay file is set up, and the
    * starting event number is chosen, using the RNSS.
    */
-  void onNewRun(const ldmx::RunHeader &);  // );    //
+  void onNewRun(const ldmx::RunHeader &) override;  // );    //
 
   /**
    * Based on the list of collections to overlay, and the desired number of
@@ -56,12 +56,12 @@ class OverlayProducer : public framework::Producer {
    * The resulting collections inherit the input collection name, with an
    * appended string "Overlay". This name is also currently hardwired.
    */
-  void produce(framework::Event &event) final override;
+  void produce(framework::Event &event) override;
 
   /**
    * At the start of processing, the pileup overlay file is set up.
    */
-  void onProcessStart() final override;
+  void onProcessStart() override;
 
  private:
   /// The parameters used to configure this producer

diff --git a/Recon/include/Recon/SequentialTrigger.h b/Recon/include/Recon/SequentialTrigger.h
@@ -42,22 +42,22 @@ class SequentialTrigger : public framework::Producer {
   /**
    * Class destructor.
    */
-  virtual ~SequentialTrigger() {}
+    virtual ~SequentialTrigger() = default;
 
   /**
    * Configure the processor using the given user specified parameters.
    *
    * @param parameters Set of parameters used to configure this processor.
    */
-  void configure(framework::config::Parameters& parameters) final override;
+  void configure(framework::config::Parameters& parameters) override;
 
   /**
    * Run the doOR or doAND check and create a SequentialTrigger
    * object to contain the pass boolean value. Also sets the
    * Storage Hint.
    * param event The event to run skimmer on.
    */
-  virtual void produce(framework::Event& event);
+  void produce(framework::Event& event) override;
 
  private:
   /** The name of the input collection of triggers */

diff --git a/Recon/include/Recon/TriggerProcessor.h b/Recon/include/Recon/TriggerProcessor.h
@@ -47,7 +47,7 @@ class TriggerProcessor : public framework::Producer {
    *
    * @param parameters Set of parameters used to configure this processor.
    */
-  void configure(framework::config::Parameters& parameters) final override;
+  void configure(framework::config::Parameters& parameters) override;
 
   /**
    * Run the trigger algorithm and create a TriggerResult
@@ -56,7 +56,7 @@ class TriggerProcessor : public framework::Producer {
    * etc.
    * param event The event to run trigger algorithm on.
    */
-  virtual void produce(framework::Event& event);
+  void produce(framework::Event& event) override;
 
  private:
   /// The energy sum to make cut on.

diff --git a/Recon/src/Recon/Examples/MyProcessor.cxx b/Recon/src/Recon/Examples/MyProcessor.cxx
@@ -6,7 +6,6 @@ namespace recon {
 MyProcessor::MyProcessor(const std::string &name, framework::Process &process)
     : framework::Producer(name, process) {}
 
-MyProcessor::~MyProcessor() {}
 
 void MyProcessor::configure(framework::config::Parameters &parameters) {
   /**