Removed unnecessary beginJob/endJob methods

In order to facilitate possible conversion of the modules to stream based modules, we must remove the beginJob/endJob methods (since they are not supported by the default stream implementation). This commit removed empty/unnecessary beginJob/endJob methods. In the cases where the methods were being used, they were left alone but the 'override' declaration was added to ensure that if the module were converted to a stream module the compiler could catch the fact that beginJob/endJob are not defined in the new base class.
cms-sw · Mar 6, 2014 · 2eab258 · 2eab258
1 parent 29c3d3b
commit 2eab258
Show file tree

Hide file tree

Showing 43 changed files with 24 additions and 270 deletions.
diff --git a/CommonTools/ParticleFlow/plugins/PFPileUp.cc b/CommonTools/ParticleFlow/plugins/PFPileUp.cc
@@ -50,9 +50,6 @@ PFPileUp::~PFPileUp() { }
 
 
 
-void PFPileUp::beginJob() { }
-
-
 void PFPileUp::produce(Event& iEvent,
 			  const EventSetup& iSetup) {
 

diff --git a/CommonTools/ParticleFlow/plugins/PFPileUp.h b/CommonTools/ParticleFlow/plugins/PFPileUp.h
@@ -42,9 +42,7 @@ class PFPileUp : public edm::EDProducer {
 
   ~PFPileUp();
 
-  virtual void produce(edm::Event&, const edm::EventSetup&);
-
-  virtual void beginJob();
+  virtual void produce(edm::Event&, const edm::EventSetup&) override;
 
  private:
 

diff --git a/DPGAnalysis/SiStripTools/plugins/APVCyclePhaseProducerFromL1TS.cc b/DPGAnalysis/SiStripTools/plugins/APVCyclePhaseProducerFromL1TS.cc
@@ -58,10 +58,8 @@ class APVCyclePhaseProducerFromL1TS : public edm::EDProducer {
       ~APVCyclePhaseProducerFromL1TS();
 
 private:
-  virtual void beginJob() override ;
   virtual void beginRun(const edm::Run&, const edm::EventSetup&) override;
   virtual void produce(edm::Event&, const edm::EventSetup&) override;
-  virtual void endJob() override ;
 
   bool isBadRun(const unsigned int) const;
 
@@ -324,17 +322,6 @@ APVCyclePhaseProducerFromL1TS::produce(edm::Event& iEvent, const edm::EventSetup
 
 }
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-APVCyclePhaseProducerFromL1TS::beginJob()
-{
-}
-
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-APVCyclePhaseProducerFromL1TS::endJob() {
-}
-
 bool 
 APVCyclePhaseProducerFromL1TS::isBadRun(const unsigned int run) const {
 

diff --git a/DPGAnalysis/SiStripTools/plugins/EventWithHistoryProducerFromL1ABC.cc b/DPGAnalysis/SiStripTools/plugins/EventWithHistoryProducerFromL1ABC.cc
@@ -46,11 +46,9 @@ class EventWithHistoryProducerFromL1ABC : public edm::EDProducer {
       ~EventWithHistoryProducerFromL1ABC();
 
    private:
-      virtual void beginJob() override ;
       virtual void beginRun(const edm::Run&, const edm::EventSetup&) override;
       virtual void produce(edm::Event&, const edm::EventSetup&) override;
       virtual void endRun(const edm::Run&, const edm::EventSetup&) override;
-      virtual void endJob() override ;
 
       // ----------member data ---------------------------
 
@@ -166,12 +164,6 @@ EventWithHistoryProducerFromL1ABC::produce(edm::Event& iEvent, const edm::EventS
    }
 }
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-EventWithHistoryProducerFromL1ABC::beginJob()
-{
-}
-
 void 
 EventWithHistoryProducerFromL1ABC::beginRun(const edm::Run&, const edm::EventSetup&)
 {
@@ -194,10 +186,5 @@ EventWithHistoryProducerFromL1ABC::endRun(const edm::Run&, const edm::EventSetup
 
 }
 
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-EventWithHistoryProducerFromL1ABC::endJob() {
-}
-
 //define this as a plug-in
 DEFINE_FWK_MODULE(EventWithHistoryProducerFromL1ABC);
diff --git a/EventFilter/L1GlobalTriggerRawToDigi/interface/L1GlobalTriggerEvmRawToDigi.h b/EventFilter/L1GlobalTriggerRawToDigi/interface/L1GlobalTriggerEvmRawToDigi.h
@@ -54,9 +54,7 @@ class L1GlobalTriggerEvmRawToDigi : public edm::EDProducer
 
 private:
 
-    virtual void beginJob();
-
-    virtual void produce(edm::Event&, const edm::EventSetup&);
+    virtual void produce(edm::Event&, const edm::EventSetup&) override;
 
     /// block unpackers
 
@@ -72,9 +70,6 @@ class L1GlobalTriggerEvmRawToDigi : public edm::EDProducer
     /// dump FED raw data
     void dumpFedRawData(const unsigned char*, int, std::ostream&);
 
-    ///
-    virtual void endJob();
-
 private:
 
     L1GtfeExtWord* m_gtfeWord;

diff --git a/EventFilter/L1GlobalTriggerRawToDigi/interface/L1GlobalTriggerRawToDigi.h b/EventFilter/L1GlobalTriggerRawToDigi/interface/L1GlobalTriggerRawToDigi.h
@@ -59,9 +59,7 @@ class L1GlobalTriggerRawToDigi : public edm::EDProducer
 
 private:
 
-    virtual void beginJob();
-
-    virtual void produce(edm::Event&, const edm::EventSetup&);
+    virtual void produce(edm::Event&, const edm::EventSetup&) override;
 
     /// block unpackers
 
@@ -88,8 +86,6 @@ class L1GlobalTriggerRawToDigi : public edm::EDProducer
     /// dump FED raw data
     void dumpFedRawData(const unsigned char*, int, std::ostream&);
 
-    ///
-    virtual void endJob();
 
 private:
 

diff --git a/EventFilter/L1GlobalTriggerRawToDigi/src/L1GlobaTriggerEvmRawToDigi.cc b/EventFilter/L1GlobalTriggerRawToDigi/src/L1GlobaTriggerEvmRawToDigi.cc
@@ -132,12 +132,6 @@ L1GlobalTriggerEvmRawToDigi::~L1GlobalTriggerEvmRawToDigi() {
 
 // member functions
 
-void L1GlobalTriggerEvmRawToDigi::beginJob() {
-
-    // empty now
-
-}
-
 // method called to produce the data
 void L1GlobalTriggerEvmRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& evSetup) {
 
@@ -824,11 +818,5 @@ void L1GlobalTriggerEvmRawToDigi::dumpFedRawData(
 
 }
 
-//
-void L1GlobalTriggerEvmRawToDigi::endJob() {
-
-    // empty now
-}
-
 // static class members
 
diff --git a/EventFilter/L1GlobalTriggerRawToDigi/src/L1GlobaTriggerRawToDigi.cc b/EventFilter/L1GlobalTriggerRawToDigi/src/L1GlobaTriggerRawToDigi.cc
@@ -142,10 +142,6 @@ L1GlobalTriggerRawToDigi::~L1GlobalTriggerRawToDigi() {
 
 // member functions
 
-void L1GlobalTriggerRawToDigi::beginJob() {
-    // empty
-}
-
 // method called to produce the data
 void L1GlobalTriggerRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& evSetup) {
 
@@ -1053,11 +1049,5 @@ void L1GlobalTriggerRawToDigi::dumpFedRawData(
 
 }
 
-//
-void L1GlobalTriggerRawToDigi::endJob() {
-
-    // empty now
-}
-
 // static class members
 
diff --git a/EventFilter/SiPixelRawToDigi/plugins/SiPixelRawToDigi.h b/EventFilter/SiPixelRawToDigi/plugins/SiPixelRawToDigi.h
@@ -31,12 +31,8 @@ class SiPixelRawToDigi : public edm::EDProducer {
   /// dtor
   virtual ~SiPixelRawToDigi();
 
-
-  /// dummy end of job 
-  virtual void endJob() {}
-
   /// get data, convert to digis attach againe to Event
-  virtual void produce( edm::Event&, const edm::EventSetup& );
+  virtual void produce( edm::Event&, const edm::EventSetup& ) override;
 
 private:
 

diff --git a/L1Trigger/L1ExtraFromDigis/interface/L1ExtraParticlesProd.h b/L1Trigger/L1ExtraFromDigis/interface/L1ExtraParticlesProd.h
@@ -44,9 +44,7 @@ class L1ExtraParticlesProd : public edm::EDProducer {
       ~L1ExtraParticlesProd();
 
    private:
-      virtual void beginJob() ;
-      virtual void produce(edm::Event&, const edm::EventSetup&);
-      virtual void endJob() ;
+      virtual void produce(edm::Event&, const edm::EventSetup&) override;
 
       //      math::XYZTLorentzVector gctLorentzVector( const double& et,
       math::PtEtaPhiMLorentzVector gctLorentzVector( const double& et,

diff --git a/L1Trigger/L1ExtraFromDigis/src/L1ExtraParticlesProd.cc b/L1Trigger/L1ExtraFromDigis/src/L1ExtraParticlesProd.cc
@@ -1086,16 +1086,5 @@ L1ExtraParticlesProd::gctLorentzVector( const double& et,
 					0. ) ;
 }     
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-L1ExtraParticlesProd::beginJob()
-{
-}
-
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-L1ExtraParticlesProd::endJob() {
-}
-
 //define this as a plug-in
 DEFINE_FWK_MODULE(L1ExtraParticlesProd);
diff --git a/PhysicsTools/JetMCAlgos/plugins/TauGenJetProducer.cc b/PhysicsTools/JetMCAlgos/plugins/TauGenJetProducer.cc
@@ -34,8 +34,6 @@ TauGenJetProducer::TauGenJetProducer(const edm::ParameterSet& iConfig)
 
 TauGenJetProducer::~TauGenJetProducer() { }
 
-void TauGenJetProducer::beginJob() { }
-
 void TauGenJetProducer::produce(Event& iEvent,
 				const EventSetup& iSetup) {
 

diff --git a/PhysicsTools/JetMCAlgos/plugins/TauGenJetProducer.h b/PhysicsTools/JetMCAlgos/plugins/TauGenJetProducer.h
@@ -29,9 +29,7 @@ class TauGenJetProducer : public edm::EDProducer {
 
   ~TauGenJetProducer();
 
-  virtual void produce(edm::Event&, const edm::EventSetup&);
-
-  virtual void beginJob();
+  virtual void produce(edm::Event&, const edm::EventSetup&) override;
 
  private:
 

diff --git a/RecoEcal/EgammaClusterProducers/interface/Multi5x5SuperClusterProducer.h b/RecoEcal/EgammaClusterProducers/interface/Multi5x5SuperClusterProducer.h
@@ -25,8 +25,8 @@ class Multi5x5SuperClusterProducer : public edm::EDProducer
 
       ~Multi5x5SuperClusterProducer();
 
-      virtual void produce(edm::Event&, const edm::EventSetup&);
-      virtual void endJob();
+      virtual void produce(edm::Event&, const edm::EventSetup&) override;
+      virtual void endJob() override;
 
    private:
 

diff --git a/RecoEcal/EgammaClusterProducers/src/InterestingTrackEcalDetIdProducer.cc b/RecoEcal/EgammaClusterProducers/src/InterestingTrackEcalDetIdProducer.cc
@@ -52,9 +52,7 @@ class InterestingTrackEcalDetIdProducer : public edm::EDProducer {
       ~InterestingTrackEcalDetIdProducer();
 
    private:
-      virtual void beginJob() override ;
       virtual void produce(edm::Event&, const edm::EventSetup&) override;
-      virtual void endJob() override ;
       void beginRun(edm::Run const&, const edm::EventSetup&) override;
 
 
@@ -162,16 +160,5 @@ void InterestingTrackEcalDetIdProducer::beginRun(edm::Run const& run, const edm:
   caloTopology_ = &(*theCaloTopology); 
 }
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-InterestingTrackEcalDetIdProducer::beginJob()
-{
-}
-
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-InterestingTrackEcalDetIdProducer::endJob() {
-}
-
 //define this as a plug-in
 DEFINE_FWK_MODULE(InterestingTrackEcalDetIdProducer);
diff --git a/RecoJets/JetAssociationProducers/interface/TrackExtrapolator.h b/RecoJets/JetAssociationProducers/interface/TrackExtrapolator.h
@@ -61,9 +61,8 @@ class TrackExtrapolator : public edm::EDProducer {
       ~TrackExtrapolator();
 
    private:
-      virtual void beginJob() ;
-      virtual void produce(edm::Event&, const edm::EventSetup&);
-      virtual void endJob() ;
+      virtual void produce(edm::Event&, const edm::EventSetup&) override;
+
 
       // ----------member data ---------------------------
 

diff --git a/RecoJets/JetAssociationProducers/src/TrackExtrapolator.cc b/RecoJets/JetAssociationProducers/src/TrackExtrapolator.cc
@@ -82,20 +82,6 @@ TrackExtrapolator::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
   iEvent.put( extrapolations );
 }
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-TrackExtrapolator::beginJob()
-{
-}
-
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-TrackExtrapolator::endJob() {
-}
-
-
-
-
 // -----------------------------------------------------------------------------
 //
 bool TrackExtrapolator::propagateTrackToVolume( const reco::Track& fTrack,

diff --git a/RecoJets/JetPlusTracks/plugins/JetPlusTrackProducer.cc b/RecoJets/JetPlusTracks/plugins/JetPlusTrackProducer.cc
@@ -282,16 +282,5 @@ JetPlusTrackProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
 
 }
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-JetPlusTrackProducer::beginJob()
-{
-}
-
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-JetPlusTrackProducer::endJob() {
-}
-
 //define this as a plug-in
 //DEFINE_FWK_MODULE(JetPlusTrackProducer);
diff --git a/RecoJets/JetPlusTracks/plugins/JetPlusTrackProducer.h b/RecoJets/JetPlusTracks/plugins/JetPlusTrackProducer.h
@@ -44,9 +44,7 @@ class JetPlusTrackProducer : public edm::EDProducer {
    public:
       explicit JetPlusTrackProducer(const edm::ParameterSet&);
       ~JetPlusTrackProducer();
-      virtual void beginJob();
-      virtual void produce(edm::Event&, const edm::EventSetup&);
-      virtual void endJob();
+      virtual void produce(edm::Event&, const edm::EventSetup&) override;
 
    // ---------- private data members ---------------------------
    private:

diff --git a/RecoJets/JetProducers/plugins/CastorJetIDProducer.cc b/RecoJets/JetProducers/plugins/CastorJetIDProducer.cc
@@ -84,16 +84,5 @@ CastorJetIDProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
   iEvent.put( castorjetIdValueMap );
 }
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-CastorJetIDProducer::beginJob()
-{
-}
-
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-CastorJetIDProducer::endJob() {
-}
-
 //define this as a plug-in
 DEFINE_FWK_MODULE(CastorJetIDProducer);
diff --git a/RecoJets/JetProducers/plugins/CastorJetIDProducer.h b/RecoJets/JetProducers/plugins/CastorJetIDProducer.h
@@ -45,9 +45,7 @@ class CastorJetIDProducer : public edm::EDProducer {
       ~CastorJetIDProducer();
 
    private:
-      virtual void beginJob() ;
-      virtual void produce(edm::Event&, const edm::EventSetup&);
-      virtual void endJob() ;
+      virtual void produce(edm::Event&, const edm::EventSetup&) override;
 
       // ----------member data ---------------------------
       edm::InputTag                 src_;          // input jet source

diff --git a/RecoJets/JetProducers/plugins/JetIDProducer.cc b/RecoJets/JetProducers/plugins/JetIDProducer.cc
@@ -104,16 +104,5 @@ JetIDProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
   iEvent.put( jetIdValueMap );
 }
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-JetIDProducer::beginJob()
-{
-}
-
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-JetIDProducer::endJob() {
-}
-
 //define this as a plug-in
 DEFINE_FWK_MODULE(JetIDProducer);
diff --git a/RecoJets/JetProducers/plugins/JetIDProducer.h b/RecoJets/JetProducers/plugins/JetIDProducer.h
@@ -49,9 +49,7 @@ class JetIDProducer : public edm::EDProducer {
       ~JetIDProducer();
 
    private:
-      virtual void beginJob() ;
-      virtual void produce(edm::Event&, const edm::EventSetup&);
-      virtual void endJob() ;
+      virtual void produce(edm::Event&, const edm::EventSetup&) override;
 
       // ----------member data ---------------------------
       edm::InputTag                 src_;         // input jet source