From 06d30e104bc56cf687bf9722599b95a364470199 Mon Sep 17 00:00:00 2001
From: Fabio Cossutti <fabio.cossutti@ts.infn.it>
Date: Tue, 10 Dec 2024 11:20:59 +0100
Subject: [PATCH] Revert "Move BTL phi order from 0 to 2pi to -pi to +pi" This
 reverts commit 387021ecc5f8f11faaed8451acd292b5130b9209. Temporarily silence
 BTL navigation test for backward compatibility

---
 .../plugins/CmsMTDConstruction.cc                   | 10 ++++++----
 .../plugins/CmsMTDConstruction.h                    | 13 -------------
 RecoMTD/DetLayers/test/mtd_cfg.py                   |  3 ++-
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/Geometry/MTDNumberingBuilder/plugins/CmsMTDConstruction.cc b/Geometry/MTDNumberingBuilder/plugins/CmsMTDConstruction.cc
index 2d575f9fa4f6e..12c61a3f9e09a 100644
--- a/Geometry/MTDNumberingBuilder/plugins/CmsMTDConstruction.cc
+++ b/Geometry/MTDNumberingBuilder/plugins/CmsMTDConstruction.cc
@@ -9,6 +9,8 @@
 #include "DataFormats/ForwardDetId/interface/ETLDetId.h"
 #include "Geometry/MTDCommonData/interface/MTDBaseNumber.h"
 
+#include "DataFormats/Math/interface/deltaPhi.h"
+
 using angle_units::operators::convertRadToDeg;
 
 template <class FilteredView>
@@ -37,14 +39,14 @@ bool CmsMTDConstruction<FilteredView>::mtdOrderPhi(const GeometricTimingDet* a,
 
 template <class FilteredView>
 bool CmsMTDConstruction<FilteredView>::btlOrderPhi(const GeometricTimingDet* a, const GeometricTimingDet* b) {
-  return static_cast<int>(convertRadToDeg(makempiToppi(a->phi()))) <
-         static_cast<int>(convertRadToDeg(makempiToppi(b->phi())));
+  return static_cast<int>(convertRadToDeg(angle0to2pi::make0To2pi(a->phi()))) <
+         static_cast<int>(convertRadToDeg(angle0to2pi::make0To2pi(b->phi())));
 }
 
 template <class FilteredView>
 bool CmsMTDConstruction<FilteredView>::btlOrderZ(const GeometricTimingDet* a, const GeometricTimingDet* b) {
-  bool order = (static_cast<int>(convertRadToDeg(makempiToppi(a->phi()))) ==
-                static_cast<int>(convertRadToDeg(makempiToppi(b->phi())))) &&
+  bool order = (static_cast<int>(convertRadToDeg(angle0to2pi::make0To2pi(a->phi()))) ==
+                static_cast<int>(convertRadToDeg(angle0to2pi::make0To2pi(b->phi())))) &&
                (a->translation().z() < b->translation().z());
   return order;
 }
diff --git a/Geometry/MTDNumberingBuilder/plugins/CmsMTDConstruction.h b/Geometry/MTDNumberingBuilder/plugins/CmsMTDConstruction.h
index bdf80f618bce4..c1bb036a21d85 100644
--- a/Geometry/MTDNumberingBuilder/plugins/CmsMTDConstruction.h
+++ b/Geometry/MTDNumberingBuilder/plugins/CmsMTDConstruction.h
@@ -7,19 +7,6 @@
 #include "Geometry/MTDCommonData/interface/BTLNumberingScheme.h"
 #include "Geometry/MTDCommonData/interface/ETLNumberingScheme.h"
 
-#include "DataFormats/Math/interface/deltaPhi.h"
-
-namespace {
-
-  template <class valType>
-  inline constexpr valType makempiToppi(valType angle) {
-    constexpr valType twoPi = 2. * M_PI;
-    constexpr valType epsilon = 1.e-13;
-    auto tmpphi = angle0to2pi::make0To2pi(angle);
-    return (tmpphi - M_PI > epsilon) ? tmpphi - twoPi : tmpphi;
-  }
-}  // namespace
-
 /**
  * Adds GeometricTimingDets representing final modules to the previous level
  */
diff --git a/RecoMTD/DetLayers/test/mtd_cfg.py b/RecoMTD/DetLayers/test/mtd_cfg.py
index c4a36421478b0..c384f5897e7b6 100644
--- a/RecoMTD/DetLayers/test/mtd_cfg.py
+++ b/RecoMTD/DetLayers/test/mtd_cfg.py
@@ -65,4 +65,5 @@
 process.prod1 = cms.EDAnalyzer("TestBTLNavigation")
 process.prod2 = cms.EDAnalyzer("TestETLNavigation")
 
-process.p1 = cms.Path(cms.wait(process.prod)+cms.wait(process.prod1)+process.prod2)
+# process.p1 = cms.Path(cms.wait(process.prod)+cms.wait(process.prod1)+process.prod2)
+process.p1 = cms.Path(cms.wait(process.prod)+process.prod2)