Use thread-safe access to HCAL containers

The HCAL containers are no longer updated once published in the EventSetup. Therefore when reading the conditions one must either 1) if using HcalChannelQuality, use 'withTopo' when getting the object from the HcalChannelQualityRcd 2) after getting the conditions, copy it and call setTopo on the copy.
stadie · Oct 30, 2014 · 4257768 · 4257768
1 parent 2771cfb
commit 4257768
Show file tree

Hide file tree

Showing 31 changed files with 77 additions and 93 deletions.
diff --git a/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc b/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc
@@ -1,5 +1,6 @@
 #include "CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.h"
 #include "FWCore/Utilities/interface/Exception.h"
+#include "FWCore/Framework/interface/ESTransientHandle.h"
 #include "Geometry/HcalTowerAlgo/interface/HcalTrigTowerGeometry.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "FWCore/Utilities/interface/Exception.h"

diff --git a/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.h b/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.h
@@ -1,6 +1,7 @@
 #ifndef CALOTPGTRANSCODERULUT_H
 #define CALOTPGTRANSCODERULUT_H 1
 
+#include <memory>
 #include <vector>
 #include "CalibFormats/CaloTPG/interface/CaloTPGTranscoder.h"
 

diff --git a/CalibCalorimetry/HcalAlgos/interface/HcalPulseShapes.h b/CalibCalorimetry/HcalAlgos/interface/HcalPulseShapes.h
@@ -45,9 +45,9 @@ class HcalPulseShapes {
   Shape hpdShape_v2, hpdShapeMC_v2;
   Shape hpdShape_v3, hpdShapeMC_v3;
   Shape hpdBV30Shape_v2, hpdBV30ShapeMC_v2;
-  const HcalMCParams * theMCParams;
+  HcalMCParams * theMCParams;
   const HcalTopology * theTopology;
-  const HcalRecoParams * theRecoParams;
+  HcalRecoParams * theRecoParams;
   typedef std::map<int, const Shape *> ShapeMap;
   ShapeMap theShapes;
 

diff --git a/CaloOnlineTools/HcalOnlineDb/src/HcalLutGenerator.cc b/CaloOnlineTools/HcalOnlineDb/src/HcalLutGenerator.cc
@@ -58,7 +58,7 @@ void HcalLutGenerator::analyze(const edm::Event& iEvent, const edm::EventSetup&
   //_____ get Channel Quality conditions from Event Setup (example)______
   //
   edm::ESHandle<HcalChannelQuality> hCQ;
-  iSetup.get<HcalChannelQualityRcd>().get(hCQ);
+  iSetup.get<HcalChannelQualityRcd>().get("withTopo",hCQ);
   const HcalChannelQuality * _cq = &(*hCQ);
   //
   /*

diff --git a/CondTools/Hcal/plugins/HcalChannelQualityPopConAnalyzer.cc b/CondTools/Hcal/plugins/HcalChannelQualityPopConAnalyzer.cc
@@ -26,7 +26,7 @@ class HcalChannelQualityPopConAnalyzer: public popcon::PopConAnalyzer<HcalChanne
     //Using ES to get the data:
 
     edm::ESHandle<HcalChannelQuality> objecthandle;
-    esetup.get<HcalChannelQualityRcd>().get(objecthandle);
+    esetup.get<HcalChannelQualityRcd>().get("withTopo",objecthandle);
     myDBObject = new HcalChannelQuality(*objecthandle.product() );
   }
 

diff --git a/DQM/HcalMonitorClient/interface/HcalMonitorClient.h b/DQM/HcalMonitorClient/interface/HcalMonitorClient.h
@@ -117,7 +117,7 @@ class HcalMonitorClient: public edm::EDAnalyzer
   std::vector<HcalBaseDQClient*> clients_;  
 
   DQMStore* dqmStore_;
-  HcalChannelQuality* chanquality_;
+  const HcalChannelQuality* chanquality_;
 
   HcalSummaryClient* summaryClient_;
   EtaPhiHists* ChannelStatus;

diff --git a/DQM/HcalMonitorClient/src/HcalMonitorClient.cc b/DQM/HcalMonitorClient/src/HcalMonitorClient.cc
@@ -193,9 +193,8 @@ void HcalMonitorClient::beginRun(const edm::Run& r, const edm::EventSetup& c)
   c.get<IdealGeometryRecord>().get(topo);
 
   edm::ESHandle<HcalChannelQuality> p;
-  c.get<HcalChannelQualityRcd>().get(p);
-  chanquality_= new HcalChannelQuality(*p.product());
-  if (!chanquality_->topo()) chanquality_->setTopo(topo.product());
+  c.get<HcalChannelQualityRcd>().get("withTopo",p);
+  chanquality_= p.product();
 
   if (dqmStore_ && ChannelStatus==0)
     {

diff --git a/DQM/HcalMonitorTasks/src/HcalBeamMonitor.cc b/DQM/HcalMonitorTasks/src/HcalBeamMonitor.cc
@@ -432,8 +432,8 @@ void HcalBeamMonitor::beginRun(const edm::Run& run, const edm::EventSetup& c)
   // Get Channel quality info for the run
   // Exclude bad channels from overall calculation
   edm::ESHandle<HcalChannelQuality> p;
-  c.get<HcalChannelQualityRcd>().get(p);
-  HcalChannelQuality* chanquality = new HcalChannelQuality(*p.product());
+  c.get<HcalChannelQualityRcd>().get("withTopo",p);
+  const HcalChannelQuality* chanquality = p.product();
   std::vector<DetId> mydetids = chanquality->getAllChannels();
 
   for (unsigned int i=0;i<mydetids.size();++i)
@@ -446,20 +446,19 @@ void HcalBeamMonitor::beginRun(const edm::Run& run, const edm::EventSetup& c)
 	  (id.depth()==2 && (abs(id.ieta())==35 || abs(id.ieta())==36)))
 	{
 	  const HcalChannelStatus* origstatus=chanquality->getValues(id);
-	  HcalChannelStatus* mystatus=new HcalChannelStatus(origstatus->rawId(),origstatus->getValue());
-	  if (mystatus->isBitSet(HcalChannelStatus::HcalCellHot)) 
+	  HcalChannelStatus mystatus(origstatus->rawId(),origstatus->getValue());
+	  if (mystatus.isBitSet(HcalChannelStatus::HcalCellHot)) 
 	    BadCells_[id]=HcalChannelStatus::HcalCellHot;
 
-	  else if (mystatus->isBitSet(HcalChannelStatus::HcalCellDead))
+	  else if (mystatus.isBitSet(HcalChannelStatus::HcalCellDead))
 	    BadCells_[id]=HcalChannelStatus::HcalCellDead;
 
-	  if (mystatus->isBitSet(HcalChannelStatus::HcalCellHot) || 
-	      mystatus->isBitSet(HcalChannelStatus::HcalCellDead))
+	  if (mystatus.isBitSet(HcalChannelStatus::HcalCellHot) || 
+	      mystatus.isBitSet(HcalChannelStatus::HcalCellDead))
 	    {
 	      if (id.depth()==1) --ring1totalchannels_;
 	      else if (id.depth()==2) --ring2totalchannels_;
 	    }
-	  delete mystatus;
 	} // if ((id.depth()==1) ...
     } // for (unsigned int i=0;...)
 

diff --git a/DQM/HcalMonitorTasks/src/HcalDeadCellMonitor.cc b/DQM/HcalMonitorTasks/src/HcalDeadCellMonitor.cc
@@ -407,8 +407,8 @@ void HcalDeadCellMonitor::beginRun(const edm::Run& run, const edm::EventSetup& c
   if (badChannelStatusMask_>0)
     {
       edm::ESHandle<HcalChannelQuality> p;
-      c.get<HcalChannelQualityRcd>().get(p);
-      HcalChannelQuality* chanquality= new HcalChannelQuality(*p.product());
+      c.get<HcalChannelQualityRcd>().get("withTopo",p);
+      const HcalChannelQuality* chanquality= p.product();
       std::vector<DetId> mydetids = chanquality->getAllChannels();
       for (std::vector<DetId>::const_iterator i = mydetids.begin();
 	   i!=mydetids.end();
@@ -420,7 +420,6 @@ void HcalDeadCellMonitor::beginRun(const edm::Run& run, const edm::EventSetup& c
 	  if ((status & badChannelStatusMask_))
 	    KnownBadCells_[id.rawId()]=status;
 	} 
-      delete chanquality;
     } // if (badChannelStatusMask_>0)
   return;
 } //void HcalDeadCellMonitor::beginRun(...)

diff --git a/DQM/HcalMonitorTasks/src/HcalDetDiagLEDMonitor.cc b/DQM/HcalMonitorTasks/src/HcalDetDiagLEDMonitor.cc
@@ -305,8 +305,8 @@ void HcalDetDiagLEDMonitor::beginRun(const edm::Run& run, const edm::EventSetup&
   if (mergeRuns_==false) this->reset();
 
   edm::ESHandle<HcalChannelQuality> p;
-  c.get<HcalChannelQualityRcd>().get(p);
-  HcalChannelQuality* chanquality= new HcalChannelQuality(*p.product());
+  c.get<HcalChannelQualityRcd>().get("withTopo",p);
+  const HcalChannelQuality* chanquality= p.product();
   std::vector<DetId> mydetids = chanquality->getAllChannels();
   KnownBadCells_.clear();
 

diff --git a/DQM/HcalMonitorTasks/src/HcalDetDiagLaserMonitor.cc b/DQM/HcalMonitorTasks/src/HcalDetDiagLaserMonitor.cc
@@ -425,8 +425,8 @@ HcalDetDiagLaserMonitor::HcalDetDiagLaserMonitor(const edm::ParameterSet& iConfi
 }
 void HcalDetDiagLaserMonitor::beginRun(const edm::Run& run, const edm::EventSetup& c){
   edm::ESHandle<HcalChannelQuality> p;
-  c.get<HcalChannelQualityRcd>().get(p);
-  HcalChannelQuality* chanquality= new HcalChannelQuality(*p.product());
+  c.get<HcalChannelQualityRcd>().get("withTopo",p);
+  const HcalChannelQuality* chanquality= p.product();
   std::vector<DetId> mydetids = chanquality->getAllChannels();
   KnownBadCells_.clear();
 

diff --git a/DQM/HcalMonitorTasks/src/HcalDetDiagPedestalMonitor.cc b/DQM/HcalMonitorTasks/src/HcalDetDiagPedestalMonitor.cc
@@ -296,8 +296,8 @@ void HcalDetDiagPedestalMonitor::beginRun(const edm::Run& run, const edm::EventS
   emap=conditions_->getHcalMapping();
 
   edm::ESHandle<HcalChannelQuality> p;
-  c.get<HcalChannelQualityRcd>().get(p);
-  HcalChannelQuality* chanquality= new HcalChannelQuality(*p.product());
+  c.get<HcalChannelQualityRcd>().get("withTopo",p);
+  const HcalChannelQuality* chanquality= p.product();
   std::vector<DetId> mydetids = chanquality->getAllChannels();
   KnownBadCells_.clear();
 

diff --git a/DQM/HcalMonitorTasks/src/HcalDigiMonitor.cc b/DQM/HcalMonitorTasks/src/HcalDigiMonitor.cc
@@ -350,8 +350,8 @@ void HcalDigiMonitor::beginRun(const edm::Run& run, const edm::EventSetup& c)
 
   // Get all pedestals by Cap ID
   edm::ESHandle<HcalChannelQuality> p;
-  c.get<HcalChannelQualityRcd>().get(p);
-  HcalChannelQuality *chanquality= new HcalChannelQuality(*p.product());
+  c.get<HcalChannelQualityRcd>().get("withTopo",p);
+  const HcalChannelQuality *chanquality= p.product();
   std::vector<DetId> mydetids = chanquality->getAllChannels();
   PedestalsByCapId_.clear();
 
@@ -377,15 +377,14 @@ void HcalDigiMonitor::beginRun(const edm::Run& run, const edm::EventSetup& c)
 
   if (tevt_==0) this->setup(); // create all histograms; not necessary if merging runs together
   if (mergeRuns_==false) this->reset(); // call reset at start of all runs
-  delete chanquality;
 
   // Get known dead cells for this run
   KnownBadCells_.clear();
   if (badChannelStatusMask_>0)
     {
       edm::ESHandle<HcalChannelQuality> p;
-      c.get<HcalChannelQualityRcd>().get(p);
-      HcalChannelQuality* chanquality= new HcalChannelQuality(*p.product());
+      c.get<HcalChannelQualityRcd>().get("withTopo",p);
+      const HcalChannelQuality* chanquality= p.product();
       std::vector<DetId> mydetids = chanquality->getAllChannels();
       for (std::vector<DetId>::const_iterator i = mydetids.begin();
 	   i!=mydetids.end();
@@ -399,7 +398,6 @@ void HcalDigiMonitor::beginRun(const edm::Run& run, const edm::EventSetup& c)
 	      KnownBadCells_[id.rawId()]=status;
 	    }
 	} 
-        delete chanquality;
     } // if (badChannelStatusMask_>0)
 
 } // void HcalDigiMonitor::beginRun()

diff --git a/DQMOffline/Hcal/src/HcalRecHitsAnalyzer.cc b/DQMOffline/Hcal/src/HcalRecHitsAnalyzer.cc
@@ -659,11 +659,8 @@ void HcalRecHitsAnalyzer::analyze(edm::Event const& ev, edm::EventSetup const& c
 
   // HCAL channel status map ****************************************
   edm::ESHandle<HcalChannelQuality> hcalChStatus;
-  c.get<HcalChannelQualityRcd>().get( hcalChStatus );
+  c.get<HcalChannelQualityRcd>().get( "withTopo", hcalChStatus );
   theHcalChStatus = hcalChStatus.product();
-  edm::ESHandle<HcalTopology> topo;
-  c.get<IdealGeometryRecord>().get(topo);
-  if (!theHcalChStatus->topo()) theHcalChStatus->setTopo(topo.product());
 
   // Assignment of severity levels **********************************
   edm::ESHandle<HcalSeverityLevelComputer> hcalSevLvlComputerHndl;

diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTHcalIsolationProducersRegional.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTHcalIsolationProducersRegional.h
@@ -20,7 +20,7 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
- #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 

diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTHcalIsolationProducersRegional.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTHcalIsolationProducersRegional.cc
@@ -14,8 +14,9 @@
 
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputer.h"
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputerRcd.h"
-#include "CondFormats/HcalObjects/interface/HcalChannelQuality.h"
 #include "CondFormats/DataRecord/interface/HcalChannelQualityRcd.h"
+#include "CondFormats/HcalObjects/interface/HcalChannelQuality.h"
+
 
 #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
@@ -88,9 +89,10 @@ void EgammaHLTHcalIsolationProducersRegional::produce(edm::Event& iEvent, const
   iEvent.getByToken(hbheRecHitProducer_, hbheRecHitHandle);
   const HBHERecHitCollection* hbheRecHitCollection = hbheRecHitHandle.product();
 
-  edm::ESHandle<HcalChannelQuality> hcalChStatus;
-  iSetup.get<HcalChannelQualityRcd>().get(hcalChStatus);
-
+  edm::ESHandle<HcalChannelQuality> hcalChStatusHandle;    
+  iSetup.get<HcalChannelQualityRcd>().get( "withTopo", hcalChStatusHandle );
+  const HcalChannelQuality* hcalChStatus = hcalChStatusHandle.product();
+
   edm::ESHandle<HcalSeverityLevelComputer> hcalSevLvlComp;
   iSetup.get<HcalSeverityLevelComputerRcd>().get(hcalSevLvlComp);
 
@@ -121,7 +123,7 @@ void EgammaHLTHcalIsolationProducersRegional::produce(edm::Event& iEvent, const
     if(doEtSum_) {
       isol = isolAlgo_->getEtSum(recoEcalCandRef->superCluster()->eta(),
 				 recoEcalCandRef->superCluster()->phi(),hbheRecHitCollection,caloGeom,
-				 hcalSevLvlComp.product(),hcalChStatus.product());      
+				 hcalSevLvlComp.product(),hcalChStatus);      
 
       if (doRhoCorrection_) {
 	if (fabs(recoEcalCandRef->superCluster()->eta()) < 1.442) 
@@ -132,7 +134,7 @@ void EgammaHLTHcalIsolationProducersRegional::produce(edm::Event& iEvent, const
     } else {
       isol = isolAlgo_->getESum(recoEcalCandRef->superCluster()->eta(),recoEcalCandRef->superCluster()->phi(),
 				hbheRecHitCollection,caloGeom,
-				hcalSevLvlComp.product(),hcalChStatus.product());      
+				hcalSevLvlComp.product(),hcalChStatus);      
     }
 
     isoMap.insert(recoEcalCandRef, isol);   

diff --git a/RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreator.cc b/RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreator.cc
@@ -144,11 +144,10 @@ void CaloTowersCreator::produce(edm::Event& e, const edm::EventSetup& c) {
 
   // HCAL channel status map ****************************************
   edm::ESHandle<HcalChannelQuality> hcalChStatus;    
-  c.get<HcalChannelQualityRcd>().get( hcalChStatus );
+  c.get<HcalChannelQualityRcd>().get( "withTopo", hcalChStatus );
+
   const HcalChannelQuality* dbHcalChStatus = hcalChStatus.product();
-
-  if (!dbHcalChStatus->topo()) dbHcalChStatus->setTopo(htopo.product());
-
+
   // Assignment of severity levels **********************************
   edm::ESHandle<HcalSeverityLevelComputer> hcalSevLvlComputerHndl;
   c.get<HcalSeverityLevelComputerRcd>().get(hcalSevLvlComputerHndl);

diff --git a/RecoLocalCalo/HcalRecAlgos/test/HcalRecHitReflagger.cc b/RecoLocalCalo/HcalRecAlgos/test/HcalRecHitReflagger.cc
@@ -168,7 +168,7 @@ HcalRecHitReflagger::~HcalRecHitReflagger()
 void HcalRecHitReflagger::beginRun(const Run& r, const EventSetup& c)
 {
   edm::ESHandle<HcalChannelQuality> p;
-  c.get<HcalChannelQualityRcd>().get(p);
+  c.get<HcalChannelQualityRcd>().get("withTopo",p);
   const HcalChannelQuality& chanquality_(*p.product());
 
   std::vector<DetId> mydetids = chanquality_.getAllChannels();

diff --git a/RecoLocalCalo/HcalRecProducers/src/HBHEIsolatedNoiseReflagger.cc b/RecoLocalCalo/HcalRecProducers/src/HBHEIsolatedNoiseReflagger.cc
@@ -12,13 +12,14 @@ Original Author: John Paul Chou (Brown University)
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "DataFormats/JetReco/interface/TrackExtrapolation.h"
 #include "CondFormats/DataRecord/interface/EcalChannelStatusRcd.h"
-#include "CondFormats/DataRecord/interface/HcalChannelQualityRcd.h"
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputerRcd.h"
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalCaloFlagLabels.h"
 #include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgoRcd.h"
 #include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgo.h"
 
 #include "RecoMET/METAlgorithms/interface/HcalHPDRBXMap.h"
+#include "CondFormats/HcalObjects/interface/HcalChannelQuality.h"
+#include "CondFormats/DataRecord/interface/HcalChannelQualityRcd.h"
 
 HBHEIsolatedNoiseReflagger::HBHEIsolatedNoiseReflagger(const edm::ParameterSet& iConfig) :
 
@@ -78,8 +79,9 @@ HBHEIsolatedNoiseReflagger::produce(edm::Event& iEvent, const edm::EventSetup& e
   const EcalChannelStatus* dbEcalChStatus = ecalChStatus.product();
 
   // get the HCAL channel status map
+
   edm::ESHandle<HcalChannelQuality> hcalChStatus;    
-  evSetup.get<HcalChannelQualityRcd>().get( hcalChStatus );
+  evSetup.get<HcalChannelQualityRcd>().get( "withTopo", hcalChStatus );
   const HcalChannelQuality* dbHcalChStatus = hcalChStatus.product();
 
   // get the severity level computers

diff --git a/RecoLocalCalo/HcalRecProducers/src/HBHEIsolatedNoiseReflagger.h b/RecoLocalCalo/HcalRecProducers/src/HBHEIsolatedNoiseReflagger.h
@@ -7,6 +7,7 @@ Description: "Reflags" HB/HE hits based on their ECAL, HCAL, and tracking isolat
 Original Author: John Paul Chou (Brown University)
                  Thursday, September 2, 2010
 */
+#include <memory>
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDProducer.h"
@@ -22,7 +23,7 @@ class HBHEIsolatedNoiseReflagger : public edm::EDProducer {
 
 
  private:
-  virtual void produce(edm::Event&, const edm::EventSetup&);
+  virtual void produce(edm::Event&, const edm::EventSetup&) override;
 
   void DumpHBHEHitMap(std::vector<HBHEHitMap>& i) const;