From 033cad8c441d550f2f0c6f75d77883b9e80747b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Einar=20El=C3=A9n?= Date: Wed, 1 Nov 2023 20:24:05 +0100 Subject: [PATCH] More override/final/virtual --- Recon/include/Recon/Examples/MyProcessor.h | 6 +++--- Recon/include/Recon/OverlayProducer.h | 10 +++++----- Recon/include/Recon/SequentialTrigger.h | 6 +++--- Recon/include/Recon/TriggerProcessor.h | 4 ++-- Recon/src/Recon/Examples/MyProcessor.cxx | 1 - 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Recon/include/Recon/Examples/MyProcessor.h b/Recon/include/Recon/Examples/MyProcessor.h index fbb7c4777..81987dde4 100644 --- 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 ¶meters) final override; + void configure(framework::config::Parameters ¶meters) 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 index 57b278963..431f36a64 100644 --- 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 ¶meters) final override; + void configure(framework::config::Parameters ¶meters) 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 index 0f43b35e6..614d6b855 100644 --- a/Recon/include/Recon/SequentialTrigger.h +++ b/Recon/include/Recon/SequentialTrigger.h @@ -42,14 +42,14 @@ 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 @@ -57,7 +57,7 @@ class SequentialTrigger : public framework::Producer { * 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 index 0cceb913a..ff89b95b6 100644 --- 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 index ffb1426f3..b3109e99c 100644 --- 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 ¶meters) { /**