From fe39de4e18c244d36f1e3b5ef402bfd42f5aeca9 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Fri, 27 Oct 2023 15:55:18 -0500 Subject: [PATCH 1/9] Clean up some unnecessary transition function comments in Alignment --- .../plugins/MillePedeAlignmentAlgorithm.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeAlignmentAlgorithm.h b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeAlignmentAlgorithm.h index 62f3d5f396cb4..ce701bf645098 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeAlignmentAlgorithm.h +++ b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeAlignmentAlgorithm.h @@ -116,9 +116,6 @@ class MillePedeAlignmentAlgorithm : public AlignmentAlgorithmBase { /// called at end of luminosity block void endLuminosityBlock(const edm::EventSetup &) override; - /* virtual void beginLuminosityBlock(const edm::EventSetup &setup) {} */ - /* virtual void endLuminosityBlock(const edm::EventSetup &setup) {} */ - /// Called in order to pass parameters to alignables for a specific run /// range in case the algorithm supports run range dependent alignment. bool setParametersForRunRange(const RunRange &runrange) override; From 8530249409b619c702ae7d92aee397738680900d Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Fri, 27 Oct 2023 15:55:36 -0500 Subject: [PATCH 2/9] Clean up some unnecessary transition function calls/comments in CommonTools --- .../RecoAlgos/plugins/BooleanFlagFilter.cc | 60 ------------------- 1 file changed, 60 deletions(-) diff --git a/CommonTools/RecoAlgos/plugins/BooleanFlagFilter.cc b/CommonTools/RecoAlgos/plugins/BooleanFlagFilter.cc index 1242df76c266b..7cae7f72190e6 100644 --- a/CommonTools/RecoAlgos/plugins/BooleanFlagFilter.cc +++ b/CommonTools/RecoAlgos/plugins/BooleanFlagFilter.cc @@ -35,17 +35,9 @@ class BooleanFlagFilter : public edm::global::EDFilter<> { public: explicit BooleanFlagFilter(const edm::ParameterSet&); - ~BooleanFlagFilter() override; private: - //virtual void beginJob() override; bool filter(edm::StreamID, edm::Event&, const edm::EventSetup&) const override; - //virtual void endJob() override; - - //virtual void beginRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void endRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; // ----------member data --------------------------- edm::EDGetTokenT inputToken_; @@ -69,11 +61,6 @@ BooleanFlagFilter::BooleanFlagFilter(const edm::ParameterSet& iConfig) { reverse_ = iConfig.getParameter("reverseDecision"); } -BooleanFlagFilter::~BooleanFlagFilter() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // @@ -96,52 +83,5 @@ bool BooleanFlagFilter::filter(edm::StreamID, edm::Event& iEvent, const edm::Eve return result; } -// ------------ method called once each job just before starting event loop ------------ -/* -void -BooleanFlagFilter::beginJob() -{ -} -*/ - -// ------------ method called once each job just after ending the event loop ------------ -/* -void -BooleanFlagFilter::endJob() { -} -*/ - -// ------------ method called when starting to processes a run ------------ -/* -void -BooleanFlagFilter::beginRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a run ------------ -/* -void -BooleanFlagFilter::endRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when starting to processes a luminosity block ------------ -/* -void -BooleanFlagFilter::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a luminosity block ------------ -/* -void -BooleanFlagFilter::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - //define this as a plug-in DEFINE_FWK_MODULE(BooleanFlagFilter); From 2628b6443b4eb6550b4aed90f95107d3e6de9e53 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Fri, 27 Oct 2023 15:56:06 -0500 Subject: [PATCH 3/9] Clean up some unnecessary transition function calls/comments in DQM --- DQM/HLTEvF/plugins/HLTObjectMonitor.cc | 10 --------- .../plugins/HLTObjectMonitorProtonLead.cc | 8 ------- .../src/L1TOccupancyClient.cc | 8 ------- .../interface/L1ScalersClient.h | 6 ----- .../EGamma/plugins/PhotonOfflineClient.h | 7 ------ .../Trigger/interface/EgHLTOfflineClient.h | 8 ------- DQMOffline/Trigger/interface/FSQDiJetAve.h | 2 -- DQMOffline/Trigger/plugins/FSQDiJetAve.cc | 22 ------------------- 8 files changed, 71 deletions(-) diff --git a/DQM/HLTEvF/plugins/HLTObjectMonitor.cc b/DQM/HLTEvF/plugins/HLTObjectMonitor.cc index d4223fcad86cb..f05ff73a84891 100644 --- a/DQM/HLTEvF/plugins/HLTObjectMonitor.cc +++ b/DQM/HLTEvF/plugins/HLTObjectMonitor.cc @@ -84,17 +84,12 @@ class HLTObjectMonitor : public DQMEDAnalyzer { public: explicit HLTObjectMonitor(const edm::ParameterSet&); - ~HLTObjectMonitor() override; - - // static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker& i, edm::Run const&, edm::EventSetup const&) override; void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; vector plotList; - //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; double dxyFinder(double, double, edm::Handle, edm::Handle); double get_wall_time(void); // ----------member data --------------------------- @@ -346,11 +341,6 @@ HLTObjectMonitor::HLTObjectMonitor(const edm::ParameterSet& iConfig) csvPfJetsToken_ = consumes>(edm::InputTag("hltPFJetForBtag", "", processName_)); } -HLTObjectMonitor::~HLTObjectMonitor() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // diff --git a/DQM/HLTEvF/plugins/HLTObjectMonitorProtonLead.cc b/DQM/HLTEvF/plugins/HLTObjectMonitorProtonLead.cc index 0c37de07debd0..bb4e16b92e471 100644 --- a/DQM/HLTEvF/plugins/HLTObjectMonitorProtonLead.cc +++ b/DQM/HLTEvF/plugins/HLTObjectMonitorProtonLead.cc @@ -83,7 +83,6 @@ class HLTObjectMonitorProtonLead : public DQMEDAnalyzer { public: explicit HLTObjectMonitorProtonLead(const edm::ParameterSet&); - ~HLTObjectMonitorProtonLead() override; // static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); @@ -92,8 +91,6 @@ class HLTObjectMonitorProtonLead : public DQMEDAnalyzer { void bookHistograms(DQMStore::IBooker& i, edm::Run const&, edm::EventSetup const&) override; void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; vector plotList; - //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; double get_wall_time(void); // ----------member data --------------------------- @@ -327,11 +324,6 @@ HLTObjectMonitorProtonLead::HLTObjectMonitorProtonLead(const edm::ParameterSet& aodTriggerToken_ = consumes(iConfig.getParameter("triggerEvent")); } -HLTObjectMonitorProtonLead::~HLTObjectMonitorProtonLead() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // diff --git a/DQM/L1TMonitorClient/src/L1TOccupancyClient.cc b/DQM/L1TMonitorClient/src/L1TOccupancyClient.cc index 52a7a1b6a436c..9abb66db22879 100644 --- a/DQM/L1TMonitorClient/src/L1TOccupancyClient.cc +++ b/DQM/L1TMonitorClient/src/L1TOccupancyClient.cc @@ -247,14 +247,6 @@ void L1TOccupancyClient::dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::IGetter delete hservice_; } -//____________________________________________________________________________ -// Function: beginLuminosityBlock -// Description: This is will be run at the begining of each luminosity block -// Inputs: -// * const LuminosityBlock& lumiSeg = Luminosity Block information -// * const EventSetup& context = Event Setup information -//____________________________________________________________________________ - //____________________________________________________________________________ // Function: endLuminosityBlock // Description: This is will be run at the end of each luminosity block diff --git a/DQM/TrigXMonitorClient/interface/L1ScalersClient.h b/DQM/TrigXMonitorClient/interface/L1ScalersClient.h index 7de0c878afa82..b6e51dd4e84f2 100644 --- a/DQM/TrigXMonitorClient/interface/L1ScalersClient.h +++ b/DQM/TrigXMonitorClient/interface/L1ScalersClient.h @@ -28,15 +28,9 @@ class L1ScalersClient /// Constructors L1ScalersClient(const edm::ParameterSet &ps); - /// Destructor - ~L1ScalersClient() override{}; - /// BeginJob void beginJob(void) override; - // /// Endjob - // void endJob(void); - /// BeginRun void beginRun(const edm::Run &run, const edm::EventSetup &c) override; diff --git a/DQMOffline/EGamma/plugins/PhotonOfflineClient.h b/DQMOffline/EGamma/plugins/PhotonOfflineClient.h index d86448b6dccde..586402cbd1699 100644 --- a/DQMOffline/EGamma/plugins/PhotonOfflineClient.h +++ b/DQMOffline/EGamma/plugins/PhotonOfflineClient.h @@ -63,15 +63,8 @@ class PhotonOfflineClient : public DQMEDHarvester { explicit PhotonOfflineClient(const edm::ParameterSet& pset); ~PhotonOfflineClient() override; - // virtual void analyze(const edm::Event&, const edm::EventSetup& ) ; - // virtual void beginJob() ; - //virtual void endJob() ; void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override; - // virtual void endLuminosityBlock( const edm::LuminosityBlock& , const edm::EventSetup& ) ; - //virtual void endRun(const edm::Run& , const edm::EventSetup& ) ; - //virtual void runClient(); - virtual void runClient(DQMStore::IBooker& iBooker, DQMStore::IGetter& iGetter); MonitorElement* bookHisto( DQMStore::IBooker& iBooker, std::string histoName, std::string title, int bin, double min, double max); diff --git a/DQMOffline/Trigger/interface/EgHLTOfflineClient.h b/DQMOffline/Trigger/interface/EgHLTOfflineClient.h index 38b8b4f33703b..bc1434a297223 100644 --- a/DQMOffline/Trigger/interface/EgHLTOfflineClient.h +++ b/DQMOffline/Trigger/interface/EgHLTOfflineClient.h @@ -33,7 +33,6 @@ class EgHLTOfflineClient : public DQMEDHarvester { private: - // DQMStore* dbe_; //dbe seems to be the standard name for this, I dont know why. We of course dont own it std::string dirName_; std::vector eleHLTFilterNames_; //names of the filters monitored using electrons to make plots for @@ -71,15 +70,8 @@ class EgHLTOfflineClient : public DQMEDHarvester { explicit EgHLTOfflineClient(const edm::ParameterSet&); ~EgHLTOfflineClient() override; - // virtual void beginJob(); - // virtual void analyze(const edm::Event&, const edm::EventSetup&); //dummy - // virtual void endJob(); void beginRun(const edm::Run& run, const edm::EventSetup& c) override; - // virtual void endRun(const edm::Run& run, const edm::EventSetup& c); - - // virtual void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg,const edm::EventSetup& context){} // DQM Client Diagnostic - // virtual void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg,const edm::EventSetup& c); void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override; //performed in the endJob void dqmEndLuminosityBlock(DQMStore::IBooker&, DQMStore::IGetter&, diff --git a/DQMOffline/Trigger/interface/FSQDiJetAve.h b/DQMOffline/Trigger/interface/FSQDiJetAve.h index 4a9d475dcba95..18e21545a5ea2 100644 --- a/DQMOffline/Trigger/interface/FSQDiJetAve.h +++ b/DQMOffline/Trigger/interface/FSQDiJetAve.h @@ -66,8 +66,6 @@ class FSQDiJetAve : public DQMEDAnalyzer { void bookHistograms(DQMStore::IBooker&, edm::Run const& run, edm::EventSetup const& c) override; void dqmBeginRun(edm::Run const& run, edm::EventSetup const& c) override; - //virtual void beginRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; // ----------member data --------------------------- // diff --git a/DQMOffline/Trigger/plugins/FSQDiJetAve.cc b/DQMOffline/Trigger/plugins/FSQDiJetAve.cc index 40edc9ad5df1f..7543c5d2d018f 100644 --- a/DQMOffline/Trigger/plugins/FSQDiJetAve.cc +++ b/DQMOffline/Trigger/plugins/FSQDiJetAve.cc @@ -852,28 +852,6 @@ void FSQDiJetAve::bookHistograms(DQMStore::IBooker& booker, edm::Run const& run, } } //*/ -// ------------ method called when ending the processing of a run ------------ -/* -void -FSQDiJetAve::endRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when starting to processes a luminosity block ------------ -/* -void -FSQDiJetAve::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a luminosity block ------------ -/* -void -FSQDiJetAve::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{} -// */ // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void FSQDiJetAve::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { From 6e3fe817ae880b28cd8c3790e8f17035850858bb Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Fri, 27 Oct 2023 15:56:20 -0500 Subject: [PATCH 4/9] Clean up some unnecessary transition function calls/comments in EgammaAnalysis --- .../plugins/EGammaCutBasedEleIdAnalyzer.cc | 30 +---------- .../MiniAODElectronIDValidationAnalyzer.cc | 51 ------------------- 2 files changed, 1 insertion(+), 80 deletions(-) diff --git a/EgammaAnalysis/ElectronTools/plugins/EGammaCutBasedEleIdAnalyzer.cc b/EgammaAnalysis/ElectronTools/plugins/EGammaCutBasedEleIdAnalyzer.cc index 916893465785a..4279f8ca01167 100644 --- a/EgammaAnalysis/ElectronTools/plugins/EGammaCutBasedEleIdAnalyzer.cc +++ b/EgammaAnalysis/ElectronTools/plugins/EGammaCutBasedEleIdAnalyzer.cc @@ -51,7 +51,6 @@ class EGammaCutBasedEleIdAnalyzer : public edm::one::EDAnalyzer<> { typedef std::vector > > IsoDepositVals; explicit EGammaCutBasedEleIdAnalyzer(const edm::ParameterSet &); - ~EGammaCutBasedEleIdAnalyzer() override; static void fillDescriptions(edm::ConfigurationDescriptions &descriptions); ElectronEffectiveArea::ElectronEffectiveAreaTarget EAtarget; @@ -59,14 +58,7 @@ class EGammaCutBasedEleIdAnalyzer : public edm::one::EDAnalyzer<> { private: void beginJob() override; void analyze(const edm::Event &, const edm::EventSetup &) override; - void endJob() override; - - /* - void beginRun(edm::Run const &, edm::EventSetup const &) override; - void endRun(edm::Run const &, edm::EventSetup const &) override; - void beginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override; - void endLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override; - */ + // ----------member data --------------------------- // input tags @@ -126,11 +118,6 @@ EGammaCutBasedEleIdAnalyzer::EGammaCutBasedEleIdAnalyzer(const edm::ParameterSet h1_pt_fbremeopin_ = fs->make("h1_pt_fbremeopin", "pt (fbremeopin)", 100, 0.0, 100.0); } -EGammaCutBasedEleIdAnalyzer::~EGammaCutBasedEleIdAnalyzer() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // @@ -253,21 +240,6 @@ void EGammaCutBasedEleIdAnalyzer::beginJob() { EAtarget = ElectronEffectiveArea::kEleEAData2012; } -// ------------ method called once each job just after ending the event loop ------------ -void EGammaCutBasedEleIdAnalyzer::endJob() {} -/* -// ------------ method called when starting to processes a run ------------ -void EGammaCutBasedEleIdAnalyzer::beginRun(edm::Run const &, edm::EventSetup const &) {} - -// ------------ method called when ending the processing of a run ------------ -void EGammaCutBasedEleIdAnalyzer::endRun(edm::Run const &, edm::EventSetup const &) {} - -// ------------ method called when starting to processes a luminosity block ------------ -void EGammaCutBasedEleIdAnalyzer::beginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) {} - -// ------------ method called when ending the processing of a luminosity block ------------ -void EGammaCutBasedEleIdAnalyzer::endLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) {} -*/ // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void EGammaCutBasedEleIdAnalyzer::fillDescriptions(edm::ConfigurationDescriptions &descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/EgammaAnalysis/ElectronTools/test/MiniAODElectronIDValidationAnalyzer.cc b/EgammaAnalysis/ElectronTools/test/MiniAODElectronIDValidationAnalyzer.cc index 308d0f608e69e..dc3c750188dff 100644 --- a/EgammaAnalysis/ElectronTools/test/MiniAODElectronIDValidationAnalyzer.cc +++ b/EgammaAnalysis/ElectronTools/test/MiniAODElectronIDValidationAnalyzer.cc @@ -60,7 +60,6 @@ class MiniAODElectronIDValidationAnalyzer : public edm::one::EDAnalyzer { public: explicit MiniAODElectronIDValidationAnalyzer(const edm::ParameterSet &); - ~MiniAODElectronIDValidationAnalyzer() override; static void fillDescriptions(edm::ConfigurationDescriptions &descriptions); @@ -72,14 +71,7 @@ class MiniAODElectronIDValidationAnalyzer : public edm::one::EDAnalyzer> &genParticles); void findFirstNonElectronMother(const reco::Candidate *particle, int &ancestorPID, int &ancestorStatus); @@ -159,11 +151,6 @@ MiniAODElectronIDValidationAnalyzer::MiniAODElectronIDValidationAnalyzer(const e electronTree_->Branch("isPass", &isPass_, "isPass/I"); } -MiniAODElectronIDValidationAnalyzer::~MiniAODElectronIDValidationAnalyzer() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // @@ -246,44 +233,6 @@ void MiniAODElectronIDValidationAnalyzer::analyze(const edm::Event &iEvent, cons } } -// ------------ method called once each job just before starting event loop ------------ -void MiniAODElectronIDValidationAnalyzer::beginJob() {} - -// ------------ method called once each job just after ending the event loop ------------ -void MiniAODElectronIDValidationAnalyzer::endJob() {} - -// ------------ method called when starting to processes a run ------------ -/* -void -MiniAODElectronIDValidationAnalyzer::beginRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a run ------------ -/* -void -MiniAODElectronIDValidationAnalyzer::endRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when starting to processes a luminosity block ------------ -/* -void -MiniAODElectronIDValidationAnalyzer::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a luminosity block ------------ -/* -void -MiniAODElectronIDValidationAnalyzer::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void MiniAODElectronIDValidationAnalyzer::fillDescriptions(edm::ConfigurationDescriptions &descriptions) { //The following says we do not know what parameters are allowed so do no validation From 02604f822dfc6e08917d8ce7b34a91fc74e2086c Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Fri, 27 Oct 2023 15:57:37 -0500 Subject: [PATCH 5/9] Clean up some unnecessary transition function calls/comments in L1Trigger --- .../L1TRawToDigi/plugins/AMC13DumpToRaw.cc | 43 ---------------- .../L1TRawToDigi/plugins/L1TDigiToRaw.cc | 10 ---- .../plugins/TriggerRulePrefireVetoFilter.cc | 51 ------------------- .../plugins/L1TCaloLayer1RawToDigi.cc | 48 ----------------- .../L1TCaloLayer1/plugins/L1TCaloLayer1.cc | 28 ---------- .../plugins/L1TCaloLayer1Validator.cc | 44 ---------------- .../plugins/L1TStage2CaloAnalyzer.cc | 47 ----------------- .../plugins/L1TStage2InputPatternWriter.cc | 47 ----------------- .../plugins/L1TStage2Layer1Producer.cc | 24 --------- .../plugins/L1TStage2Layer2Producer.cc | 24 --------- .../L1TGlobal/plugins/L1TGlobalAnalyzer.cc | 47 ----------------- .../plugins/L1TUtmTriggerMenuDumper.cc | 11 +--- L1Trigger/L1TMuon/plugins/L1TBMTFConverter.cc | 22 -------- .../plugins/L1TMicroGMTInputProducer.cc | 17 ------- .../L1TMicroGMTInputProducerFromGen.cc | 23 --------- .../L1TMuon/plugins/L1TMuonCaloSumProducer.cc | 23 --------- L1Trigger/L1TMuon/plugins/L1TMuonProducer.cc | 12 ----- .../L1TMuon/plugins/L1TMuonQualityAdjuster.cc | 22 -------- .../plugins/L1TMuonEndCapTrackProducer.cc | 2 - .../plugins/L1TMuonEndCapTrackProducer.h | 8 --- 20 files changed, 1 insertion(+), 552 deletions(-) diff --git a/EventFilter/L1TRawToDigi/plugins/AMC13DumpToRaw.cc b/EventFilter/L1TRawToDigi/plugins/AMC13DumpToRaw.cc index 9bdf63222fa40..347a3fe51f14e 100644 --- a/EventFilter/L1TRawToDigi/plugins/AMC13DumpToRaw.cc +++ b/EventFilter/L1TRawToDigi/plugins/AMC13DumpToRaw.cc @@ -49,7 +49,6 @@ namespace l1t { class AMC13DumpToRaw : public edm::one::EDProducer<> { public: explicit AMC13DumpToRaw(const edm::ParameterSet&); - ~AMC13DumpToRaw() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); @@ -64,11 +63,6 @@ namespace l1t { // void formatRaw(edm::Event& iEvent, amc13::Packet& amc13, FEDRawData& fed_data); - //virtual void beginRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void endRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - // ----------member data --------------------------- std::ifstream file_; std::string filename_; @@ -106,11 +100,6 @@ namespace l1t { produces(); } - AMC13DumpToRaw::~AMC13DumpToRaw() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) - } - // // member functions // @@ -227,38 +216,6 @@ namespace l1t { // ------------ method called once each job just after ending the event loop ------------ void AMC13DumpToRaw::endJob() { file_.close(); } - // ------------ method called when starting to processes a run ------------ - /* -void -AMC13DumpToRaw::beginRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - - // ------------ method called when ending the processing of a run ------------ - /* -void -AMC13DumpToRaw::endRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - - // ------------ method called when starting to processes a luminosity block ------------ - /* -vvoid -AMC13DumpToRaw::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - - // ------------ method called when ending the processing of a luminosity block ------------ - /* -void -AMC13DumpToRaw::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void AMC13DumpToRaw::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/EventFilter/L1TRawToDigi/plugins/L1TDigiToRaw.cc b/EventFilter/L1TRawToDigi/plugins/L1TDigiToRaw.cc index 9789807862c34..46227383066cd 100644 --- a/EventFilter/L1TRawToDigi/plugins/L1TDigiToRaw.cc +++ b/EventFilter/L1TRawToDigi/plugins/L1TDigiToRaw.cc @@ -47,20 +47,12 @@ namespace l1t { class L1TDigiToRaw : public edm::stream::EDProducer<> { public: explicit L1TDigiToRaw(const edm::ParameterSet&); - ~L1TDigiToRaw() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); - using edm::stream::EDProducer<>::consumes; - private: void produce(edm::Event&, const edm::EventSetup&) override; - void beginRun(edm::Run const&, edm::EventSetup const&) override{}; - void endRun(edm::Run const&, edm::EventSetup const&) override{}; - void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override{}; - void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override{}; - // ----------member data --------------------------- int evtType_; int fedId_; @@ -95,8 +87,6 @@ namespace l1t { slinkTrailerSize_ = config.getUntrackedParameter("lenSlinkTrailer", 8); } - L1TDigiToRaw::~L1TDigiToRaw() {} - // ------------ method called to produce the data ------------ void L1TDigiToRaw::produce(edm::Event& event, const edm::EventSetup& setup) { using namespace edm; diff --git a/EventFilter/L1TRawToDigi/plugins/TriggerRulePrefireVetoFilter.cc b/EventFilter/L1TRawToDigi/plugins/TriggerRulePrefireVetoFilter.cc index 1459ae47d6e85..5a9db004ce1f9 100644 --- a/EventFilter/L1TRawToDigi/plugins/TriggerRulePrefireVetoFilter.cc +++ b/EventFilter/L1TRawToDigi/plugins/TriggerRulePrefireVetoFilter.cc @@ -39,19 +39,11 @@ class TriggerRulePrefireVetoFilter : public edm::stream::EDFilter<> { public: explicit TriggerRulePrefireVetoFilter(const edm::ParameterSet&); - ~TriggerRulePrefireVetoFilter() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - void beginStream(edm::StreamID) override; bool filter(edm::Event&, const edm::EventSetup&) override; - void endStream() override; - - //virtual void beginRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void endRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; // ----------member data --------------------------- edm::EDGetTokenT tcdsRecordToken_; @@ -73,11 +65,6 @@ TriggerRulePrefireVetoFilter::TriggerRulePrefireVetoFilter(const edm::ParameterS //now do what ever initialization is needed } -TriggerRulePrefireVetoFilter::~TriggerRulePrefireVetoFilter() { - // do anything here that needs to be done at destruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // @@ -131,44 +118,6 @@ bool TriggerRulePrefireVetoFilter::filter(edm::Event& iEvent, const edm::EventSe return false; } -// ------------ method called once each stream before processing any runs, lumis or events ------------ -void TriggerRulePrefireVetoFilter::beginStream(edm::StreamID) {} - -// ------------ method called once each stream after processing all runs, lumis and events ------------ -void TriggerRulePrefireVetoFilter::endStream() {} - -// ------------ method called when starting to processes a run ------------ -/* -void -TriggerRulePrefireVetoFilter::beginRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a run ------------ -/* -void -TriggerRulePrefireVetoFilter::endRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when starting to processes a luminosity block ------------ -/* -void -TriggerRulePrefireVetoFilter::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a luminosity block ------------ -/* -void -TriggerRulePrefireVetoFilter::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void TriggerRulePrefireVetoFilter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/EventFilter/L1TXRawToDigi/plugins/L1TCaloLayer1RawToDigi.cc b/EventFilter/L1TXRawToDigi/plugins/L1TCaloLayer1RawToDigi.cc index 75208a4f0338a..d32858cb3aba1 100644 --- a/EventFilter/L1TXRawToDigi/plugins/L1TCaloLayer1RawToDigi.cc +++ b/EventFilter/L1TXRawToDigi/plugins/L1TCaloLayer1RawToDigi.cc @@ -67,14 +67,11 @@ using namespace edm; class L1TCaloLayer1RawToDigi : public stream::EDProducer<> { public: explicit L1TCaloLayer1RawToDigi(const ParameterSet&); - ~L1TCaloLayer1RawToDigi() override; static void fillDescriptions(ConfigurationDescriptions& descriptions); private: - void beginStream(StreamID) override; void produce(Event&, const EventSetup&) override; - void endStream() override; void makeECalTPGs(uint32_t lPhi, UCTCTP7RawData& ctp7Data, std::unique_ptr& ecalTPGs); @@ -84,11 +81,6 @@ class L1TCaloLayer1RawToDigi : public stream::EDProducer<> { void makeRegions(uint32_t lPhi, UCTCTP7RawData& ctp7Data, std::unique_ptr& regions); - //virtual void beginRun(Run const&, EventSetup const&) override; - //virtual void endRun(Run const&, EventSetup const&) override; - //virtual void beginLuminosityBlock(LuminosityBlock const&, EventSetup const&) override; - //virtual void endLuminosityBlock(LuminosityBlock const&, EventSetup const&) override; - // ----------member data --------------------------- InputTag fedRawDataLabel; @@ -122,8 +114,6 @@ L1TCaloLayer1RawToDigi::L1TCaloLayer1RawToDigi(const ParameterSet& iConfig) consumes(fedRawDataLabel); } -L1TCaloLayer1RawToDigi::~L1TCaloLayer1RawToDigi() {} - // // member functions // @@ -378,44 +368,6 @@ void L1TCaloLayer1RawToDigi::makeRegions(uint32_t lPhi, } } -// ------------ method called once each stream before processing any runs, lumis or events ------------ -void L1TCaloLayer1RawToDigi::beginStream(StreamID) {} - -// ------------ method called once each stream after processing all runs, lumis and events ------------ -void L1TCaloLayer1RawToDigi::endStream() {} - -// ------------ method called when starting to processes a run ------------ -/* - void - L1TCaloLayer1RawToDigi::beginRun(Run const&, EventSetup const&) - { - } -*/ - -// ------------ method called when ending the processing of a run ------------ -/* - void - L1TCaloLayer1RawToDigi::endRun(Run const&, EventSetup const&) - { - } -*/ - -// ------------ method called when starting to processes a luminosity block ------------ -/* - void - L1TCaloLayer1RawToDigi::beginLuminosityBlock(LuminosityBlock const&, EventSetup const&) - { - } -*/ - -// ------------ method called when ending the processing of a luminosity block ------------ -/* - void - L1TCaloLayer1RawToDigi::endLuminosityBlock(LuminosityBlock const&, EventSetup const&) - { - } -*/ - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void L1TCaloLayer1RawToDigi::fillDescriptions(ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/L1Trigger/L1TCaloLayer1/plugins/L1TCaloLayer1.cc b/L1Trigger/L1TCaloLayer1/plugins/L1TCaloLayer1.cc index 036ea962594e5..f04ab8afd3e13 100644 --- a/L1Trigger/L1TCaloLayer1/plugins/L1TCaloLayer1.cc +++ b/L1Trigger/L1TCaloLayer1/plugins/L1TCaloLayer1.cc @@ -66,10 +66,6 @@ class L1TCaloLayer1 : public edm::stream::EDProducer<> { void beginRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void endRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - // ----------member data --------------------------- edm::EDGetTokenT ecalTPSource; @@ -348,30 +344,6 @@ void L1TCaloLayer1::beginRun(const edm::Run& iRun, const edm::EventSetup& iSetup } } -// ------------ method called when ending the processing of a run ------------ -/* - void - L1TCaloLayer1::endRun(edm::Run const&, edm::EventSetup const&) - { - } -*/ - -// ------------ method called when starting to processes a luminosity block ------------ -/* - void - L1TCaloLayer1::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) - { - } -*/ - -// ------------ method called when ending the processing of a luminosity block ------------ -/* - void - L1TCaloLayer1::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) - { - } -*/ - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void L1TCaloLayer1::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //Description set to reflect default present in simCaloStage2Layer1Digis_cfi.py diff --git a/L1Trigger/L1TCaloLayer1/plugins/L1TCaloLayer1Validator.cc b/L1Trigger/L1TCaloLayer1/plugins/L1TCaloLayer1Validator.cc index 03f68391d3a59..542ba7a39d1f5 100644 --- a/L1Trigger/L1TCaloLayer1/plugins/L1TCaloLayer1Validator.cc +++ b/L1Trigger/L1TCaloLayer1/plugins/L1TCaloLayer1Validator.cc @@ -46,20 +46,13 @@ using namespace l1t; class L1TCaloLayer1Validator : public edm::one::EDAnalyzer<> { public: explicit L1TCaloLayer1Validator(const edm::ParameterSet&); - ~L1TCaloLayer1Validator() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - void beginJob() override; void analyze(const edm::Event&, const edm::EventSetup&) override; void endJob() override; - //virtual void beginRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void endRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - // ----------member data --------------------------- edm::EDGetTokenT testTowerToken; @@ -144,8 +137,6 @@ L1TCaloLayer1Validator::L1TCaloLayer1Validator(const edm::ParameterSet& iConfig) ngCard[c] = nbCard[c] = zgCard[c] = zbCard[c] = 0; } -L1TCaloLayer1Validator::~L1TCaloLayer1Validator() {} - // // member functions // @@ -390,9 +381,6 @@ void L1TCaloLayer1Validator::analyze(const edm::Event& iEvent, const edm::EventS eventCount++; } -// ------------ method called once each job just before starting event loop ------------ -void L1TCaloLayer1Validator::beginJob() {} - // ------------ method called once each job just after ending the event loop ------------ void L1TCaloLayer1Validator::endJob() { if (validateTowers) @@ -420,38 +408,6 @@ void L1TCaloLayer1Validator::endJob() { } } -// ------------ method called when starting to processes a run ------------ -/* -void -L1TCaloLayer1Validator::beginRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a run ------------ -/* -void -L1TCaloLayer1Validator::endRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when starting to processes a luminosity block ------------ -/* -void -L1TCaloLayer1Validator::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a luminosity block ------------ -/* -void -L1TCaloLayer1Validator::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void L1TCaloLayer1Validator::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TStage2CaloAnalyzer.cc b/L1Trigger/L1TCalorimeter/plugins/L1TStage2CaloAnalyzer.cc index 9c3d6d7558f23..4b592920b1688 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TStage2CaloAnalyzer.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TStage2CaloAnalyzer.cc @@ -29,19 +29,12 @@ namespace l1t { class L1TStage2CaloAnalyzer : public edm::one::EDAnalyzer { public: explicit L1TStage2CaloAnalyzer(const edm::ParameterSet&); - ~L1TStage2CaloAnalyzer() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: void beginJob() override; void analyze(const edm::Event&, const edm::EventSetup&) override; - void endJob() override; - - //virtual void beginRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void endRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; // ----------member data --------------------------- edm::EDGetToken m_towerToken; @@ -296,11 +289,6 @@ namespace l1t { typeStr_.push_back("sumasymhthf"); } - L1TStage2CaloAnalyzer::~L1TStage2CaloAnalyzer() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) - } - // // member functions // @@ -815,41 +803,6 @@ namespace l1t { hsortMP_ = fs->make("sortMP", "", 201, -100.5, 100.5); } - // ------------ method called once each job just after ending the event loop ------------ - void L1TStage2CaloAnalyzer::endJob() {} - - // ------------ method called when starting to processes a run ------------ - /* - void - L1TStage2CaloAnalyzer::beginRun(edm::Run const&, edm::EventSetup const&) - { - } - */ - - // ------------ method called when ending the processing of a run ------------ - /* - void - L1TStage2CaloAnalyzer::endRun(edm::Run const&, edm::EventSetup const&) - { - } - */ - - // ------------ method called when starting to processes a luminosity block ------------ - /* - void - L1TStage2CaloAnalyzer::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) - { - } - */ - - // ------------ method called when ending the processing of a luminosity block ------------ - /* - void - L1TStage2CaloAnalyzer::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) - { - } - */ - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void L1TStage2CaloAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TStage2InputPatternWriter.cc b/L1Trigger/L1TCalorimeter/plugins/L1TStage2InputPatternWriter.cc index eeb26ca7a64aa..940cc5154e2b9 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TStage2InputPatternWriter.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TStage2InputPatternWriter.cc @@ -44,20 +44,13 @@ class L1TStage2InputPatternWriter : public edm::one::EDAnalyzer<> { public: explicit L1TStage2InputPatternWriter(const edm::ParameterSet&); - ~L1TStage2InputPatternWriter() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - void beginJob() override; void analyze(const edm::Event&, const edm::EventSetup&) override; void endJob() override; - //virtual void beginRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void endRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - // ----------member data --------------------------- edm::EDGetToken m_towerToken; @@ -118,11 +111,6 @@ L1TStage2InputPatternWriter::L1TStage2InputPatternWriter(const edm::ParameterSet LogDebug("L1TDebug") << "Preparing for " << nLink_ << " links" << std::endl; } -L1TStage2InputPatternWriter::~L1TStage2InputPatternWriter() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // @@ -221,9 +209,6 @@ void L1TStage2InputPatternWriter::analyze(const edm::Event& iEvent, const edm::E } } -// ------------ method called once each job just before starting event loop ------------ -void L1TStage2InputPatternWriter::beginJob() {} - // ------------ method called once each job just after ending the event loop ------------ void L1TStage2InputPatternWriter::endJob() { //frames per event @@ -299,38 +284,6 @@ void L1TStage2InputPatternWriter::endJob() { } } -// ------------ method called when starting to processes a run ------------ -/* -void -L1TStage2InputPatternWriter::beginRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a run ------------ -/* -void -L1TStage2InputPatternWriter::endRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when starting to processes a luminosity block ------------ -/* -void -L1TStage2InputPatternWriter::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a luminosity block ------------ -/* -void -L1TStage2InputPatternWriter::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void L1TStage2InputPatternWriter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer1Producer.cc b/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer1Producer.cc index 1428e77c55e09..ddeed6650b81f 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer1Producer.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer1Producer.cc @@ -71,9 +71,6 @@ class L1TStage2Layer1Producer : public edm::stream::EDProducer<> { void produce(edm::Event&, const edm::EventSetup&) override; void beginRun(edm::Run const&, edm::EventSetup const&) override; - void endRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; // ----------member data --------------------------- @@ -355,27 +352,6 @@ void L1TStage2Layer1Producer::beginRun(edm::Run const& iRun, edm::EventSetup con } } -// ------------ method called when ending the processing of a run ------------ -void L1TStage2Layer1Producer::endRun(edm::Run const&, edm::EventSetup const&) {} - -// ------------ method called when starting to processes a luminosity block ------------ -/* -void -L1TStage2Layer1Producer::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup cons -t&) -{ -} -*/ - -// ------------ method called when ending the processing of a luminosity block ------------ -/* -void -L1TStage2Layer1Producer::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const& -) -{ -} -*/ - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void L1TStage2Layer1Producer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer2Producer.cc b/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer2Producer.cc index 2d49330b96462..b13c93ef24889 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer2Producer.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer2Producer.cc @@ -65,9 +65,6 @@ class L1TStage2Layer2Producer : public edm::stream::EDProducer<> { void produce(edm::Event&, const edm::EventSetup&) override; void beginRun(edm::Run const&, edm::EventSetup const&) override; - void endRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; // ----------member data --------------------------- @@ -314,27 +311,6 @@ void L1TStage2Layer2Producer::beginRun(edm::Run const& iRun, edm::EventSetup con } } -// ------------ method called when ending the processing of a run ------------ -void L1TStage2Layer2Producer::endRun(edm::Run const&, edm::EventSetup const&) {} - -// ------------ method called when starting to processes a luminosity block ------------ -/* -void -L1TStage2Layer2Producer::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup cons -t&) -{ -} -*/ - -// ------------ method called when ending the processing of a luminosity block ------------ -/* -void -L1TStage2Layer2Producer::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const& -) -{ -} -*/ - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void L1TStage2Layer2Producer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/L1Trigger/L1TGlobal/plugins/L1TGlobalAnalyzer.cc b/L1Trigger/L1TGlobal/plugins/L1TGlobalAnalyzer.cc index d396a6fbb358b..d4d8429528dec 100644 --- a/L1Trigger/L1TGlobal/plugins/L1TGlobalAnalyzer.cc +++ b/L1Trigger/L1TGlobal/plugins/L1TGlobalAnalyzer.cc @@ -53,19 +53,12 @@ namespace l1t { class L1TGlobalAnalyzer : public edm::one::EDAnalyzer<> { public: explicit L1TGlobalAnalyzer(const edm::ParameterSet&); - ~L1TGlobalAnalyzer() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: void beginJob() override; void analyze(const edm::Event&, const edm::EventSetup&) override; - void endJob() override; - - //virtual void beginRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void endRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; // ----------member data --------------------------- edm::EDGetToken m_gmuToken; @@ -255,11 +248,6 @@ namespace l1t { typeStr_.push_back("sum"); } - L1TGlobalAnalyzer::~L1TGlobalAnalyzer() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) - } - // // member functions // @@ -986,41 +974,6 @@ namespace l1t { dmxVGtDir_.make("hDmxVsGTSumEt_HFM1", "Dmx versus GT HFM1", 16, -0.5, 15.5, 16, -0.5, 15.5); } - // ------------ method called once each job just after ending the event loop ------------ - void L1TGlobalAnalyzer::endJob() {} - - // ------------ method called when starting to processes a run ------------ - /* -void -L1TGlobalAnalyzer::beginRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - - // ------------ method called when ending the processing of a run ------------ - /* -void -L1TGlobalAnalyzer::endRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - - // ------------ method called when starting to processes a luminosity block ------------ - /* -void -L1TGlobalAnalyzer::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - - // ------------ method called when ending the processing of a luminosity block ------------ - /* -void -L1TGlobalAnalyzer::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void L1TGlobalAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/L1Trigger/L1TGlobal/plugins/L1TUtmTriggerMenuDumper.cc b/L1Trigger/L1TGlobal/plugins/L1TUtmTriggerMenuDumper.cc index 54bb2e78a87f4..1dbf391d7e7b0 100644 --- a/L1Trigger/L1TGlobal/plugins/L1TUtmTriggerMenuDumper.cc +++ b/L1Trigger/L1TGlobal/plugins/L1TUtmTriggerMenuDumper.cc @@ -34,10 +34,9 @@ using namespace edm; using namespace std; using namespace tmeventsetup; -class L1TUtmTriggerMenuDumper : public one::EDAnalyzer { +class L1TUtmTriggerMenuDumper : public one::EDAnalyzer { public: explicit L1TUtmTriggerMenuDumper(const ParameterSet&); - ~L1TUtmTriggerMenuDumper() override; static void fillDescriptions(ConfigurationDescriptions& descriptions); @@ -48,16 +47,12 @@ class L1TUtmTriggerMenuDumper : public one::EDAnalyzer m_l1TriggerMenuToken; }; L1TUtmTriggerMenuDumper::L1TUtmTriggerMenuDumper(const ParameterSet& iConfig) : m_l1TriggerMenuToken(esConsumes()) {} -L1TUtmTriggerMenuDumper::~L1TUtmTriggerMenuDumper() {} - void L1TUtmTriggerMenuDumper::analyze(Event const& iEvent, EventSetup const& iSetup) {} void L1TUtmTriggerMenuDumper::beginJob() { cout << "INFO: L1TUtmTriggerMenuDumper module beginJob called.\n"; } @@ -187,10 +182,6 @@ void L1TUtmTriggerMenuDumper::beginRun(Run const& run, EventSetup const& iSetup) void L1TUtmTriggerMenuDumper::endRun(Run const&, EventSetup const&) {} -void L1TUtmTriggerMenuDumper::beginLuminosityBlock(LuminosityBlock const&, EventSetup const&) {} - -void L1TUtmTriggerMenuDumper::endLuminosityBlock(LuminosityBlock const&, EventSetup const&) {} - void L1TUtmTriggerMenuDumper::fillDescriptions(ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation // Please change this to state exactly what you do use, even if it is no parameters diff --git a/L1Trigger/L1TMuon/plugins/L1TBMTFConverter.cc b/L1Trigger/L1TMuon/plugins/L1TBMTFConverter.cc index b7c82cacd7700..038f9b5978adc 100644 --- a/L1Trigger/L1TMuon/plugins/L1TBMTFConverter.cc +++ b/L1Trigger/L1TMuon/plugins/L1TBMTFConverter.cc @@ -44,17 +44,12 @@ using namespace l1t; class L1TBMTFConverter : public edm::stream::EDProducer<> { public: explicit L1TBMTFConverter(const edm::ParameterSet&); - ~L1TBMTFConverter() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: void produce(edm::Event&, const edm::EventSetup&) override; - void beginRun(const edm::Run&, edm::EventSetup const&) override; - void endRun(const edm::Run&, edm::EventSetup const&) override; - void beginLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) override; - void endLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) override; // ----------member data --------------------------- edm::EDGetTokenT m_barrelTfInputToken; edm::InputTag m_barrelTfInputTag; @@ -111,11 +106,6 @@ L1TBMTFConverter::L1TBMTFConverter(const edm::ParameterSet& iConfig) { ptMap_[31] = 280; } -L1TBMTFConverter::~L1TBMTFConverter() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // @@ -144,18 +134,6 @@ void L1TBMTFConverter::produce(edm::Event& iEvent, const edm::EventSetup& iSetup iEvent.put(std::move(convMuons), "ConvBMTFMuons"); } -// ------------ method called when starting to processes a run ------------ -void L1TBMTFConverter::beginRun(const edm::Run&, edm::EventSetup const&) {} - -// ------------ method called when ending the processing of a run ------------ -void L1TBMTFConverter::endRun(const edm::Run&, edm::EventSetup const&) {} - -// ------------ method called when starting to processes a luminosity block ------------ -void L1TBMTFConverter::beginLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) {} - -// ------------ method called when ending the processing of a luminosity block ------------ -void L1TBMTFConverter::endLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) {} - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void L1TBMTFConverter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/L1Trigger/L1TMuon/plugins/L1TMicroGMTInputProducer.cc b/L1Trigger/L1TMuon/plugins/L1TMicroGMTInputProducer.cc index a8fde2a16727d..6711efe5d69e1 100644 --- a/L1Trigger/L1TMuon/plugins/L1TMicroGMTInputProducer.cc +++ b/L1Trigger/L1TMuon/plugins/L1TMicroGMTInputProducer.cc @@ -53,11 +53,6 @@ class L1TMicroGMTInputProducer : public edm::stream::EDProducer<> { private: void produce(edm::Event&, const edm::EventSetup&) override; - void beginRun(const edm::Run&, edm::EventSetup const&) override; - void endRun(const edm::Run&, edm::EventSetup const&) override; - void beginLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) override; - void endLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) override; - void openFile(); void skipHeader(); int convertToInt(std::string& bitstr) const; @@ -297,18 +292,6 @@ void L1TMicroGMTInputProducer::produce(edm::Event& iEvent, const edm::EventSetup m_currEvt++; } -// ------------ method called when starting to processes a run ------------ -void L1TMicroGMTInputProducer::beginRun(const edm::Run&, edm::EventSetup const&) {} - -// ------------ method called when ending the processing of a run ------------ -void L1TMicroGMTInputProducer::endRun(const edm::Run&, edm::EventSetup const&) {} - -// ------------ method called when starting to processes a luminosity block ------------ -void L1TMicroGMTInputProducer::beginLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) {} - -// ------------ method called when ending the processing of a luminosity block ------------ -void L1TMicroGMTInputProducer::endLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) {} - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void L1TMicroGMTInputProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/L1Trigger/L1TMuon/plugins/L1TMicroGMTInputProducerFromGen.cc b/L1Trigger/L1TMuon/plugins/L1TMicroGMTInputProducerFromGen.cc index 0262221af860b..966c34df1e783 100644 --- a/L1Trigger/L1TMuon/plugins/L1TMicroGMTInputProducerFromGen.cc +++ b/L1Trigger/L1TMuon/plugins/L1TMicroGMTInputProducerFromGen.cc @@ -50,18 +50,12 @@ using namespace l1t; class L1TMicroGMTInputProducerFromGen : public edm::stream::EDProducer<> { public: explicit L1TMicroGMTInputProducerFromGen(const edm::ParameterSet&); - ~L1TMicroGMTInputProducerFromGen() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: void produce(edm::Event&, const edm::EventSetup&) override; - void beginRun(const edm::Run&, edm::EventSetup const&) override; - void endRun(const edm::Run&, edm::EventSetup const&) override; - void beginLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) override; - void endLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) override; - static bool compareMuons(const RegionalMuonCand&, const RegionalMuonCand&); // ----------member data --------------------------- @@ -93,11 +87,6 @@ L1TMicroGMTInputProducerFromGen::L1TMicroGMTInputProducerFromGen(const edm::Para produces("TriggerTowerSums"); } -L1TMicroGMTInputProducerFromGen::~L1TMicroGMTInputProducerFromGen() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // @@ -242,18 +231,6 @@ void L1TMicroGMTInputProducerFromGen::produce(edm::Event& iEvent, const edm::Eve m_currEvt++; } -// ------------ method called when starting to processes a run ------------ -void L1TMicroGMTInputProducerFromGen::beginRun(const edm::Run&, edm::EventSetup const&) {} - -// ------------ method called when ending the processing of a run ------------ -void L1TMicroGMTInputProducerFromGen::endRun(const edm::Run&, edm::EventSetup const&) {} - -// ------------ method called when starting to processes a luminosity block ------------ -void L1TMicroGMTInputProducerFromGen::beginLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) {} - -// ------------ method called when ending the processing of a luminosity block ------------ -void L1TMicroGMTInputProducerFromGen::endLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) {} - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void L1TMicroGMTInputProducerFromGen::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/L1Trigger/L1TMuon/plugins/L1TMuonCaloSumProducer.cc b/L1Trigger/L1TMuon/plugins/L1TMuonCaloSumProducer.cc index 2147901201956..85c063aef847a 100644 --- a/L1Trigger/L1TMuon/plugins/L1TMuonCaloSumProducer.cc +++ b/L1Trigger/L1TMuon/plugins/L1TMuonCaloSumProducer.cc @@ -47,18 +47,12 @@ using namespace l1t; class L1TMuonCaloSumProducer : public edm::stream::EDProducer<> { public: explicit L1TMuonCaloSumProducer(const edm::ParameterSet&); - ~L1TMuonCaloSumProducer() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: void produce(edm::Event&, const edm::EventSetup&) override; - void beginRun(const edm::Run&, edm::EventSetup const&) override; - void endRun(const edm::Run&, edm::EventSetup const&) override; - void beginLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) override; - void endLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) override; - edm::EDGetTokenT m_caloTowerToken; edm::InputTag m_caloLabel; }; @@ -83,11 +77,6 @@ L1TMuonCaloSumProducer::L1TMuonCaloSumProducer(const edm::ParameterSet& iConfig) produces("TriggerTower2x2s"); } -L1TMuonCaloSumProducer::~L1TMuonCaloSumProducer() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // @@ -191,18 +180,6 @@ void L1TMuonCaloSumProducer::produce(edm::Event& iEvent, const edm::EventSetup& iEvent.put(std::move(tower2x2s), "TriggerTower2x2s"); } -// ------------ method called when starting to processes a run ------------ -void L1TMuonCaloSumProducer::beginRun(const edm::Run&, edm::EventSetup const&) {} - -// ------------ method called when ending the processing of a run ------------ -void L1TMuonCaloSumProducer::endRun(const edm::Run&, edm::EventSetup const&) {} - -// ------------ method called when starting to processes a luminosity block ------------ -void L1TMuonCaloSumProducer::beginLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) {} - -// ------------ method called when ending the processing of a luminosity block ------------ -void L1TMuonCaloSumProducer::endLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) {} - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void L1TMuonCaloSumProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/L1Trigger/L1TMuon/plugins/L1TMuonProducer.cc b/L1Trigger/L1TMuon/plugins/L1TMuonProducer.cc index 94378e8c43249..4353d7ec3aff7 100644 --- a/L1Trigger/L1TMuon/plugins/L1TMuonProducer.cc +++ b/L1Trigger/L1TMuon/plugins/L1TMuonProducer.cc @@ -67,9 +67,6 @@ class L1TMuonProducer : public edm::stream::EDProducer<> { void produce(edm::Event&, const edm::EventSetup&) override; void beginRun(edm::Run const&, edm::EventSetup const&) override; - void endRun(edm::Run const&, edm::EventSetup const&) override; - void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; static bool compareMuons(const std::shared_ptr& mu1, const std::shared_ptr& mu2); @@ -617,15 +614,6 @@ void L1TMuonProducer::beginRun(edm::Run const& run, edm::EventSetup const& iSetu } } -// ------------ method called when ending the processing of a run ------------ -void L1TMuonProducer::endRun(edm::Run const&, edm::EventSetup const&) {} - -// ------------ method called when starting to processes a luminosity block ------------ -void L1TMuonProducer::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {} - -// ------------ method called when ending the processing of a luminosity block ------------ -void L1TMuonProducer::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {} - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void L1TMuonProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/L1Trigger/L1TMuon/plugins/L1TMuonQualityAdjuster.cc b/L1Trigger/L1TMuon/plugins/L1TMuonQualityAdjuster.cc index 0215f67eb1ea4..95cf3bb6a52ff 100644 --- a/L1Trigger/L1TMuon/plugins/L1TMuonQualityAdjuster.cc +++ b/L1Trigger/L1TMuon/plugins/L1TMuonQualityAdjuster.cc @@ -34,16 +34,11 @@ using namespace l1t; class L1TMuonQualityAdjuster : public edm::stream::EDProducer<> { public: explicit L1TMuonQualityAdjuster(const edm::ParameterSet&); - ~L1TMuonQualityAdjuster() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: void produce(edm::Event&, const edm::EventSetup&) override; - void beginRun(const edm::Run&, edm::EventSetup const&) override; - void endRun(const edm::Run&, edm::EventSetup const&) override; - void beginLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) override; - void endLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) override; // ----------member data --------------------------- edm::EDGetTokenT m_barrelTfInputToken; edm::EDGetTokenT m_overlapTfInputToken; @@ -80,11 +75,6 @@ L1TMuonQualityAdjuster::L1TMuonQualityAdjuster(const edm::ParameterSet& iConfig) produces("EMTF"); } -L1TMuonQualityAdjuster::~L1TMuonQualityAdjuster() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // @@ -161,18 +151,6 @@ void L1TMuonQualityAdjuster::produce(edm::Event& iEvent, const edm::EventSetup& iEvent.put(std::move(filteredEMTFMuons), "EMTF"); } -// ------------ method called when starting to processes a run ------------ -void L1TMuonQualityAdjuster::beginRun(const edm::Run&, edm::EventSetup const&) {} - -// ------------ method called when ending the processing of a run ------------ -void L1TMuonQualityAdjuster::endRun(const edm::Run&, edm::EventSetup const&) {} - -// ------------ method called when starting to processes a luminosity block ------------ -void L1TMuonQualityAdjuster::beginLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) {} - -// ------------ method called when ending the processing of a luminosity block ------------ -void L1TMuonQualityAdjuster::endLuminosityBlock(const edm::LuminosityBlock&, edm::EventSetup const&) {} - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void L1TMuonQualityAdjuster::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/L1Trigger/L1TMuonEndCap/plugins/L1TMuonEndCapTrackProducer.cc b/L1Trigger/L1TMuonEndCap/plugins/L1TMuonEndCapTrackProducer.cc index e4d14200a6b24..20adbc0ab9e2f 100644 --- a/L1Trigger/L1TMuonEndCap/plugins/L1TMuonEndCapTrackProducer.cc +++ b/L1Trigger/L1TMuonEndCap/plugins/L1TMuonEndCapTrackProducer.cc @@ -8,8 +8,6 @@ L1TMuonEndCapTrackProducer::L1TMuonEndCapTrackProducer(const edm::ParameterSet& produces("EMTF"); // EMTF tracks output to uGMT } -L1TMuonEndCapTrackProducer::~L1TMuonEndCapTrackProducer() {} - void L1TMuonEndCapTrackProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { // Create pointers to output products auto out_hits_tmp = std::make_unique(); // before zero suppression diff --git a/L1Trigger/L1TMuonEndCap/plugins/L1TMuonEndCapTrackProducer.h b/L1Trigger/L1TMuonEndCap/plugins/L1TMuonEndCapTrackProducer.h index e63db89313cce..30aaba2ea5e2b 100644 --- a/L1Trigger/L1TMuonEndCap/plugins/L1TMuonEndCapTrackProducer.h +++ b/L1Trigger/L1TMuonEndCap/plugins/L1TMuonEndCapTrackProducer.h @@ -19,20 +19,12 @@ class L1TMuonEndCapTrackProducer : public edm::stream::EDProducer<> { public: explicit L1TMuonEndCapTrackProducer(const edm::ParameterSet&); - ~L1TMuonEndCapTrackProducer() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: void produce(edm::Event&, const edm::EventSetup&) override; - //void beginJob() override; - //void endJob() override; - //void beginRun(edm::Run const&, edm::EventSetup const&) override; - //void endRun(edm::Run const&, edm::EventSetup const&) override; - //void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - private: std::unique_ptr track_finder_; std::unique_ptr uGMT_converter_; From 8fdb61272a61186cdfcbddcc047b3aa4502dbf23 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Fri, 27 Oct 2023 15:58:11 -0500 Subject: [PATCH 6/9] Clean up some unnecessary transition function calls/comments in EventFilter --- EventFilter/Utilities/plugins/ExceptionGenerator.cc | 2 -- EventFilter/Utilities/plugins/ExceptionGenerator.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/EventFilter/Utilities/plugins/ExceptionGenerator.cc b/EventFilter/Utilities/plugins/ExceptionGenerator.cc index a3e8696ede3d9..87541772343ec 100644 --- a/EventFilter/Utilities/plugins/ExceptionGenerator.cc +++ b/EventFilter/Utilities/plugins/ExceptionGenerator.cc @@ -250,6 +250,4 @@ namespace evf { } } - void ExceptionGenerator::endLuminosityBlock(edm::LuminosityBlock const &lb, edm::EventSetup const &es) {} - } // end namespace evf diff --git a/EventFilter/Utilities/plugins/ExceptionGenerator.h b/EventFilter/Utilities/plugins/ExceptionGenerator.h index 1630855ebee8c..bf42d1a0476bd 100644 --- a/EventFilter/Utilities/plugins/ExceptionGenerator.h +++ b/EventFilter/Utilities/plugins/ExceptionGenerator.h @@ -17,10 +17,8 @@ namespace evf { static const std::string menu[menu_items]; explicit ExceptionGenerator(const edm::ParameterSet&); - ~ExceptionGenerator() override{}; void beginRun(const edm::Run& r, const edm::EventSetup& iSetup) override; void analyze(const edm::Event& e, const edm::EventSetup& c) override; - void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; private: int actionId_; From 448d459393192d8f841e4e3066438d3ef05c461c Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Fri, 27 Oct 2023 15:58:24 -0500 Subject: [PATCH 7/9] Clean up some unnecessary transition function calls/comments in HLTrigger --- .../plugins/TestBXVectorRefProducer.cc | 51 ------------------- .../special/plugins/HLTRechitsToDigis.cc | 38 -------------- 2 files changed, 89 deletions(-) diff --git a/HLTrigger/HLTfilters/plugins/TestBXVectorRefProducer.cc b/HLTrigger/HLTfilters/plugins/TestBXVectorRefProducer.cc index a9e2d8727a0f9..2f3aabb69b13c 100644 --- a/HLTrigger/HLTfilters/plugins/TestBXVectorRefProducer.cc +++ b/HLTrigger/HLTfilters/plugins/TestBXVectorRefProducer.cc @@ -39,19 +39,11 @@ class TestBXVectorRefProducer : public edm::stream::EDProducer<> { public: explicit TestBXVectorRefProducer(const edm::ParameterSet&); - ~TestBXVectorRefProducer() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - void beginStream(edm::StreamID) override; void produce(edm::Event&, const edm::EventSetup&) override; - void endStream() override; - - //virtual void beginRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void endRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; // ----------member data --------------------------- bool doRefs_; @@ -84,11 +76,6 @@ TestBXVectorRefProducer::TestBXVectorRefProducer(const edm::ParameterSet& iConfi } } -TestBXVectorRefProducer::~TestBXVectorRefProducer() { - // do anything here that needs to be done at destruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // @@ -127,44 +114,6 @@ void TestBXVectorRefProducer::produce(edm::Event& iEvent, const edm::EventSetup& return; } -// ------------ method called once each stream before processing any runs, lumis or events ------------ -void TestBXVectorRefProducer::beginStream(edm::StreamID) {} - -// ------------ method called once each stream after processing all runs, lumis and events ------------ -void TestBXVectorRefProducer::endStream() {} - -// ------------ method called when starting to processes a run ------------ -/* -void -TestBXVectorRefProducer::beginRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a run ------------ -/* -void -TestBXVectorRefProducer::endRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when starting to processes a luminosity block ------------ -/* -void -TestBXVectorRefProducer::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a luminosity block ------------ -/* -void -TestBXVectorRefProducer::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void TestBXVectorRefProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/HLTrigger/special/plugins/HLTRechitsToDigis.cc b/HLTrigger/special/plugins/HLTRechitsToDigis.cc index 69673dd6ef082..ba5383e8ea4fc 100644 --- a/HLTrigger/special/plugins/HLTRechitsToDigis.cc +++ b/HLTrigger/special/plugins/HLTRechitsToDigis.cc @@ -46,7 +46,6 @@ class HLTRechitsToDigis : public edm::stream::EDProducer<> { public: explicit HLTRechitsToDigis(const edm::ParameterSet&); - ~HLTRechitsToDigis() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); enum ecalRegion { invalidRegion = 0, barrel, endcap }; static const HLTRechitsToDigis::ecalRegion stringToRegion(const std::string& region); @@ -125,11 +124,6 @@ HLTRechitsToDigis::HLTRechitsToDigis(const edm::ParameterSet& iConfig) recHitsToken_ = consumes(recHits_); } -HLTRechitsToDigis::~HLTRechitsToDigis() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // @@ -262,38 +256,6 @@ void HLTRechitsToDigis::produce(edm::Event& iEvent, edm::EventSetup const& setup } // end switch statement for the region (barrel, endcap, invalid) } -// ------------ method called when starting to processes a run ------------ -/* -void -HLTRechitsToDigis::beginRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a run ------------ -/* -void -HLTRechitsToDigis::endRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when starting to processes a luminosity block ------------ -/* -void -HLTRechitsToDigis::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a luminosity block ------------ -/* -void -HLTRechitsToDigis::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void HLTRechitsToDigis::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation From 7ed67fe4241b47abd370b401862128016427f87e Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Fri, 27 Oct 2023 15:59:37 -0500 Subject: [PATCH 8/9] Clean up some unnecessary transition function calls/comments in PhysicsTools --- .../plugins/CITKPFIsolationSumProducer.cc | 2 - .../CITKPFIsolationSumProducerForPUPPI.cc | 2 - .../JetMCAlgos/plugins/ttHFGenFilter.cc | 46 ------------------- .../plugins/NanoAODBaseCrossCleaner.cc | 11 ----- .../NanoAOD/plugins/NanoAODBaseCrossCleaner.h | 8 ---- .../NanoAOD/plugins/VertexTableProducer.cc | 19 -------- .../PatAlgos/plugins/PATElectronSlimmer.cc | 4 -- .../PatAlgos/plugins/PATObjectCrossLinker.cc | 19 -------- .../PatAlgos/plugins/PATPhotonSlimmer.cc | 4 -- 9 files changed, 115 deletions(-) diff --git a/PhysicsTools/IsolationAlgos/plugins/CITKPFIsolationSumProducer.cc b/PhysicsTools/IsolationAlgos/plugins/CITKPFIsolationSumProducer.cc index 2af04cc18dc03..886a72515be46 100644 --- a/PhysicsTools/IsolationAlgos/plugins/CITKPFIsolationSumProducer.cc +++ b/PhysicsTools/IsolationAlgos/plugins/CITKPFIsolationSumProducer.cc @@ -37,8 +37,6 @@ namespace citk { public: PFIsolationSumProducer(const edm::ParameterSet&); - ~PFIsolationSumProducer() override {} - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) final; void produce(edm::Event&, const edm::EventSetup&) final; diff --git a/PhysicsTools/IsolationAlgos/plugins/CITKPFIsolationSumProducerForPUPPI.cc b/PhysicsTools/IsolationAlgos/plugins/CITKPFIsolationSumProducerForPUPPI.cc index 815977dab6177..db9732eb9a8ba 100644 --- a/PhysicsTools/IsolationAlgos/plugins/CITKPFIsolationSumProducerForPUPPI.cc +++ b/PhysicsTools/IsolationAlgos/plugins/CITKPFIsolationSumProducerForPUPPI.cc @@ -27,8 +27,6 @@ namespace citk { public: PFIsolationSumProducerForPUPPI(const edm::ParameterSet&); - ~PFIsolationSumProducerForPUPPI() override {} - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) final; void produce(edm::Event&, const edm::EventSetup&) final; diff --git a/PhysicsTools/JetMCAlgos/plugins/ttHFGenFilter.cc b/PhysicsTools/JetMCAlgos/plugins/ttHFGenFilter.cc index 7e86bfaf25a40..d98f1c1314615 100644 --- a/PhysicsTools/JetMCAlgos/plugins/ttHFGenFilter.cc +++ b/PhysicsTools/JetMCAlgos/plugins/ttHFGenFilter.cc @@ -44,14 +44,11 @@ class ttHFGenFilter : public edm::stream::EDFilter<> { public: explicit ttHFGenFilter(const edm::ParameterSet&); - ~ttHFGenFilter() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - void beginStream(edm::StreamID) override; bool filter(edm::Event&, const edm::EventSetup&) override; - void endStream() override; virtual bool HasAdditionalBHadron(const std::vector&, const std::vector&, @@ -100,11 +97,6 @@ ttHFGenFilter::ttHFGenFilter(const edm::ParameterSet& iConfig) produces(); } -ttHFGenFilter::~ttHFGenFilter() { - // do anything here that needs to be done at destruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // @@ -260,44 +252,6 @@ void ttHFGenFilter::FindAllTopMothers(const reco::Candidate* particle, } } -// ------------ method called once each stream before processing any runs, lumis or events ------------ -void ttHFGenFilter::beginStream(edm::StreamID) {} - -// ------------ method called once each stream after processing all runs, lumis and events ------------ -void ttHFGenFilter::endStream() {} - -// ------------ method called when starting to processes a run ------------ -/* -void -ttHFGenFilter::beginRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a run ------------ -/* -void -ttHFGenFilter::endRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when starting to processes a luminosity block ------------ -/* -void -ttHFGenFilter::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a luminosity block ------------ -/* -void -ttHFGenFilter::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void ttHFGenFilter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/PhysicsTools/NanoAOD/plugins/NanoAODBaseCrossCleaner.cc b/PhysicsTools/NanoAOD/plugins/NanoAODBaseCrossCleaner.cc index eeec3a7315009..da4ed564b245a 100644 --- a/PhysicsTools/NanoAOD/plugins/NanoAODBaseCrossCleaner.cc +++ b/PhysicsTools/NanoAOD/plugins/NanoAODBaseCrossCleaner.cc @@ -54,11 +54,6 @@ NanoAODBaseCrossCleaner::NanoAODBaseCrossCleaner(const edm::ParameterSet& params produces("photons"); } -NanoAODBaseCrossCleaner::~NanoAODBaseCrossCleaner() { - // do anything here that needs to be done at destruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // @@ -130,12 +125,6 @@ void NanoAODBaseCrossCleaner::produce(edm::Event& iEvent, const edm::EventSetup& iEvent.put(std::move(lowPtElectronsTable), "lowPtElectrons"); } -// ------------ method called once each stream before processing any runs, lumis or events ------------ -void NanoAODBaseCrossCleaner::beginStream(edm::StreamID) {} - -// ------------ method called once each stream after processing all runs, lumis and events ------------ -void NanoAODBaseCrossCleaner::endStream() {} - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void NanoAODBaseCrossCleaner::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; diff --git a/PhysicsTools/NanoAOD/plugins/NanoAODBaseCrossCleaner.h b/PhysicsTools/NanoAOD/plugins/NanoAODBaseCrossCleaner.h index 849218af1a95f..5c628db0c8e55 100644 --- a/PhysicsTools/NanoAOD/plugins/NanoAODBaseCrossCleaner.h +++ b/PhysicsTools/NanoAOD/plugins/NanoAODBaseCrossCleaner.h @@ -48,14 +48,11 @@ class NanoAODBaseCrossCleaner : public edm::stream::EDProducer<> { public: explicit NanoAODBaseCrossCleaner(const edm::ParameterSet&); - ~NanoAODBaseCrossCleaner() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - void beginStream(edm::StreamID) override; void produce(edm::Event&, const edm::EventSetup&) override; - void endStream() override; virtual void objectSelection(const edm::View& jets, const edm::View& muons, const edm::View& eles, @@ -67,11 +64,6 @@ class NanoAODBaseCrossCleaner : public edm::stream::EDProducer<> { std::vector& tauBits, std::vector& photonBits){}; - //virtual void beginRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void endRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - // ----------member data --------------------------- const std::string name_; const std::string doc_; diff --git a/PhysicsTools/NanoAOD/plugins/VertexTableProducer.cc b/PhysicsTools/NanoAOD/plugins/VertexTableProducer.cc index e79ecf40450c8..1b560cd305f39 100644 --- a/PhysicsTools/NanoAOD/plugins/VertexTableProducer.cc +++ b/PhysicsTools/NanoAOD/plugins/VertexTableProducer.cc @@ -48,19 +48,11 @@ class VertexTableProducer : public edm::stream::EDProducer<> { public: explicit VertexTableProducer(const edm::ParameterSet&); - ~VertexTableProducer() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - void beginStream(edm::StreamID) override; void produce(edm::Event&, const edm::EventSetup&) override; - void endStream() override; - - //virtual void beginRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void endRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; // ----------member data --------------------------- @@ -99,11 +91,6 @@ VertexTableProducer::VertexTableProducer(const edm::ParameterSet& params) produces>(); } -VertexTableProducer::~VertexTableProducer() { - // do anything here that needs to be done at destruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // @@ -195,12 +182,6 @@ void VertexTableProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSe iEvent.put(std::move(selCandSv)); } -// ------------ method called once each stream before processing any runs, lumis or events ------------ -void VertexTableProducer::beginStream(edm::StreamID) {} - -// ------------ method called once each stream after processing all runs, lumis and events ------------ -void VertexTableProducer::endStream() {} - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void VertexTableProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; diff --git a/PhysicsTools/PatAlgos/plugins/PATElectronSlimmer.cc b/PhysicsTools/PatAlgos/plugins/PATElectronSlimmer.cc index 02fee8eabc1dc..e605623065902 100644 --- a/PhysicsTools/PatAlgos/plugins/PATElectronSlimmer.cc +++ b/PhysicsTools/PatAlgos/plugins/PATElectronSlimmer.cc @@ -26,10 +26,8 @@ namespace pat { class PATElectronSlimmer : public edm::stream::EDProducer<> { public: explicit PATElectronSlimmer(const edm::ParameterSet& iConfig); - ~PATElectronSlimmer() override {} void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) final; - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) final; private: const edm::EDGetTokenT> src_; @@ -91,8 +89,6 @@ pat::PATElectronSlimmer::PATElectronSlimmer(const edm::ParameterSet& iConfig) produces>(); } -void pat::PATElectronSlimmer::beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup& iSetup) {} - void pat::PATElectronSlimmer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { using namespace edm; using namespace std; diff --git a/PhysicsTools/PatAlgos/plugins/PATObjectCrossLinker.cc b/PhysicsTools/PatAlgos/plugins/PATObjectCrossLinker.cc index ef790ad65c14f..eaacd778eaa12 100644 --- a/PhysicsTools/PatAlgos/plugins/PATObjectCrossLinker.cc +++ b/PhysicsTools/PatAlgos/plugins/PATObjectCrossLinker.cc @@ -46,14 +46,11 @@ class PATObjectCrossLinker : public edm::stream::EDProducer<> { public: explicit PATObjectCrossLinker(const edm::ParameterSet&); - ~PATObjectCrossLinker() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - void beginStream(edm::StreamID) override; void produce(edm::Event&, const edm::EventSetup&) override; - void endStream() override; template void matchOneToMany(const C1& refProdOne, @@ -85,11 +82,6 @@ class PATObjectCrossLinker : public edm::stream::EDProducer<> { template void matchVertexToMany(const C1& refProdVtx, C2& itemsVtx, const std::string& nameVtx, C3& itemsMany); - //virtual void beginRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void endRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - // ----------member data --------------------------- const edm::EDGetTokenT> jets_; const edm::EDGetTokenT> muons_; @@ -135,11 +127,6 @@ PATObjectCrossLinker::PATObjectCrossLinker(const edm::ParameterSet& params) } } -PATObjectCrossLinker::~PATObjectCrossLinker() { - // do anything here that needs to be done at destruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // @@ -369,12 +356,6 @@ void PATObjectCrossLinker::produce(edm::Event& iEvent, const edm::EventSetup& iS iEvent.put(std::move(vertices), "vertices"); } -// ------------ method called once each stream before processing any runs, lumis or events ------------ -void PATObjectCrossLinker::beginStream(edm::StreamID) {} - -// ------------ method called once each stream after processing all runs, lumis and events ------------ -void PATObjectCrossLinker::endStream() {} - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void PATObjectCrossLinker::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; diff --git a/PhysicsTools/PatAlgos/plugins/PATPhotonSlimmer.cc b/PhysicsTools/PatAlgos/plugins/PATPhotonSlimmer.cc index 997405760ed77..677ff575cc4e0 100644 --- a/PhysicsTools/PatAlgos/plugins/PATPhotonSlimmer.cc +++ b/PhysicsTools/PatAlgos/plugins/PATPhotonSlimmer.cc @@ -28,10 +28,8 @@ namespace pat { class PATPhotonSlimmer : public edm::stream::EDProducer<> { public: explicit PATPhotonSlimmer(const edm::ParameterSet& iConfig); - ~PATPhotonSlimmer() override {} void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override; - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) final; private: const edm::EDGetTokenT> src_; @@ -86,8 +84,6 @@ pat::PATPhotonSlimmer::PATPhotonSlimmer(const edm::ParameterSet& iConfig) produces>(); } -void pat::PATPhotonSlimmer::beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup& iSetup) {} - void pat::PATPhotonSlimmer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { using namespace edm; using namespace std; From 4803e547faedfe3ff1af445b6987f65bc971dd65 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Fri, 27 Oct 2023 15:59:54 -0500 Subject: [PATCH 9/9] Clean up some unnecessary transition function calls/comments in TauAnalysis --- .../plugins/DYToMuMuGenFilter.cc | 15 ------ .../plugins/MuMuForEmbeddingSelector.cc | 51 ------------------- 2 files changed, 66 deletions(-) diff --git a/TauAnalysis/MCEmbeddingTools/plugins/DYToMuMuGenFilter.cc b/TauAnalysis/MCEmbeddingTools/plugins/DYToMuMuGenFilter.cc index 8bb153d2c67c6..a5206e56c9e6b 100644 --- a/TauAnalysis/MCEmbeddingTools/plugins/DYToMuMuGenFilter.cc +++ b/TauAnalysis/MCEmbeddingTools/plugins/DYToMuMuGenFilter.cc @@ -15,25 +15,17 @@ class DYToMuMuGenFilter : public edm::stream::EDFilter<> { public: explicit DYToMuMuGenFilter(const edm::ParameterSet&); - ~DYToMuMuGenFilter() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - void beginStream(edm::StreamID) override; bool filter(edm::Event&, const edm::EventSetup&) override; - void endStream() override; edm::InputTag inputTag_; edm::EDGetTokenT genParticleCollection_; edm::Handle gen_handle; - //virtual void beginRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void endRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - // ----------member data --------------------------- }; @@ -42,8 +34,6 @@ DYToMuMuGenFilter::DYToMuMuGenFilter(const edm::ParameterSet& iConfig) { genParticleCollection_ = consumes(inputTag_); } -DYToMuMuGenFilter::~DYToMuMuGenFilter() {} - bool DYToMuMuGenFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup) { iEvent.getByToken(genParticleCollection_, gen_handle); @@ -81,11 +71,6 @@ bool DYToMuMuGenFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup } return false; } -// ------------ method called once each stream before processing any runs, lumis or events ------------ -void DYToMuMuGenFilter::beginStream(edm::StreamID) {} - -// ------------ method called once each stream after processing all runs, lumis and events ------------ -void DYToMuMuGenFilter::endStream() {} // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void DYToMuMuGenFilter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { diff --git a/TauAnalysis/MCEmbeddingTools/plugins/MuMuForEmbeddingSelector.cc b/TauAnalysis/MCEmbeddingTools/plugins/MuMuForEmbeddingSelector.cc index 42125b59fae4a..f5c0eefd45e3a 100644 --- a/TauAnalysis/MCEmbeddingTools/plugins/MuMuForEmbeddingSelector.cc +++ b/TauAnalysis/MCEmbeddingTools/plugins/MuMuForEmbeddingSelector.cc @@ -39,19 +39,11 @@ class MuMuForEmbeddingSelector : public edm::stream::EDProducer<> { public: explicit MuMuForEmbeddingSelector(const edm::ParameterSet&); - ~MuMuForEmbeddingSelector() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - void beginStream(edm::StreamID) override; void produce(edm::Event&, const edm::EventSetup&) override; - void endStream() override; - - //virtual void beginRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void endRun(edm::Run const&, edm::EventSetup const&) override; - //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; // ----------member data --------------------------- edm::EDGetTokenT> ZmumuCandidates_; @@ -87,11 +79,6 @@ MuMuForEmbeddingSelector::MuMuForEmbeddingSelector(const edm::ParameterSet& iCon //now do what ever other initialization is needed } -MuMuForEmbeddingSelector::~MuMuForEmbeddingSelector() { - // do anything here that needs to be done at destruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // @@ -120,44 +107,6 @@ void MuMuForEmbeddingSelector::produce(edm::Event& iEvent, const edm::EventSetup iEvent.put(std::move(prod)); } -// ------------ method called once each stream before processing any runs, lumis or events ------------ -void MuMuForEmbeddingSelector::beginStream(edm::StreamID) {} - -// ------------ method called once each stream after processing all runs, lumis and events ------------ -void MuMuForEmbeddingSelector::endStream() {} - -// ------------ method called when starting to processes a run ------------ -/* -void -MuMuForEmbeddingSelector::beginRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a run ------------ -/* -void -MuMuForEmbeddingSelector::endRun(edm::Run const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when starting to processes a luminosity block ------------ -/* -void -MuMuForEmbeddingSelector::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - -// ------------ method called when ending the processing of a luminosity block ------------ -/* -void -MuMuForEmbeddingSelector::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} -*/ - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void MuMuForEmbeddingSelector::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation