From 4b44d4d116f85b7ff8ea56a5ff8372566a511ae3 Mon Sep 17 00:00:00 2001
From: Fabio Cossutti <fabio.cossutti@ts.infn.it>
Date: Fri, 5 Jun 2026 18:35:26 +0200
Subject: [PATCH] Clean warnings from MTDDetId and MTDGeometry

---
 DataFormats/ForwardDetId/interface/MTDDetId.h       | 8 +++-----
 Geometry/MTDGeometryBuilder/interface/MTDGeometry.h | 2 +-
 Geometry/MTDGeometryBuilder/src/MTDGeometry.cc      | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/DataFormats/ForwardDetId/interface/MTDDetId.h b/DataFormats/ForwardDetId/interface/MTDDetId.h
index 3564a8eb63a9b..dbe94b67ef26a 100644
--- a/DataFormats/ForwardDetId/interface/MTDDetId.h
+++ b/DataFormats/ForwardDetId/interface/MTDDetId.h
@@ -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;
   }
 
diff --git a/Geometry/MTDGeometryBuilder/interface/MTDGeometry.h b/Geometry/MTDGeometryBuilder/interface/MTDGeometry.h
index 2796c2b432182..222eb353b67f9 100644
--- a/Geometry/MTDGeometryBuilder/interface/MTDGeometry.h
+++ b/Geometry/MTDGeometryBuilder/interface/MTDGeometry.h
@@ -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;
 
diff --git a/Geometry/MTDGeometryBuilder/src/MTDGeometry.cc b/Geometry/MTDGeometryBuilder/src/MTDGeometry.cc
index 2a522bee27219..4ad2f9107441e 100644
--- a/Geometry/MTDGeometryBuilder/src/MTDGeometry.cc
+++ b/Geometry/MTDGeometryBuilder/src/MTDGeometry.cc
@@ -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 {