Merged CMSSW_7_6_X from repository cms-sw

CalibCalorimetry/CaloMiscalibTools/plugins/HcalRecHitRecalib.cc

@@ -1,7 +1,8 @@
-#include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "CalibCalorimetry/CaloMiscalibTools/interface/HcalRecHitRecalib.h"
 
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/HcalDetId/interface/HcalDetId.h"
+#include "Geometry/Records/interface/HcalRecNumberingRecord.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 
@@ -53,7 +54,7 @@ void
 HcalRecHitRecalib::beginRun(const edm::Run&, const edm::EventSetup& iSetup)
 {
   edm::ESHandle<HcalTopology> topology;
-  iSetup.get<IdealGeometryRecord>().get( topology );
+  iSetup.get<HcalRecNumberingRecord>().get( topology );
 
   mapHcal_.prefillMap(*topology);
 

CalibCalorimetry/CaloTPG/plugins/CaloTPGTranscoderULUTs.cc

@@ -35,7 +35,7 @@
 #include "CondFormats/HcalObjects/interface/HcalLutMetadata.h"
 #include "Geometry/HcalTowerAlgo/interface/HcalTrigTowerGeometry.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
-
+#include "Geometry/Records/interface/HcalRecNumberingRecord.h"
 
 //
 // class decleration
@@ -151,7 +151,7 @@ CaloTPGTranscoderULUTs::produce(const CaloTPGRecord& iRecord)
    iRecord.getRecord<CaloGeometryRecord>().get(theTrigTowerGeometry);
 
    edm::ESHandle<HcalTopology> htopo;
-   iRecord.getRecord<HcalLutMetadataRcd>().getRecord<IdealGeometryRecord>().get(htopo);
+   iRecord.getRecord<HcalLutMetadataRcd>().getRecord<HcalRecNumberingRecord>().get(htopo);
 
    HcalLutMetadata fullLut{ *lutMetadata };
    fullLut.setTopo(htopo.product());

CalibCalorimetry/HcalAlgos/interface/HcalPedestalAnalysis.h

@@ -47,6 +47,8 @@ class HcalPedestalAnalysis{
 
   void SampleAnalysis();
 
+  void setTopology(const HcalTopology* htopo) {fTopology = htopo;}
+
   int done(const HcalPedestals* fInputPedestals, 
 	    const HcalPedestalWidths* fInputWidths,
 	    HcalPedestals* fOutputPedestals, 
@@ -133,7 +135,7 @@ class HcalPedestalAnalysis{
   int evt_curr;
   float m_stat[4];
   std::vector<bool> state;
-  HcalTopology* fTopology;
+  const HcalTopology* fTopology;
 // flag to make gaussian fits to charge dists
   static const int fitflag=0;
 };

CalibCalorimetry/HcalAlgos/src/HcalPedestalAnalysis.cc

@@ -19,9 +19,9 @@ HcalPedestalAnalysis::HcalPedestalAnalysis(const edm::ParameterSet& ps)
     fRawPedestals (0),
     fRawPedestalWidths (0),
     fValPedestals (0),
-    fValPedestalWidths (0)
+    fValPedestalWidths (0),
+    fTopology(0)
 {
-  fTopology=0;
   m_coder = 0;
   m_shape = 0;
   evt=0;
@@ -61,8 +61,6 @@ HcalPedestalAnalysis::HcalPedestalAnalysis(const edm::ParameterSet& ps)
   if(m_startTS<0) m_startTS=0;
   m_endTS = ps.getUntrackedParameter<int>("lastTS", 9);
 
-  fTopology=new HcalTopology(HcalTopologyMode::LHC,2,3);
-
 //  m_logFile.open("HcalPedestalAnalysis.log");
 
   hbHists.ALLPEDS = new TH1F("HBHE All Pedestals","HBHE All Peds",10,0,9);

CalibCalorimetry/HcalAlgos/src/HcalPulseShapes.cc

@@ -10,7 +10,7 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "Geometry/CaloTopology/interface/HcalTopology.h"
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
+#include "Geometry/Records/interface/HcalRecNumberingRecord.h"
 
 // #include "CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h"
 #include <cmath>
@@ -115,7 +115,7 @@ void HcalPulseShapes::beginRun(edm::EventSetup const & es)
   theMCParams = new HcalMCParams(*p.product());
 
   edm::ESHandle<HcalTopology> htopo;
-  es.get<IdealGeometryRecord>().get(htopo);
+  es.get<HcalRecNumberingRecord>().get(htopo);
   theTopology=new HcalTopology(*htopo);
   theMCParams->setTopo(theTopology);
 

CalibCalorimetry/HcalAlgos/test/MapTester.cc

@@ -37,7 +37,7 @@
 #include "CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
+#include "Geometry/Records/interface/HcalRecNumberingRecord.h"
 //
 // class decleration
 //
@@ -95,7 +95,7 @@ MapTester::beginRun(const edm::EventSetup& iSetup)
   strftime(tempbuff,128,"%d.%b.%Y",localtime(&myTime) );
 
   edm::ESHandle<HcalTopology> topo;
-  iSetup.get<IdealGeometryRecord>().get(topo);
+  iSetup.get<HcalRecNumberingRecord>().get(topo);
 
   HcalLogicalMapGenerator mygen;
   HcalLogicalMap mymap=mygen.createMap(&(*topo),mapIOV_);

CalibCalorimetry/HcalPlugins/src/HcalDbProducer.cc

@@ -100,7 +100,7 @@ void HcalDbProducer::pedestalsCallback (const HcalPedestalsRcd& fRecord) {
   mPedestals.reset( new HcalPedestals(*item) );
 
   edm::ESHandle<HcalTopology> htopo;
-  fRecord.getRecord<IdealGeometryRecord>().get(htopo);
+  fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
   const HcalTopology* topo=&(*htopo);
   mPedestals->setTopo(topo);
 
@@ -120,7 +120,7 @@ boost::shared_ptr<HcalChannelQuality> HcalDbProducer::produceChannelQualityWithT
   boost::shared_ptr<HcalChannelQuality> channelQuality( new HcalChannelQuality(*item) );
 
   edm::ESHandle<HcalTopology> htopo;
-  fRecord.getRecord<IdealGeometryRecord>().get(htopo);
+  fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
   const HcalTopology* topo=&(*htopo);
   channelQuality->setTopo(topo);
 
@@ -134,7 +134,7 @@ void HcalDbProducer::pedestalWidthsCallback (const HcalPedestalWidthsRcd& fRecor
   mPedestalWidths.reset( new HcalPedestalWidths(*item));
 
   edm::ESHandle<HcalTopology> htopo;
-  fRecord.getRecord<IdealGeometryRecord>().get(htopo);
+  fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
   const HcalTopology* topo=&(*htopo);
   mPedestalWidths->setTopo(topo);
 
@@ -152,7 +152,7 @@ void HcalDbProducer::gainsCallback (const HcalGainsRcd& fRecord) {
 
   mGains.reset( new HcalGains(*item) );
   edm::ESHandle<HcalTopology> htopo;
-  fRecord.getRecord<IdealGeometryRecord>().get(htopo);
+  fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
   const HcalTopology* topo=&(*htopo);
   mGains->setTopo(topo);
 
@@ -171,7 +171,7 @@ void HcalDbProducer::gainWidthsCallback (const HcalGainWidthsRcd& fRecord) {
 
   mGainWidths.reset( new HcalGainWidths(*item));
   edm::ESHandle<HcalTopology> htopo;
-  fRecord.getRecord<IdealGeometryRecord>().get(htopo);
+  fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
   const HcalTopology* topo=&(*htopo);
   mGainWidths->setTopo(topo);
 
@@ -191,7 +191,7 @@ void HcalDbProducer::QIEDataCallback (const HcalQIEDataRcd& fRecord) {
 
 
   edm::ESHandle<HcalTopology> htopo;
-  fRecord.getRecord<IdealGeometryRecord>().get(htopo);
+  fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
   const HcalTopology* topo=&(*htopo);
   mQIEData->setTopo(topo);
 
@@ -220,7 +220,7 @@ void HcalDbProducer::respCorrsCallback (const HcalRespCorrsRcd& fRecord) {
   mRespCorrs.reset( new HcalRespCorrs(*item) );
 
   edm::ESHandle<HcalTopology> htopo;
-  fRecord.getRecord<IdealGeometryRecord>().get(htopo);
+  fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
   const HcalTopology* topo=&(*htopo);
   mRespCorrs->setTopo(topo);
 
@@ -238,7 +238,7 @@ void HcalDbProducer::LUTCorrsCallback (const HcalLUTCorrsRcd& fRecord) {
   mLUTCorrs.reset( new HcalLUTCorrs(*item) );
 
   edm::ESHandle<HcalTopology> htopo;
-  fRecord.getRecord<IdealGeometryRecord>().get(htopo);
+  fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
   const HcalTopology* topo=&(*htopo);
   mLUTCorrs->setTopo(topo);
 
@@ -256,7 +256,7 @@ void HcalDbProducer::PFCorrsCallback (const HcalPFCorrsRcd& fRecord) {
   mPFCorrs.reset( new HcalPFCorrs(*item) );
 
   edm::ESHandle<HcalTopology> htopo;
-  fRecord.getRecord<IdealGeometryRecord>().get(htopo);
+  fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
   const HcalTopology* topo=&(*htopo);
   mPFCorrs->setTopo(topo);
 
@@ -274,7 +274,7 @@ void HcalDbProducer::timeCorrsCallback (const HcalTimeCorrsRcd& fRecord) {
   mTimeCorrs.reset( new HcalTimeCorrs(*item) );
 
   edm::ESHandle<HcalTopology> htopo;
-  fRecord.getRecord<IdealGeometryRecord>().get(htopo);
+  fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
   const HcalTopology* topo=&(*htopo);
   mTimeCorrs->setTopo(topo);
 
@@ -292,7 +292,7 @@ void HcalDbProducer::zsThresholdsCallback (const HcalZSThresholdsRcd& fRecord) {
   mZSThresholds.reset( new HcalZSThresholds(*item) );
 
   edm::ESHandle<HcalTopology> htopo;
-  fRecord.getRecord<IdealGeometryRecord>().get(htopo);
+  fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
   const HcalTopology* topo=&(*htopo);
   mZSThresholds->setTopo(topo);
 
@@ -310,7 +310,7 @@ void HcalDbProducer::L1triggerObjectsCallback (const HcalL1TriggerObjectsRcd& fR
   mL1TriggerObjects.reset( new HcalL1TriggerObjects(*item) );
 
   edm::ESHandle<HcalTopology> htopo;
-  fRecord.getRecord<IdealGeometryRecord>().get(htopo);
+  fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
   const HcalTopology* topo=&(*htopo);
   mL1TriggerObjects->setTopo(topo);
 
@@ -338,7 +338,7 @@ void HcalDbProducer::lutMetadataCallback (const HcalLutMetadataRcd& fRecord) {
   mLutMetadata.reset( new HcalLutMetadata(*item) );
 
   edm::ESHandle<HcalTopology> htopo;
-  fRecord.getRecord<IdealGeometryRecord>().get(htopo);
+  fRecord.getRecord<HcalRecNumberingRecord>().get(htopo);
   const HcalTopology* topo=&(*htopo);
   mLutMetadata->setTopo(topo);