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

Fix Shashlik assert #4055

Merged
merged 1 commit into from May 30, 2014
Merged

Fix Shashlik assert #4055

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
11 changes: 3 additions & 8 deletions RecoEgamma/EgammaIsolationAlgos/plugins/EgammaRecHitExtractor.cc
View file
Open in desktop
Expand Up @@ -121,15 +121,10 @@ reco::IsoDeposit EgammaRecHitExtractor::deposit(const edm::Event & iEvent,

const CaloGeometry* caloGeom = pG.product();
const CaloSubdetectorGeometry* barrelgeom = caloGeom->getSubdetectorGeometry(DetId::Ecal,EcalBarrel);
const CaloSubdetectorGeometry* endcapgeom = caloGeom->getSubdetectorGeometry(DetId::Ecal,EcalEndcap) != NULL ?
caloGeom->getSubdetectorGeometry(DetId::Ecal,EcalEndcap) :
caloGeom->getSubdetectorGeometry(DetId::Ecal,EcalShashlik); //Shervin
const CaloSubdetectorGeometry* endcapgeom = caloGeom->getSubdetectorGeometry(DetId::Ecal,EcalEndcap);
if( endcapgeom==nullptr ) endcapgeom=caloGeom->getSubdetectorGeometry(DetId::Ecal,EcalShashlik); //Shervin

if(endcapgeom!=caloGeom->getSubdetectorGeometry(DetId::Ecal,EcalShashlik)){
assert(endcapgeom==caloGeom->getSubdetectorGeometry(DetId::Ecal,EcalShashlik));
}
if(endcapgeom==NULL)
assert(endcapgeom!=NULL);
assert(endcapgeom!=nullptr);

static std::string metname = "EgammaIsolationAlgos|EgammaRecHitExtractor";

Expand Down