Merge pull request cms-sw#7797 from nickmccoll/my-cmssw/CalibFormats_…

…SiStripObjects_toTrackerTopology Removal of depreciated SiStripDetId classes from CalibFormats/SiStripObjects
shervin86 · Mar 10, 2015 · 1686b1d · 1686b1d
2 parents 3ea396a + e51f1ab
commit 1686b1d
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/HcalIsolatedTrackReco/src/HITSiStripRawToClustersRoI.cc b/HcalIsolatedTrackReco/src/HITSiStripRawToClustersRoI.cc
@@ -89,8 +89,13 @@ void HITSiStripRawToClustersRoI::produce(edm::Event& event, const edm::EventSetu
 }
 
 bool HITSiStripRawToClustersRoI::physicalLayer(SubDet& subdet, uint32_t& layer) const {
-  int signedlayer = static_cast<int>(SiStripRegionCabling::physicalLayer(subdet,layer));
-  return (nlayers_ == -1 || signedlayer < nlayers_) ? true : false;
+  uint32_t signedlayer = 0;
+  if (subdet == SiStripRegionCabling::TIB || subdet == SiStripRegionCabling::TID) signedlayer = layer;
+  else if (subdet == SiStripRegionCabling::TOB) signedlayer = SiStripRegionCabling::TIBLAYERS + layer;
+  else if (subdet == SiStripRegionCabling::TEC) signedlayer = SiStripRegionCabling::TIDLAYERS + layer;
+  else signedlayer = SiStripRegionCabling::ALLLAYERS;
+
+  return (nlayers_ == -1 || int(signedlayer) < nlayers_) ? true : false;
 }
 
 void HITSiStripRawToClustersRoI::random(RefGetter& refgetter, edm::Handle<LazyGetter>& lazygetter) const {