Revert "Revert "Revert "Move BTL phi order from 0 to 2pi to -pi to +pi"""

This reverts commit e27571e.

Author: fabiocos

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;
 }

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
  */

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)