---

yaml --- r: 77239 b: "refs/heads/CMSSW_7_1_X" c: 9dbb32c h: "refs/heads/CMSSW_7_1_X" i: 77237: 20ef3da 77235: 8682ea6 77231: 2b01e2a v: v3
cms-sw · Nov 6, 2009 · 609dfd0 · 609dfd0
1 parent a521a6f
commit 609dfd0
Show file tree

Hide file tree

Showing 30 changed files with 103 additions and 101 deletions.
diff --git a/[refs] b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": 85b4634febd3cf04e0626001068b75cac74e936b
+"refs/heads/CMSSW_7_1_X": 9dbb32c983e7a269c542566cca6d8b8eeaa7223c
diff --git a/trunk/FWCore/Framework/interface/EDAnalyzer.h b/trunk/FWCore/Framework/interface/EDAnalyzer.h
@@ -33,7 +33,7 @@ namespace edm {
   private:
     bool doEvent(EventPrincipal const& ep, EventSetup const& c,
 		   CurrentProcessingContext const* cpc);
-    void doBeginJob(EventSetup const&);
+    void doBeginJob();
     void doEndJob();
     bool doBeginRun(RunPrincipal const& rp, EventSetup const& c,
 		   CurrentProcessingContext const* cpc);

diff --git a/trunk/FWCore/Framework/interface/EDFilter.h b/trunk/FWCore/Framework/interface/EDFilter.h
@@ -42,7 +42,7 @@ namespace edm {
   private:    
     bool doEvent(EventPrincipal& ep, EventSetup const& c,
 		  CurrentProcessingContext const* cpc);
-    void doBeginJob(EventSetup const&);
+    void doBeginJob();
     void doEndJob();
     bool doBeginRun(RunPrincipal& rp, EventSetup const& c,
 		   CurrentProcessingContext const* cpc);

diff --git a/trunk/FWCore/Framework/interface/EDProducer.h b/trunk/FWCore/Framework/interface/EDProducer.h
@@ -37,7 +37,7 @@ namespace edm {
   private:
     bool doEvent(EventPrincipal& ep, EventSetup const& c,
 		   CurrentProcessingContext const* cpcp);
-    void doBeginJob(EventSetup const&);
+    void doBeginJob();
     void doEndJob();
     bool doBeginRun(RunPrincipal& rp, EventSetup const& c,
 		   CurrentProcessingContext const* cpc);

diff --git a/trunk/FWCore/Framework/interface/InputSource.h b/trunk/FWCore/Framework/interface/InputSource.h
@@ -190,7 +190,7 @@ namespace edm {
     std::string const& processGUID() const {return processGUID_;}
 
     /// Called by framework at beginning of job
-    void doBeginJob(EventSetup const&);
+    void doBeginJob();
 
     /// Called by framework at end of job
     void doEndJob();
@@ -334,6 +334,7 @@ namespace edm {
     virtual void beginRun(Run&);
     virtual void endRun(Run&);
     virtual void beginJob(EventSetup const&);
+    virtual void beginJob();
     virtual void endJob();
     virtual void preForkReleaseResources();
     virtual void postForkReacquireResources(unsigned int iChildIndex, unsigned int iNumberOfChildren, unsigned int iNumberOfSequentialChildren);

diff --git a/trunk/FWCore/Framework/interface/OutputModule.h b/trunk/FWCore/Framework/interface/OutputModule.h
@@ -136,7 +136,7 @@ namespace edm {
     // private member functions
     //------------------------------------------------------------------
     void configure(OutputModuleDescription const& desc);
-    void doBeginJob(EventSetup const&);
+    void doBeginJob();
     void doEndJob();
     bool doEvent(EventPrincipal const& ep, EventSetup const& c,
 		    CurrentProcessingContext const* cpc);

diff --git a/trunk/FWCore/Framework/interface/Schedule.h b/trunk/FWCore/Framework/interface/Schedule.h
@@ -133,7 +133,7 @@ namespace edm {
     void processOneOccurrence(typename T::MyPrincipal& principal, 
 		     EventSetup const& eventSetup);
 
-    void beginJob(EventSetup const&);
+    void beginJob();
     void endJob();
 
     // Write the luminosity block

diff --git a/trunk/FWCore/Framework/src/EDAnalyzer.cc b/trunk/FWCore/Framework/src/EDAnalyzer.cc
@@ -26,8 +26,8 @@ namespace edm {
   }
 
   void
-  EDAnalyzer::doBeginJob(EventSetup const& es) {
-    this->beginJob(es);
+  EDAnalyzer::doBeginJob() {
+    this->beginJob();
   }
 
   void 

diff --git a/trunk/FWCore/Framework/src/EDFilter.cc b/trunk/FWCore/Framework/src/EDFilter.cc
@@ -28,8 +28,8 @@ namespace edm {
   }
 
   void 
-  EDFilter::doBeginJob(EventSetup const& es) { 
-    this->beginJob(es);
+  EDFilter::doBeginJob() { 
+    this->beginJob();
   }
 
   void EDFilter::doEndJob() { 

diff --git a/trunk/FWCore/Framework/src/EDProducer.cc b/trunk/FWCore/Framework/src/EDProducer.cc
@@ -33,8 +33,8 @@ namespace edm {
   }
 
   void 
-  EDProducer::doBeginJob(EventSetup const& es) {
-    this->beginJob(es);
+  EDProducer::doBeginJob() {
+    this->beginJob();
   }
 
   void 

diff --git a/trunk/FWCore/Framework/src/EventProcessor.cc b/trunk/FWCore/Framework/src/EventProcessor.cc
@@ -800,13 +800,11 @@ namespace edm {
     // added and do 'run'
     // again.  In that case the newly added Module needs its 'beginJob'
     // to be called.
-    EventSetup const& es =
-      esp_->eventSetupForInstance(IOVSyncValue::beginOfTime());
     if(looper_) {
-       looper_->beginOfJob(es);
+       looper_->beginOfJob();
     }
     try {
-      input_->doBeginJob(es);
+      input_->doBeginJob();
     } catch(cms::Exception& e) {
       LogError("BeginJob") << "A cms::Exception happened while processing the beginJob of the 'source'\n";
       e << "A cms::Exception happened while processing the beginJob of the 'source'\n";
@@ -818,7 +816,7 @@ namespace edm {
       LogError("BeginJob") << "An unknown exception happened while processing the beginJob of the 'source'\n";
       throw;
     }
-    schedule_->beginJob(es);
+    schedule_->beginJob();
     actReg_->postBeginJobSignal_();
     // toerror.succeeded(); // should we add this?
   }

diff --git a/trunk/FWCore/Framework/src/InputSource.cc b/trunk/FWCore/Framework/src/InputSource.cc
@@ -189,8 +189,8 @@ namespace edm {
   }
 
   void
-  InputSource::doBeginJob(EventSetup const& c) {
-    beginJob(c);
+  InputSource::doBeginJob() {
+    beginJob();
   }
 
   void
@@ -506,7 +506,10 @@ namespace edm {
   InputSource::endRun(Run&) {}
 
   void
-  InputSource::beginJob(EventSetup const&) {}
+  InputSource::beginJob(EventSetup const&) {beginJob();}
+
+  void
+  InputSource::beginJob() {}
 
   void
   InputSource::endJob() {}

diff --git a/trunk/FWCore/Framework/src/OutputModule.cc b/trunk/FWCore/Framework/src/OutputModule.cc
@@ -201,9 +201,9 @@ namespace edm {
 
   OutputModule::~OutputModule() { }
 
-  void OutputModule::doBeginJob(EventSetup const& c) {
+  void OutputModule::doBeginJob() {
     selectProducts();
-    beginJob(c);
+    beginJob();
   }
 
   void OutputModule::doEndJob() {

diff --git a/trunk/FWCore/Framework/src/Schedule.cc b/trunk/FWCore/Framework/src/Schedule.cc
@@ -845,8 +845,8 @@ namespace edm {
     for_all(all_workers_, boost::bind(&Worker::respondToCloseOutputFiles, _1, boost::cref(fb)));
   }
 
-  void Schedule::beginJob(EventSetup const& es) {
-    for_all(all_workers_, boost::bind(&Worker::beginJob, _1, boost::cref(es)));
+  void Schedule::beginJob() {
+    for_all(all_workers_, boost::bind(&Worker::beginJob, _1));
   }
 
   void Schedule::preForkReleaseResources() {

diff --git a/trunk/FWCore/Framework/src/Worker.cc b/trunk/FWCore/Framework/src/Worker.cc
@@ -57,11 +57,11 @@ namespace edm {
     actReg_ = areg;
   }
 
-  void Worker::beginJob(EventSetup const& es) {
+  void Worker::beginJob() {
 
     try {
         ModuleBeginJobSignalSentry cpp(actReg_.get(), md_);
-	implBeginJob(es);
+	implBeginJob();
     }
     catch(cms::Exception& e) {
 	LogError("BeginJob")

diff --git a/trunk/FWCore/Framework/src/Worker.h b/trunk/FWCore/Framework/src/Worker.h
@@ -49,7 +49,7 @@ namespace edm {
     template <typename T>
     bool doWork(typename T::MyPrincipal&, EventSetup const& c,
 		CurrentProcessingContext const* cpc);
-    void beginJob(EventSetup const&) ;
+    void beginJob() ;
     void endJob();
     void respondToOpenInputFile(FileBlock const& fb) {implRespondToOpenInputFile(fb);}
     void respondToCloseInputFile(FileBlock const& fb) {implRespondToCloseInputFile(fb);}
@@ -98,7 +98,7 @@ namespace edm {
 			    CurrentProcessingContext const* cpc) = 0;
     virtual bool implDoEnd(LuminosityBlockPrincipal& lbp, EventSetup const& c,
 			    CurrentProcessingContext const* cpc) = 0;
-    virtual void implBeginJob(EventSetup const&) = 0;
+    virtual void implBeginJob() = 0;
     virtual void implEndJob() = 0;
 
   private:

diff --git a/trunk/FWCore/Framework/src/WorkerT.h b/trunk/FWCore/Framework/src/WorkerT.h
@@ -53,7 +53,7 @@ namespace edm {
                             CurrentProcessingContext const* cpc);
     virtual bool implDoEnd(LuminosityBlockPrincipal& lbp, EventSetup const& c,
                             CurrentProcessingContext const* cpc);
-    virtual void implBeginJob(EventSetup const&) ;
+    virtual void implBeginJob() ;
     virtual void implEndJob() ;
     virtual void implRespondToOpenInputFile(FileBlock const& fb);
     virtual void implRespondToCloseInputFile(FileBlock const& fb);
@@ -135,8 +135,8 @@ namespace edm {
 
   template <typename T>
   void
-  WorkerT<T>::implBeginJob(EventSetup const& es) {
-    module_->doBeginJob(es);
+  WorkerT<T>::implBeginJob() {
+    module_->doBeginJob();
   }
 
   template <typename T>

diff --git a/trunk/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.cc b/trunk/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.cc
@@ -13,7 +13,7 @@
 //
 // Original Author:  Chris Jones
 //         Created:  Fri Sep  2 13:54:17 EDT 2005
-// $Id: TestBeginEndJobAnalyzer.cc,v 1.6 2007/08/07 22:34:20 wmtan Exp $
+// $Id: TestBeginEndJobAnalyzer.cc,v 1.7 2008/04/04 16:11:04 wdd Exp $
 //
 //
 
@@ -38,7 +38,7 @@ bool TestBeginEndJobAnalyzer::endLumiCalled = false;
 bool TestBeginEndJobAnalyzer::destructorCalled = false;
 
 void 
-TestBeginEndJobAnalyzer::beginJob(const edm::EventSetup&) {
+TestBeginEndJobAnalyzer::beginJob() {
   beginJobCalled = true;
 }
 

diff --git a/trunk/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.h b/trunk/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.h
@@ -16,7 +16,7 @@
 //
 // Original Author:  Chris Jones
 //         Created:  Fri Sep  2 14:17:17 EDT 2005
-// $Id: TestBeginEndJobAnalyzer.h,v 1.2 2006/05/03 21:12:14 wmtan Exp $
+// $Id: TestBeginEndJobAnalyzer.h,v 1.3 2008/04/04 16:11:04 wdd Exp $
 //
 
 // system include files
@@ -32,7 +32,7 @@ class TestBeginEndJobAnalyzer : public edm::EDAnalyzer {
 
    virtual void analyze(const edm::Event&, const edm::EventSetup&);
 
-   virtual void beginJob(edm::EventSetup const&);
+   virtual void beginJob();
    virtual void endJob();
    virtual void beginRun(edm::Run const&, edm::EventSetup const&);
    virtual void endRun(edm::Run const&, edm::EventSetup const&);

diff --git a/trunk/FWCore/Framework/test/stubs/TestFailuresAnalyzer.cc b/trunk/FWCore/Framework/test/stubs/TestFailuresAnalyzer.cc
@@ -13,7 +13,7 @@
 //
 // Original Author:  Chris Jones
 //         Created:  Fri Sep  2 13:54:17 EDT 2005
-// $Id: TestFailuresAnalyzer.cc,v 1.4 2008/06/25 19:05:33 ewv Exp $
+// $Id: TestFailuresAnalyzer.cc,v 1.5 2009/10/15 19:07:25 wdd Exp $
 //
 //
 
@@ -80,7 +80,7 @@ TestFailuresAnalyzer::~TestFailuresAnalyzer()
 
 // ------------ method called to produce the data  ------------
 void
-TestFailuresAnalyzer::beginJob(const edm::EventSetup&)
+TestFailuresAnalyzer::beginJob()
 {
    if(whichFailure_ == kBeginOfJob){
       throw cms::Exception("Test") <<" beginJob";

diff --git a/trunk/FWCore/Framework/test/stubs/TestFailuresAnalyzer.h b/trunk/FWCore/Framework/test/stubs/TestFailuresAnalyzer.h
@@ -16,7 +16,7 @@
 //
 // Original Author:  Chris Jones
 //         Created:  Fri Sep  2 14:17:17 EDT 2005
-// $Id: TestFailuresAnalyzer.h,v 1.1 2005/12/14 01:34:21 chrjones Exp $
+// $Id: TestFailuresAnalyzer.h,v 1.2 2009/10/15 19:07:25 wdd Exp $
 //
 
 // system include files
@@ -32,7 +32,7 @@ class TestFailuresAnalyzer : public edm::EDAnalyzer {
 
    virtual void analyze(const edm::Event&, const edm::EventSetup&);
 
-   virtual void beginJob(const edm::EventSetup&);
+   virtual void beginJob();
    virtual void endJob();
 
 private:

diff --git a/trunk/FWCore/Integration/test/PathAnalyzer.cc b/trunk/FWCore/Integration/test/PathAnalyzer.cc
@@ -21,7 +21,7 @@ namespace edmtest
     virtual ~PathAnalyzer();
 
     virtual void analyze(edm::Event const&, edm::EventSetup const&);
-    virtual void beginJob(edm::EventSetup const&);
+    virtual void beginJob();
     virtual void endJob();
 
   private:
@@ -43,7 +43,7 @@ namespace edmtest
   }
 
   void
-  PathAnalyzer::beginJob(edm::EventSetup const&)
+  PathAnalyzer::beginJob()
   {
     dumpTriggerNamesServiceInfo("beginJob");