Merge pull request #32029 from perrotta/removeMirroringFromTrackingTo…

…olsDetLayer Replace mirrored finders in RecoMuon from TrackingTools/DetLayer with the original ones
cms-sw · Nov 5, 2020 · d9c8059 · d9c8059
2 parents 80259a0 + de27423
commit d9c8059
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 19 deletions.
diff --git a/RecoMuon/DetLayers/src/GeneralBinFinderInPhi.h b/RecoMuon/DetLayers/src/GeneralBinFinderInPhi.h
diff --git a/RecoMuon/DetLayers/src/GeneralBinFinderInR.h b/RecoMuon/DetLayers/src/GeneralBinFinderInR.h
diff --git a/RecoMuon/DetLayers/src/MuRingForwardLayer.cc b/RecoMuon/DetLayers/src/MuRingForwardLayer.cc
@@ -3,17 +3,16 @@
  *  \author N. Amapane - CERN
  */
 
-#include <RecoMuon/DetLayers/interface/MuRingForwardLayer.h>
-#include <RecoMuon/DetLayers/interface/MuDetRing.h>
-#include <Geometry/CommonDetUnit/interface/GeomDet.h>
-#include <DataFormats/GeometrySurface/interface/SimpleDiskBounds.h>
-#include <TrackingTools/GeomPropagators/interface/Propagator.h>
-#include <TrackingTools/DetLayers/interface/MeasurementEstimator.h>
-
-#include <FWCore/MessageLogger/interface/MessageLogger.h>
-
-#include "RBorderFinder.h"
-#include "GeneralBinFinderInR.h"
+#include "RecoMuon/DetLayers/interface/MuRingForwardLayer.h"
+#include "RecoMuon/DetLayers/interface/MuDetRing.h"
+#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "DataFormats/GeometrySurface/interface/SimpleDiskBounds.h"
+#include "TrackingTools/GeomPropagators/interface/Propagator.h"
+#include "TrackingTools/DetLayers/interface/MeasurementEstimator.h"
+#include "TrackingTools/DetLayers/interface/RBorderFinder.h"
+#include "TrackingTools/DetLayers/interface/GeneralBinFinderInR.h"
+
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include <algorithm>
 #include <iostream>

diff --git a/RecoMuon/DetLayers/src/MuRodBarrelLayer.cc b/RecoMuon/DetLayers/src/MuRodBarrelLayer.cc
@@ -8,15 +8,14 @@
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "TrackingTools/GeomPropagators/interface/Propagator.h"
 #include "TrackingTools/DetLayers/interface/MeasurementEstimator.h"
+#include "TrackingTools/DetLayers/interface/GeneralBinFinderInPhi.h"
+#include "TrackingTools/DetLayers/interface/PhiBorderFinder.h"
 #include "Utilities/BinningTools/interface/PeriodicBinFinderInPhi.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include <Utilities/General/interface/precomputed_value_sort.h>
+#include "Utilities/General/interface/precomputed_value_sort.h"
 #include "DataFormats/GeometrySurface/interface/GeometricSorting.h"
 
-#include "GeneralBinFinderInPhi.h"
-#include "PhiBorderFinder.h"
-
 #include <algorithm>
 #include <iostream>
 

diff --git a/RecoMuon/DetLayers/src/PhiBorderFinder.h b/RecoMuon/DetLayers/src/PhiBorderFinder.h
diff --git a/RecoMuon/DetLayers/src/RBorderFinder.h b/RecoMuon/DetLayers/src/RBorderFinder.h