Merge pull request #11417 from argiro/PositionCalcFix-75X

PositionCalc Fix
cms-sw · Oct 12, 2015 · 81b5cb9 · 81b5cb9
2 parents c4d6c6d + f452a48
commit 81b5cb9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/RecoParticleFlow/PFClusterProducer/src/ECAL2DPositionCalcWithDepthCorr.cc b/RecoParticleFlow/PFClusterProducer/src/ECAL2DPositionCalcWithDepthCorr.cc
@@ -17,12 +17,10 @@
 
 void ECAL2DPositionCalcWithDepthCorr::
 update(const edm::EventSetup& es) {
-  const CaloGeometryRecord& temp = es.get<CaloGeometryRecord>();
-  if( _caloGeom == NULL || 
-      ( _caloGeom->cacheIdentifier() != temp.cacheIdentifier() ) ) {
-    _caloGeom = &temp;
+
+    const CaloGeometryRecord& caloGeom = es.get<CaloGeometryRecord>();
     edm::ESHandle<CaloGeometry> geohandle;
-    _caloGeom->get(geohandle);
+    caloGeom.get(geohandle);
     _ebGeom = geohandle->getSubdetectorGeometry(DetId::Ecal,EcalBarrel);
     _eeGeom = geohandle->getSubdetectorGeometry(DetId::Ecal,EcalEndcap);
     _esGeom = geohandle->getSubdetectorGeometry(DetId::Ecal,EcalPreshower);
@@ -34,7 +32,7 @@ update(const edm::EventSetup& es) {
 	_esPlus = _esPlus || ( 0 < z ) ;
 	_esMinus = _esMinus || ( 0 > z ) ;
     }  
-  }
+
 }
 
 void ECAL2DPositionCalcWithDepthCorr::

diff --git a/RecoParticleFlow/PFClusterProducer/src/ECAL2DPositionCalcWithDepthCorr.h b/RecoParticleFlow/PFClusterProducer/src/ECAL2DPositionCalcWithDepthCorr.h
@@ -24,7 +24,6 @@ class ECAL2DPositionCalcWithDepthCorr : public PFCPositionCalculatorBase {
     _param_W0(conf.getParameter<double>("W0")),
     _param_X0(conf.getParameter<double>("X0")),
     _minAllowedNorm(conf.getParameter<double>("minAllowedNormalization")),
-    _caloGeom(NULL),
     _ebGeom(NULL),
     _eeGeom(NULL),
     _esGeom(NULL),
@@ -54,7 +53,7 @@ class ECAL2DPositionCalcWithDepthCorr : public PFCPositionCalculatorBase {
   const double _minAllowedNorm;
 
 
-  const CaloGeometryRecord* _caloGeom;
+  //const CaloGeometryRecord  _caloGeom;
   const CaloSubdetectorGeometry* _ebGeom;
   const CaloSubdetectorGeometry* _eeGeom;
   const CaloSubdetectorGeometry* _esGeom;