---

yaml --- r: 124495 b: "refs/heads/l1t-devel-CMSSW_7_4_0_pre5" c: 302924d h: "refs/heads/l1t-devel-CMSSW_7_4_0_pre5" i: 124493: 2743959 124491: 6360a19 124487: 3d4a4b2 124479: 9d7fd8e v: v3
cms-sw · Jul 30, 2013 · ab1fd0f · ab1fd0f
1 parent c60fe49
commit ab1fd0f
Show file tree

Hide file tree

Showing 148 changed files with 2,359 additions and 5,252 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-"refs/heads/l1t-devel-CMSSW_7_4_0_pre5": 9518fa265709f7a58934a6872bd015861628e8b6
+"refs/heads/l1t-devel-CMSSW_7_4_0_pre5": 302924dbb4d2cdc07cf9cf9e199b3827ca0b6c20
diff --git a/trunk/Calibration/EcalCalibAlgos/src/ZeeCalibration.cc b/trunk/Calibration/EcalCalibAlgos/src/ZeeCalibration.cc
@@ -48,6 +48,7 @@
 #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,7 +13,8 @@
 //
 // Original Author:  Mauro Dinardo,28 S-020,+41227673777,
 //         Created:  Tue Feb 23 13:15:31 CET 2010
-// $Id: Vx3DHLTAnalyzer.cc,v 1.107 2013/07/04 16:20:11 dinardo Exp $
+// $Id: Vx3DHLTAnalyzer.cc,v 1.105 2012/09/14 07:50:15 davidlt Exp $
+
 
 #include "DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.h"
 
@@ -1064,25 +1065,6 @@ 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->();
@@ -1200,8 +1182,23 @@ void Vx3DHLTAnalyzer::beginRun()
       // - 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,7 +91,6 @@ 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,8 +25,7 @@
 #include <map>
 
 
-class CastorChannelQualityMonitor: public CastorBaseMonitor
-{
+class CastorChannelQualityMonitor: public CastorBaseMonitor{
 
   typedef std::map<uint32_t,float,std::less<uint32_t> >  MapType;
 
@@ -35,7 +34,6 @@ 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();
 
@@ -75,6 +73,8 @@ 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,7 +17,6 @@ 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
@@ -0,0 +1,54 @@
+#ifndef DQM_CASTORMONITOR_CASTOREVENTDISPLAY_H
+#define DQM_CASTORMONITOR_CASTOREVENTDISPLAY_H
+
+#include "DQM/CastorMonitor/interface/CastorBaseMonitor.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+
+#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
+#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
+#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
+#include "Geometry/Records/interface/CaloGeometryRecord.h"
+#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
+#include "SimG4CMS/Calo/interface/CaloHit.h"
+#include "SimDataFormats/CaloHit/interface/PCaloHit.h"
+#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
+#include <string>
+#include <map>
+#include <vector>
+
+
+class CastorEventDisplay: public CastorBaseMonitor {
+public:
+  CastorEventDisplay(); 
+  ~CastorEventDisplay(); 
+
+  void setup(const edm::ParameterSet& ps, DQMStore* dbe);
+  void processEvent(const CastorRecHitCollection& castorHits, const CaloGeometry& caloGeometry );
+  void reset();
+
+private:  
+
+
+
+  int ievt_;
+  double X_pos;
+  double Y_pos;
+  double Z_pos;
+  double X_pos_maxE;
+  double Y_pos_maxE;
+  double Z_pos_maxE;
+
+  bool offline_;
+  float  energy;
+  float  allEnergyEvent;
+  float  maxEnergyEvent;
+
+  ////---- define Monitoring elements
+  MonitorElement* meCastor3Dhits; //-- cumulative event display
+  MonitorElement* meCastor3DhitsMaxEnergy; //-- dispay of an event with the largest deposited energy
+  MonitorElement* meEVT_;
+
+};
+
+#endif
diff --git a/trunk/DQM/CastorMonitor/interface/CastorHIMonitor.h b/trunk/DQM/CastorMonitor/interface/CastorHIMonitor.h
@@ -12,7 +12,6 @@ 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();
 
@@ -23,6 +22,7 @@ class CastorHIMonitor: public CastorBaseMonitor {
   int ievt_;
 
 
+
  ////--- CASTOR channels
  int module;
  int sector;
@@ -48,6 +48,8 @@ class CastorHIMonitor: public CastorBaseMonitor {
  ////---- total energy deposited in the whole CASTOR  
  float EtotalCASTOR;
 
+
+
 
   ////---- define Monitoring elements
 
@@ -157,6 +159,8 @@ class CastorHIMonitor: public CastorBaseMonitor {
  MonitorElement* meEtotalEMvsHAD;
 
 
+
+
 ////---- charge in sectors
  MonitorElement* meChargeSector1;  
  MonitorElement* meChargeSector2;  
@@ -259,6 +263,22 @@ 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,6 +53,7 @@
 #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"
@@ -73,6 +74,7 @@
 
 
 
+
 class CastorMonitorModule : public edm::EDAnalyzer{
 
 public:
@@ -189,6 +191,7 @@ 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_;
@@ -200,10 +203,13 @@ 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;
@@ -220,7 +226,7 @@ class CastorMonitorModule : public edm::EDAnalyzer{
   MonitorElement* meLatency_;
   MonitorElement* meQuality_;
   MonitorElement* CastorEventProduct;
-
+  
 
   ////---- define monitors
   CastorMonitorSelector*    evtSel_;
@@ -229,6 +235,7 @@ 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,7 +17,6 @@ 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,7 +12,6 @@ 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,7 +23,6 @@ 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);