Merge pull request cms-sw#169 from deguio/Histogram_booking_moved_to_…

…beginRun Histogram booking moved to begin run (was cms-sw#60)
matteosan1 · Jul 24, 2013 · 6569008 · 6569008
2 parents f6c2c21 + 106fb71
commit 6569008
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.cc b/DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.cc
@@ -13,8 +13,7 @@
 //
 // Original Author:  Mauro Dinardo,28 S-020,+41227673777,
 //         Created:  Tue Feb 23 13:15:31 CET 2010
-// $Id: Vx3DHLTAnalyzer.cc,v 1.105 2012/09/14 07:50:15 davidlt Exp $
-
+// $Id: Vx3DHLTAnalyzer.cc,v 1.107 2013/07/04 16:20:11 dinardo Exp $
 
 #include "DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.h"
 
@@ -1065,6 +1064,25 @@ void Vx3DHLTAnalyzer::endLuminosityBlock(const LuminosityBlock& lumiBlock,
 
 
 void Vx3DHLTAnalyzer::beginJob()
+{
+  // ### Set internal variables ###
+  reset("scratch");
+  prescaleHistory      = 1;
+  maxLumiIntegration   = 15;
+  minVxDoF             = 10.;
+  // For vertex fitter without track-weight: d.o.f. = 2*NTracks - 3
+  // For vertex fitter with track-weight:    d.o.f. = sum_NTracks(2*track_weight) - 3
+  internalDebug        = false;
+  considerVxCovariance = true;
+  pi = 3.141592653589793238;
+  // ##############################
+}
+
+
+void Vx3DHLTAnalyzer::endJob() { reset("scratch"); }
+
+
+void Vx3DHLTAnalyzer::beginRun()
 {
   DQMStore* dbe = 0;
   dbe = Service<DQMStore>().operator->();
@@ -1182,23 +1200,8 @@ void Vx3DHLTAnalyzer::beginJob()
       // - 0%  at the moment of creation of the histogram
       // - n%  numberGoodFits / numberFits
     }
-
-  // ### Set internal variables ###
-  reset("scratch");
-  prescaleHistory      = 1;
-  maxLumiIntegration   = 15;
-  minVxDoF             = 10.;
-  // For vertex fitter without track-weight: d.o.f. = 2*NTracks - 3
-  // For vertex fitter with track-weight:    d.o.f. = sum_NTracks(2*track_weight) - 3
-  internalDebug        = false;
-  considerVxCovariance = true;
-  pi = 3.141592653589793238;
-  // ##############################
 }
 
 
-void Vx3DHLTAnalyzer::endJob() { reset("scratch"); }
-
-
 // Define this as a plug-in
 DEFINE_FWK_MODULE(Vx3DHLTAnalyzer);
diff --git a/DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.h b/DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.h
@@ -91,6 +91,7 @@ class Vx3DHLTAnalyzer : public edm::EDAnalyzer {
       virtual void endLuminosityBlock(const edm::LuminosityBlock& lumiBlock,
 				      const edm::EventSetup& iSetup);
       virtual void endJob();
+      virtual void beginRun();
 
 
       // #######################