Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Position calc fix #11415

Merged
merged 1 commit into from Sep 23, 2015
Merged

Position calc fix #11415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 4 additions & 6 deletions RecoParticleFlow/PFClusterProducer/src/ECAL2DPositionCalcWithDepthCorr.cc
View file
Open in desktop
Expand Up @@ -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);
Expand All @@ -34,7 +32,7 @@ update(const edm::EventSetup& es) {
_esPlus = _esPlus || ( 0 < z ) ;
_esMinus = _esMinus || ( 0 > z ) ;
}
}

}

void ECAL2DPositionCalcWithDepthCorr::
Expand Down
3 changes: 1 addition & 2 deletions RecoParticleFlow/PFClusterProducer/src/ECAL2DPositionCalcWithDepthCorr.h
View file
Open in desktop
Expand Up @@ -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),
Expand Down Expand Up @@ -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;
Expand Down