Skip to content

MTD Geometry: clean compiler warnings #51127

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

Open
fabiocos wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −7
Open

MTD Geometry: clean compiler warnings #51127

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions DataFormats/ForwardDetId/interface/MTDDetId.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,11 @@ class MTDDetId : public DetId {
/** Returns enumerated type specifying MTD sub-detector, i.e. BTL or ETL. */
inline int mtdSubDetector() const { return (id_ >> kMTDsubdOffset) & kMTDsubdMask; }

static inline bool const testForMTD(const DetId& id) {
return (id.rawId() >> MTDDetId::kMTDOffset) == MTDDetId::kMTDMask;
}
static inline bool const testForBTL(const DetId& id) {
static inline bool testForMTD(const DetId& id) { return (id.rawId() >> MTDDetId::kMTDOffset) == MTDDetId::kMTDMask; }
static inline bool testForBTL(const DetId& id) {
return (id.rawId() >> MTDDetId::kMTDsubdOffset) == MTDDetId::kBTLMask;
}
static inline bool const testForETL(const DetId& id) {
static inline bool testForETL(const DetId& id) {
return (id.rawId() >> MTDDetId::kMTDsubdOffset) == MTDDetId::kETLMask;
}

Expand Down
2 changes: 1 addition & 1 deletion Geometry/MTDGeometryBuilder/interface/MTDGeometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class MTDGeometry final : public TrackingGeometry {
const MTDGeomDet* idToDetUnit(DetId) const override;
const MTDGeomDet* idToDet(DetId) const override;

const GeomDetEnumerators::SubDetector geomDetSubDetector(int subdet) const;
GeomDetEnumerators::SubDetector geomDetSubDetector(int subdet) const;
unsigned int numberOfLayers(int subdet) const;
bool isThere(GeomDetEnumerators::SubDetector subdet) const;

Expand Down
2 changes: 1 addition & 1 deletion Geometry/MTDGeometryBuilder/src/MTDGeometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ const MTDGeomDet* MTDGeometry::idToDet(DetId s) const {
return nullptr;
}

const GeomDetEnumerators::SubDetector MTDGeometry::geomDetSubDetector(int subdet) const {
GeomDetEnumerators::SubDetector MTDGeometry::geomDetSubDetector(int subdet) const {
if (subdet >= 1 && subdet <= 2) {
return theSubDetTypeMap[subdet - 1];
} else {
Expand Down