Merge pull request #6060 from Dr15Jones/makeHcalContainersThreadSafe

Thread safe access to HCAL conditions containers
cms-sw · Oct 31, 2014 · e90a418 · e90a418
2 parents 104baa3 + d6f71a1
commit e90a418
Show file tree

Hide file tree

Showing 36 changed files with 234 additions and 224 deletions.
diff --git a/CalibCalorimetry/CaloTPG/plugins/CaloTPGTranscoderULUTs.cc b/CalibCalorimetry/CaloTPG/plugins/CaloTPGTranscoderULUTs.cc
@@ -150,9 +150,14 @@ CaloTPGTranscoderULUTs::produce(const CaloTPGRecord& iRecord)
    edm::ESHandle<HcalTrigTowerGeometry> theTrigTowerGeometry;
    iRecord.getRecord<CaloGeometryRecord>().get(theTrigTowerGeometry);
 
+   edm::ESHandle<HcalTopology> htopo;
+   iRecord.getRecord<HcalLutMetadataRcd>().getRecord<IdealGeometryRecord>().get(htopo);
+
+   HcalLutMetadata fullLut{ *lutMetadata };
+   fullLut.setTopo(htopo.product());
 
    std::auto_ptr<CaloTPGTranscoderULUT> pTCoder(new CaloTPGTranscoderULUT(file1, file2));
-   pTCoder->setup(*lutMetadata, *theTrigTowerGeometry);
+   pTCoder->setup(fullLut, *theTrigTowerGeometry);
    return std::auto_ptr<CaloTPGTranscoder>( pTCoder );
 }
 

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;