From 98c6f41ff0021e4b3803e05852aaefea71b0191f Mon Sep 17 00:00:00 2001 From: David Date: Thu, 9 Oct 2014 16:55:14 +0200 Subject: [PATCH] fix typo --- DataFormats/TrackerCommon/interface/TrackerTopology.h | 1 - DataFormats/TrackerCommon/src/TrackerTopology.cc | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/DataFormats/TrackerCommon/interface/TrackerTopology.h b/DataFormats/TrackerCommon/interface/TrackerTopology.h index 77da68a1eeb6b..f69c5603d1353 100644 --- a/DataFormats/TrackerCommon/interface/TrackerTopology.h +++ b/DataFormats/TrackerCommon/interface/TrackerTopology.h @@ -464,7 +464,6 @@ class TrackerTopology { SiStripDetId::ModuleGeometry moduleGeometry(const DetId &id) const; - private: PixelBarrelValues pbVals_; diff --git a/DataFormats/TrackerCommon/src/TrackerTopology.cc b/DataFormats/TrackerCommon/src/TrackerTopology.cc index 2e28e61252374..70bd1f44e1e99 100644 --- a/DataFormats/TrackerCommon/src/TrackerTopology.cc +++ b/DataFormats/TrackerCommon/src/TrackerTopology.cc @@ -165,7 +165,7 @@ std::string TrackerTopology::print(DetId id) const { SiStripDetId::ModuleGeometry TrackerTopology::moduleGeometry(const DetId &id) const { - switch(subDetector()) { + switch(id.subdetId()) { case StripSubdetector::TIB: return tibLayer(id)<3? SiStripDetId::IB1 : SiStripDetId::IB2; case StripSubdetector::TOB: return tobLayer(id)<5? SiStripDetId::OB2 : SiStripDetId::OB1; case StripSubdetector::TID: switch (tidRing(id)) { @@ -182,7 +182,6 @@ SiStripDetId::ModuleGeometry TrackerTopology::moduleGeometry(const DetId &id) co case 6: return SiStripDetId::W6; case 7: return SiStripDetId::W7; } - case UNKNOWN: default: return SiStripDetId::UNKNOWNGEOMETRY; } return SiStripDetId::UNKNOWNGEOMETRY; }