---

yaml --- r: 124496 b: "refs/heads/l1t-devel-CMSSW_7_4_0_pre5" c: fc2090c h: "refs/heads/l1t-devel-CMSSW_7_4_0_pre5" v: v3
cms-sw · Jul 31, 2013 · 4099619 · 4099619
1 parent ab1fd0f
commit 4099619
Show file tree

Hide file tree

Showing 147 changed files with 5,244 additions and 2,333 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-"refs/heads/l1t-devel-CMSSW_7_4_0_pre5": 302924dbb4d2cdc07cf9cf9e199b3827ca0b6c20
+"refs/heads/l1t-devel-CMSSW_7_4_0_pre5": fc2090cc20ae1c835a5365b46451dee37bba5ed0
diff --git a/trunk/Calibration/EcalCalibAlgos/src/ZeeCalibration.cc b/trunk/Calibration/EcalCalibAlgos/src/ZeeCalibration.cc
@@ -48,7 +48,6 @@
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/Common/interface/TriggerResults.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/CachedProducts.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Framework/interface/TriggerNamesService.h"
 

diff --git a/trunk/DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.cc b/trunk/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/trunk/DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.h b/trunk/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();
 
 
       // #######################

diff --git a/trunk/DQM/CastorMonitor/interface/CastorChannelQualityMonitor.h b/trunk/DQM/CastorMonitor/interface/CastorChannelQualityMonitor.h
@@ -25,7 +25,8 @@
 #include <map>
 
 
-class CastorChannelQualityMonitor: public CastorBaseMonitor{
+class CastorChannelQualityMonitor: public CastorBaseMonitor
+{
 
   typedef std::map<uint32_t,float,std::less<uint32_t> >  MapType;
 
@@ -34,6 +35,7 @@ class CastorChannelQualityMonitor: public CastorBaseMonitor{
   ~CastorChannelQualityMonitor();
 
   void setup(const edm::ParameterSet& ps, DQMStore* dbe);
+  void beginRun(const edm::Run& iRun, const edm::EventSetup& iSetup);
   void processEvent(const CastorRecHitCollection& castorHits);
   void reset();
 
@@ -73,8 +75,6 @@ class CastorChannelQualityMonitor: public CastorBaseMonitor{
  MonitorElement* overallStatus;
  double fraction;
 
-
-
 };
 
 #endif
diff --git a/trunk/DQM/CastorMonitor/interface/CastorDataIntegrityMonitor.h b/trunk/DQM/CastorMonitor/interface/CastorDataIntegrityMonitor.h
@@ -17,6 +17,7 @@ class CastorDataIntegrityMonitor: public CastorBaseMonitor
   void setup(const edm::ParameterSet& ps, DQMStore* dbe);
 
   void processEvent(const FEDRawDataCollection& RawData, const HcalUnpackerReport& report, const CastorElectronicsMap& emap);
+  void beginRun(const edm::EventSetup& iSetup);
 
   void unpack(const FEDRawData& raw, const CastorElectronicsMap& emap);
 

diff --git a/trunk/DQM/CastorMonitor/interface/CastorDigiMonitor.h b/trunk/DQM/CastorMonitor/interface/CastorDigiMonitor.h
@@ -18,7 +18,7 @@ class CastorDigiMonitor: public CastorBaseMonitor {
   ~CastorDigiMonitor(); 
 
   void setup(const edm::ParameterSet& ps, DQMStore* dbe);
-
+  void beginRun(const edm::EventSetup& iSetup);
   void processEvent(const CastorDigiCollection& cast,const CastorDbService& cond);
 
 

diff --git a/trunk/DQM/CastorMonitor/interface/CastorEventDisplay.h b/trunk/DQM/CastorMonitor/interface/CastorEventDisplay.h
diff --git a/trunk/DQM/CastorMonitor/interface/CastorHIMonitor.h b/trunk/DQM/CastorMonitor/interface/CastorHIMonitor.h
@@ -12,6 +12,7 @@ class CastorHIMonitor: public CastorBaseMonitor {
   ~CastorHIMonitor(); 
 
   void setup(const edm::ParameterSet& ps, DQMStore* dbe);
+  void beginRun(const edm::EventSetup& iSetup);
   void processEvent(const CastorRecHitCollection& castorHits, const CastorDigiCollection& cast, const CastorDbService& cond);
   void reset();
 
@@ -22,7 +23,6 @@ class CastorHIMonitor: public CastorBaseMonitor {
   int ievt_;
 
 
-
  ////--- CASTOR channels
  int module;
  int sector;
@@ -48,8 +48,6 @@ class CastorHIMonitor: public CastorBaseMonitor {
  ////---- total energy deposited in the whole CASTOR  
  float EtotalCASTOR;
 
-
-
 
   ////---- define Monitoring elements
 
@@ -159,8 +157,6 @@ class CastorHIMonitor: public CastorBaseMonitor {
  MonitorElement* meEtotalEMvsHAD;
 
 
-
-
 ////---- charge in sectors
  MonitorElement* meChargeSector1;  
  MonitorElement* meChargeSector2;  
@@ -263,22 +259,6 @@ class CastorHIMonitor: public CastorBaseMonitor {
 ////--- total charge ratio EM/HAD per event 
  MonitorElement* meChargeTotalEMvsHAD;
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 };
 
 #endif
diff --git a/trunk/DQM/CastorMonitor/interface/CastorLEDMonitor.h b/trunk/DQM/CastorMonitor/interface/CastorLEDMonitor.h
@@ -40,7 +40,7 @@ class CastorLEDMonitor: public CastorBaseMonitor {
   ~CastorLEDMonitor(); 
 
   void setup(const edm::ParameterSet& ps, DQMStore* dbe);
-
+  void beginRun(const edm::EventSetup& iSetup);
   void processEvent(const CastorDigiCollection& cast, const CastorDbService& cond);
 
   void reset();

diff --git a/trunk/DQM/CastorMonitor/interface/CastorMonitorModule.h b/trunk/DQM/CastorMonitor/interface/CastorMonitorModule.h
@@ -53,7 +53,6 @@
 #include "DQM/CastorMonitor/interface/CastorChannelQualityMonitor.h"
 #include "DQM/CastorMonitor/interface/CastorLEDMonitor.h"
 #include "DQM/CastorMonitor/interface/CastorPSMonitor.h"
-#include "DQM/CastorMonitor/interface/CastorEventDisplay.h"
 #include "DQM/CastorMonitor/interface/CastorHIMonitor.h"
 #include "DQM/CastorMonitor/interface/CastorDataIntegrityMonitor.h"
 #include "DQM/CastorMonitor/interface/CastorTowerJetMonitor.h"
@@ -74,7 +73,6 @@
 
 
 
-
 class CastorMonitorModule : public edm::EDAnalyzer{
 
 public:
@@ -191,7 +189,6 @@ class CastorMonitorModule : public edm::EDAnalyzer{
   int ievt_pre_; //-- copy of counter used for prescale purposes
   bool fedsListed_;
 
-  //edm::InputTag inputLabelGT_;
   edm::InputTag inputLabelRaw_;
   edm::InputTag inputLabelReport_;
   edm::InputTag inputLabelDigi_;
@@ -203,13 +200,10 @@ class CastorMonitorModule : public edm::EDAnalyzer{
   edm::InputTag inputLabelCastorBasicJets_ ; 
   edm::InputTag inputLabelCastorJetIDs_ ; 
 
-
-
   ////---- define  CastorTowerCollection
   // typedef std::vector<reco::CastorTower> CastorTowerCollection;
-
-  //edm::InputTag inputLabelCaloTower_;
-  //edm::InputTag inputLabelLaser_;
+  // edm::InputTag inputLabelCaloTower_;
+  // edm::InputTag inputLabelLaser_;
 
   ////---- Maps of readout hardware unit to calorimeter channel
   std::map<uint32_t, std::vector<HcalCastorDetId> > DCCtoCell;
@@ -226,7 +220,7 @@ class CastorMonitorModule : public edm::EDAnalyzer{
   MonitorElement* meLatency_;
   MonitorElement* meQuality_;
   MonitorElement* CastorEventProduct;
-  
+
 
   ////---- define monitors
   CastorMonitorSelector*    evtSel_;
@@ -235,7 +229,6 @@ class CastorMonitorModule : public edm::EDAnalyzer{
   CastorDigiMonitor*        DigiMon_;
   CastorLEDMonitor*         LedMon_;
   CastorPSMonitor*          PSMon_;
-  CastorEventDisplay*       EDMon_;
   CastorHIMonitor*          HIMon_;
   CastorDataIntegrityMonitor* DataIntMon_;
   CastorTowerJetMonitor*     TowerJetMon_;

diff --git a/trunk/DQM/CastorMonitor/interface/CastorPSMonitor.h b/trunk/DQM/CastorMonitor/interface/CastorPSMonitor.h
@@ -17,6 +17,7 @@ class CastorPSMonitor: public CastorBaseMonitor {
   ~CastorPSMonitor(); 
 
   void setup(const edm::ParameterSet& ps, DQMStore* dbe);
+  void beginRun(const edm::Run& iRun, const edm::EventSetup& iSetup);
   void processEvent(const CastorDigiCollection& castorDigis, const CastorDbService& conditions, std::vector<HcalGenericDetId> listEMap, int iBunch, float  PedSigmaInChannel[14][16]);
   void reset();
 

diff --git a/trunk/DQM/CastorMonitor/interface/CastorRecHitMonitor.h b/trunk/DQM/CastorMonitor/interface/CastorRecHitMonitor.h
@@ -12,6 +12,7 @@ class CastorRecHitMonitor: public CastorBaseMonitor {
   ~CastorRecHitMonitor(); 
 
   void setup(const edm::ParameterSet& ps, DQMStore* dbe);
+  void beginRun(const edm::EventSetup& iSetup);
   void processEvent(const CastorRecHitCollection& castorHits);
   void reset();
 

diff --git a/trunk/DQM/CastorMonitor/interface/CastorTowerJetMonitor.h b/trunk/DQM/CastorMonitor/interface/CastorTowerJetMonitor.h
@@ -23,6 +23,7 @@ class CastorTowerJetMonitor: public CastorBaseMonitor {
   ~CastorTowerJetMonitor(); 
 
   void setup(const edm::ParameterSet& ps, DQMStore* dbe);
+  void beginRun(const edm::Run& iRun, const edm::EventSetup& iSetup);
 
   void processEventTowers(const reco::CastorTowerCollection& castorTowers);
   void processEventJets(const  reco::BasicJet& castorBasicJets);