diff --git a/CommonTools/RecoAlgos/interface/CosmicTrackingParticleSelector.h b/CommonTools/RecoAlgos/interface/CosmicTrackingParticleSelector.h index 373ea976f3e67..30881cdab9c09 100644 --- a/CommonTools/RecoAlgos/interface/CosmicTrackingParticleSelector.h +++ b/CommonTools/RecoAlgos/interface/CosmicTrackingParticleSelector.h @@ -23,12 +23,12 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "DataFormats/GeometrySurface/interface/Surface.h" #include "DataFormats/GeometrySurface/interface/GloballyPositioned.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/GeometryVector/interface/GlobalVector.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" diff --git a/CommonTools/Utils/test/BuildFile.xml b/CommonTools/Utils/test/BuildFile.xml index 755d4a5f639d5..de4f8e3bf3883 100644 --- a/CommonTools/Utils/test/BuildFile.xml +++ b/CommonTools/Utils/test/BuildFile.xml @@ -1,5 +1,5 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/CommonTools/Utils/test/testCutParser.cc b/CommonTools/Utils/test/testCutParser.cc index d9b1ba84737be..ede9bc65003a8 100644 --- a/CommonTools/Utils/test/testCutParser.cc +++ b/CommonTools/Utils/test/testCutParser.cc @@ -11,7 +11,7 @@ #include "DataFormats/GeometrySurface/interface/Surface.h" #include "DataFormats/GeometrySurface/interface/BoundPlane.h" -#include +#include // A fake Det class diff --git a/DataFormats/TrackerRecHit2D/BuildFile.xml b/DataFormats/TrackerRecHit2D/BuildFile.xml index d92749878b7d3..d0cc79ebe5c13 100644 --- a/DataFormats/TrackerRecHit2D/BuildFile.xml +++ b/DataFormats/TrackerRecHit2D/BuildFile.xml @@ -5,7 +5,7 @@ - + diff --git a/DataFormats/TrackerRecHit2D/interface/BaseTrackerRecHit.h b/DataFormats/TrackerRecHit2D/interface/BaseTrackerRecHit.h index 3b55cce07b2ea..8d76d9b97851f 100644 --- a/DataFormats/TrackerRecHit2D/interface/BaseTrackerRecHit.h +++ b/DataFormats/TrackerRecHit2D/interface/BaseTrackerRecHit.h @@ -4,7 +4,7 @@ #include "DataFormats/TrackerRecHit2D/interface/trackerHitRTTI.h" #include "DataFormats/TrackingRecHit/interface/TrackingRecHitGlobalState.h" #include "DataFormats/GeometryCommonDetAlgo/interface/ErrorFrameTransformer.h" -#include "Geometry/CommonDetUnit/interface/TrackerGeomDet.h" +#include "Geometry/CommonTopologies/interface/TrackerGeomDet.h" #include "DataFormats/GeometrySurface/interface/Surface.h" //#define DO_INTERNAL_CHECKS_BTR diff --git a/DataFormats/TrackerRecHit2D/interface/TrackerSingleRecHit.h b/DataFormats/TrackerRecHit2D/interface/TrackerSingleRecHit.h index 6274f2f4419a6..6df7ab1b277fc 100644 --- a/DataFormats/TrackerRecHit2D/interface/TrackerSingleRecHit.h +++ b/DataFormats/TrackerRecHit2D/interface/TrackerSingleRecHit.h @@ -3,7 +3,7 @@ #include "DataFormats/TrackerRecHit2D/interface/BaseTrackerRecHit.h" #include "DataFormats/TrackerRecHit2D/interface/OmniClusterRef.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" /* a Hit composed by a "single" measurement * it has a reference to a cluster and a local position&error diff --git a/DataFormats/TrackerRecHit2D/interface/TrackingRecHitLessFromGlobalPosition.h b/DataFormats/TrackerRecHit2D/interface/TrackingRecHitLessFromGlobalPosition.h index dbc51e971ae97..b29ef72d31526 100644 --- a/DataFormats/TrackerRecHit2D/interface/TrackingRecHitLessFromGlobalPosition.h +++ b/DataFormats/TrackerRecHit2D/interface/TrackingRecHitLessFromGlobalPosition.h @@ -2,9 +2,9 @@ #define DataFormats_TrackerRecHit2D_TrackingRecHitLessFromGlobalPosition_H #include "DataFormats/TrajectorySeed/interface/PropagationDirection.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" /** Defines order of layers in the Tracker as seen by straight tracks * coming from the interaction region. diff --git a/DataFormats/TrackerRecHit2D/interface/VectorHit.h b/DataFormats/TrackerRecHit2D/interface/VectorHit.h index e32920337683d..3d652c8da9abb 100644 --- a/DataFormats/TrackerRecHit2D/interface/VectorHit.h +++ b/DataFormats/TrackerRecHit2D/interface/VectorHit.h @@ -19,7 +19,7 @@ #include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h" #include "DataFormats/GeometryVector/interface/LocalVector.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "DataFormats/TrackingRecHit/interface/KfComponentsHolder.h" diff --git a/DataFormats/TrackerRecHit2D/src/ProjectedSiStripRecHit2D.cc b/DataFormats/TrackerRecHit2D/src/ProjectedSiStripRecHit2D.cc index 9d54b0ceb0327..c122352e5cc42 100644 --- a/DataFormats/TrackerRecHit2D/src/ProjectedSiStripRecHit2D.cc +++ b/DataFormats/TrackerRecHit2D/src/ProjectedSiStripRecHit2D.cc @@ -1,5 +1,5 @@ #include "DataFormats/TrackerRecHit2D/interface/ProjectedSiStripRecHit2D.h" -#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" +#include "Geometry/CommonTopologies/interface/GluedGeomDet.h" // #include diff --git a/DataFormats/TrackerRecHit2D/src/TrackingRecHitLessFromGlobalPosition.cc b/DataFormats/TrackerRecHit2D/src/TrackingRecHitLessFromGlobalPosition.cc index 5d7ec27612b20..1a0fdf929d508 100644 --- a/DataFormats/TrackerRecHit2D/src/TrackingRecHitLessFromGlobalPosition.cc +++ b/DataFormats/TrackerRecHit2D/src/TrackingRecHitLessFromGlobalPosition.cc @@ -7,8 +7,8 @@ #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" #include "FWCore/Utilities/interface/Exception.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" bool TrackingRecHitLessFromGlobalPosition::insideOutLess(const TrackingRecHit& a, const TrackingRecHit& b) const { DetId ida(a.geographicalId()); diff --git a/DataFormats/TrackerRecHit2D/src/VectorHit.cc b/DataFormats/TrackerRecHit2D/src/VectorHit.cc index 3f7e293b24aa7..8521890bd34fb 100644 --- a/DataFormats/TrackerRecHit2D/src/VectorHit.cc +++ b/DataFormats/TrackerRecHit2D/src/VectorHit.cc @@ -1,5 +1,5 @@ #include "DataFormats/TrackerRecHit2D/interface/VectorHit.h" -#include "Geometry/CommonDetUnit/interface/StackGeomDet.h" +#include "Geometry/CommonTopologies/interface/StackGeomDet.h" #include "CLHEP/Units/PhysicalConstants.h" VectorHit::VectorHit(const GeomDet& idet, diff --git a/DataFormats/TrackingRecHit/BuildFile.xml b/DataFormats/TrackingRecHit/BuildFile.xml index fe5398468377e..227eac4272db8 100644 --- a/DataFormats/TrackingRecHit/BuildFile.xml +++ b/DataFormats/TrackingRecHit/BuildFile.xml @@ -2,7 +2,7 @@ - + diff --git a/DataFormats/TrackingRecHit/interface/TrackingRecHit.h b/DataFormats/TrackingRecHit/interface/TrackingRecHit.h index 084a786b27110..fa9331a9321b3 100644 --- a/DataFormats/TrackingRecHit/interface/TrackingRecHit.h +++ b/DataFormats/TrackingRecHit/interface/TrackingRecHit.h @@ -7,7 +7,7 @@ #include "DataFormats/GeometryVector/interface/LocalPoint.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/GeometrySurface/interface/Surface.h" #include diff --git a/DataFormats/TrackingRecHit/src/TrackingRecHit.cc b/DataFormats/TrackingRecHit/src/TrackingRecHit.cc index 9fe3361dba49b..7e040a464b3d4 100644 --- a/DataFormats/TrackingRecHit/src/TrackingRecHit.cc +++ b/DataFormats/TrackingRecHit/src/TrackingRecHit.cc @@ -1,6 +1,6 @@ #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" #include "DataFormats/TrackingRecHit/interface/KfComponentsHolder.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "FWCore/Utilities/interface/Exception.h" #include diff --git a/EventFilter/SiPixelRawToDigi/src/PixelUnpackingRegions.cc b/EventFilter/SiPixelRawToDigi/src/PixelUnpackingRegions.cc index 500a42b5329a2..63d0861e54171 100644 --- a/EventFilter/SiPixelRawToDigi/src/PixelUnpackingRegions.cc +++ b/EventFilter/SiPixelRawToDigi/src/PixelUnpackingRegions.cc @@ -7,7 +7,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/BeamSpot/interface/BeamSpot.h" diff --git a/RecoBTag/PixelCluster/plugins/BuildFile.xml b/RecoBTag/PixelCluster/plugins/BuildFile.xml index 0cad6b365d1d2..1ce4e0bec48ac 100644 --- a/RecoBTag/PixelCluster/plugins/BuildFile.xml +++ b/RecoBTag/PixelCluster/plugins/BuildFile.xml @@ -8,6 +8,6 @@ - + diff --git a/RecoBTag/PixelCluster/plugins/PixelClusterTagInfoProducer.cc b/RecoBTag/PixelCluster/plugins/PixelClusterTagInfoProducer.cc index b05d51ecb0dde..2cd288696cab5 100644 --- a/RecoBTag/PixelCluster/plugins/PixelClusterTagInfoProducer.cc +++ b/RecoBTag/PixelCluster/plugins/PixelClusterTagInfoProducer.cc @@ -61,7 +61,7 @@ // Geometry #include "DataFormats/Math/interface/deltaR.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/RecoEgamma/EgammaIsolationAlgos/interface/EgammaHLTTrackIsolation.h b/RecoEgamma/EgammaIsolationAlgos/interface/EgammaHLTTrackIsolation.h index baa545125d73f..bddff0ca2d89d 100644 --- a/RecoEgamma/EgammaIsolationAlgos/interface/EgammaHLTTrackIsolation.h +++ b/RecoEgamma/EgammaIsolationAlgos/interface/EgammaHLTTrackIsolation.h @@ -29,7 +29,7 @@ #include "DataFormats/RecoCandidate/interface/RecoCandidate.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" diff --git a/RecoEgamma/EgammaIsolationAlgos/plugins/iso_deposit_extractors/EgammaHcalExtractor.cc b/RecoEgamma/EgammaIsolationAlgos/plugins/iso_deposit_extractors/EgammaHcalExtractor.cc index 57d0e0923c719..1a371195e12f2 100644 --- a/RecoEgamma/EgammaIsolationAlgos/plugins/iso_deposit_extractors/EgammaHcalExtractor.cc +++ b/RecoEgamma/EgammaIsolationAlgos/plugins/iso_deposit_extractors/EgammaHcalExtractor.cc @@ -24,7 +24,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/InputTag.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "PhysicsTools/IsolationAlgos/interface/IsoDepositExtractor.h" diff --git a/RecoEgamma/EgammaIsolationAlgos/src/EgammaHcalIsolation.cc b/RecoEgamma/EgammaIsolationAlgos/src/EgammaHcalIsolation.cc index e11ed027580b6..d2f45cc542772 100644 --- a/RecoEgamma/EgammaIsolationAlgos/src/EgammaHcalIsolation.cc +++ b/RecoEgamma/EgammaIsolationAlgos/src/EgammaHcalIsolation.cc @@ -14,7 +14,7 @@ #include "DataFormats/Math/interface/deltaR.h" #include "DataFormats/RecoCandidate/interface/RecoCandidate.h" #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "RecoEgamma/EgammaIsolationAlgos/interface/EgammaHcalIsolation.h" diff --git a/RecoEgamma/EgammaPhotonAlgos/interface/InOutConversionSeedFinder.h b/RecoEgamma/EgammaPhotonAlgos/interface/InOutConversionSeedFinder.h index b02074b67d47c..1cec3d4120464 100644 --- a/RecoEgamma/EgammaPhotonAlgos/interface/InOutConversionSeedFinder.h +++ b/RecoEgamma/EgammaPhotonAlgos/interface/InOutConversionSeedFinder.h @@ -22,7 +22,7 @@ #include "TrackingTools/PatternTools/interface/Trajectory.h" #include "TrackingTools/MeasurementDet/interface/LayerMeasurements.h" #include "TrackingTools/PatternTools/interface/TrajectoryMeasurement.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" #include #include diff --git a/RecoEgamma/EgammaPhotonProducers/src/ConversionProducer.cc b/RecoEgamma/EgammaPhotonProducers/src/ConversionProducer.cc index d3c00a19d73a8..585dcb28e8ef7 100644 --- a/RecoEgamma/EgammaPhotonProducers/src/ConversionProducer.cc +++ b/RecoEgamma/EgammaPhotonProducers/src/ConversionProducer.cc @@ -41,7 +41,7 @@ Description: Produces converted photon objects using default track collections #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/ESGetToken.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackMerger.cc b/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackMerger.cc index 34302392740d9..055594d9627d9 100644 --- a/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackMerger.cc +++ b/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackMerger.cc @@ -23,7 +23,7 @@ #include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" diff --git a/RecoHGCal/TICL/plugins/BuildFile.xml b/RecoHGCal/TICL/plugins/BuildFile.xml index 84de9b2bc2e7e..274822e981c0c 100644 --- a/RecoHGCal/TICL/plugins/BuildFile.xml +++ b/RecoHGCal/TICL/plugins/BuildFile.xml @@ -16,7 +16,7 @@ - + diff --git a/RecoHGCal/TICL/plugins/SeedingRegionByTracks.h b/RecoHGCal/TICL/plugins/SeedingRegionByTracks.h index 328a351d482f7..5fecdea956c4b 100644 --- a/RecoHGCal/TICL/plugins/SeedingRegionByTracks.h +++ b/RecoHGCal/TICL/plugins/SeedingRegionByTracks.h @@ -20,7 +20,7 @@ #include "MagneticField/Engine/interface/MagneticField.h" #include "Geometry/HGCalCommonData/interface/HGCalDDDConstants.h" #include "TrackingTools/Records/interface/TrackingComponentsRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "CommonTools/Utils/interface/StringCutObjectSelector.h" #include "FWCore/Utilities/interface/ESGetToken.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" diff --git a/RecoHGCal/TICL/plugins/TICLCandidateProducer.cc b/RecoHGCal/TICL/plugins/TICLCandidateProducer.cc index d8b949bc62619..6aecd5c3602b9 100644 --- a/RecoHGCal/TICL/plugins/TICLCandidateProducer.cc +++ b/RecoHGCal/TICL/plugins/TICLCandidateProducer.cc @@ -41,7 +41,7 @@ #include "TrackingTools/GeomPropagators/interface/Propagator.h" #include "TrackingTools/Records/interface/TrackingComponentsRecord.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateClosestToBeamLine.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" @@ -50,7 +50,7 @@ #include "Geometry/HGCalCommonData/interface/HGCalDDDConstants.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "RecoHGCal/TICL/interface/TracksterInferenceAlgoFactory.h" #include "TrackstersPCA.h" diff --git a/RecoHGCal/TICL/plugins/TICLDumper.cc b/RecoHGCal/TICL/plugins/TICLDumper.cc index b3fc35e9911a1..a2e04e86e6a48 100644 --- a/RecoHGCal/TICL/plugins/TICLDumper.cc +++ b/RecoHGCal/TICL/plugins/TICLDumper.cc @@ -52,7 +52,7 @@ #include "Geometry/HGCalCommonData/interface/HGCalDDDConstants.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" diff --git a/RecoHGCal/TICL/plugins/TracksterLinkingbySkeletons.h b/RecoHGCal/TICL/plugins/TracksterLinkingbySkeletons.h index 4be77085b2f15..faae687452aa3 100644 --- a/RecoHGCal/TICL/plugins/TracksterLinkingbySkeletons.h +++ b/RecoHGCal/TICL/plugins/TracksterLinkingbySkeletons.h @@ -12,7 +12,7 @@ #include "RecoHGCal/TICL/interface/TracksterLinkingAlgoBase.h" #include "Geometry/HGCalCommonData/interface/HGCalDDDConstants.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "DataFormats/GeometrySurface/interface/BoundDisk.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/RecoHGCal/TICL/plugins/TracksterLinksProducer.cc b/RecoHGCal/TICL/plugins/TracksterLinksProducer.cc index eb77048e5e18f..a3c8ea7f7ad58 100644 --- a/RecoHGCal/TICL/plugins/TracksterLinksProducer.cc +++ b/RecoHGCal/TICL/plugins/TracksterLinksProducer.cc @@ -37,7 +37,7 @@ #include "Geometry/HGCalCommonData/interface/HGCalDDDConstants.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "RecoLocalCalo/HGCalRecAlgos/interface/RecHitTools.h" #include "RecoHGCal/TICL/interface/TracksterInferenceAlgoFactory.h" diff --git a/RecoHI/HiCentralityAlgos/plugins/CentralityProducer.cc b/RecoHI/HiCentralityAlgos/plugins/CentralityProducer.cc index bbb445c1cfece..2d6b0e4e56dbe 100644 --- a/RecoHI/HiCentralityAlgos/plugins/CentralityProducer.cc +++ b/RecoHI/HiCentralityAlgos/plugins/CentralityProducer.cc @@ -39,7 +39,7 @@ #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" using namespace std; using namespace edm; diff --git a/RecoHI/HiCentralityAlgos/plugins/ClusterCompatibilityProducer.cc b/RecoHI/HiCentralityAlgos/plugins/ClusterCompatibilityProducer.cc index cd28c0458caa6..caa546ef62864 100644 --- a/RecoHI/HiCentralityAlgos/plugins/ClusterCompatibilityProducer.cc +++ b/RecoHI/HiCentralityAlgos/plugins/ClusterCompatibilityProducer.cc @@ -25,10 +25,10 @@ #include "DataFormats/HeavyIonEvent/interface/ClusterCompatibility.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" // // class declaration diff --git a/RecoHI/HiTracking/plugins/BuildFile.xml b/RecoHI/HiTracking/plugins/BuildFile.xml index 3185e4b6e7b55..ea5d3ba206673 100644 --- a/RecoHI/HiTracking/plugins/BuildFile.xml +++ b/RecoHI/HiTracking/plugins/BuildFile.xml @@ -15,7 +15,7 @@ - + diff --git a/RecoHI/HiTracking/plugins/HIPixelClusterVtxProducer.cc b/RecoHI/HiTracking/plugins/HIPixelClusterVtxProducer.cc index f79286f804533..50ba6f452e910 100644 --- a/RecoHI/HiTracking/plugins/HIPixelClusterVtxProducer.cc +++ b/RecoHI/HiTracking/plugins/HIPixelClusterVtxProducer.cc @@ -7,9 +7,9 @@ #include "DataFormats/VertexReco/interface/Vertex.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" diff --git a/RecoHI/HiTracking/test/BuildFile.xml b/RecoHI/HiTracking/test/BuildFile.xml index 5b876faf97b80..042e6087d85c7 100644 --- a/RecoHI/HiTracking/test/BuildFile.xml +++ b/RecoHI/HiTracking/test/BuildFile.xml @@ -2,7 +2,7 @@ - + diff --git a/RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc b/RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc index 5528667b66c75..7f574282e474e 100644 --- a/RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc +++ b/RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc @@ -8,9 +8,9 @@ #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" diff --git a/RecoJets/JetProducers/BuildFile.xml b/RecoJets/JetProducers/BuildFile.xml index 6b6bbf6f75077..473b1ede689bd 100644 --- a/RecoJets/JetProducers/BuildFile.xml +++ b/RecoJets/JetProducers/BuildFile.xml @@ -5,7 +5,7 @@ - + diff --git a/RecoJets/JetProducers/interface/JetMuonHitsIDHelper.h b/RecoJets/JetProducers/interface/JetMuonHitsIDHelper.h index 421a039453fe5..419f9b14e7bad 100644 --- a/RecoJets/JetProducers/interface/JetMuonHitsIDHelper.h +++ b/RecoJets/JetProducers/interface/JetMuonHitsIDHelper.h @@ -11,7 +11,7 @@ #include "DataFormats/JetReco/interface/Jet.h" #include "DataFormats/RPCRecHit/interface/RPCRecHitCollection.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" namespace reco { diff --git a/RecoLocalFastTime/FTLClusterizer/interface/BTLRecHitsErrorEstimatorIM.h b/RecoLocalFastTime/FTLClusterizer/interface/BTLRecHitsErrorEstimatorIM.h index b4f4051d31315..54c11c679e5e3 100644 --- a/RecoLocalFastTime/FTLClusterizer/interface/BTLRecHitsErrorEstimatorIM.h +++ b/RecoLocalFastTime/FTLClusterizer/interface/BTLRecHitsErrorEstimatorIM.h @@ -10,7 +10,7 @@ #include "Geometry/MTDGeometryBuilder/interface/RectangularMTDTopology.h" #include "Geometry/MTDGeometryBuilder/interface/ProxyMTDTopology.h" -#include "Geometry/CommonDetUnit/interface/GeomDetEnumerators.h" +#include "Geometry/CommonTopologies/interface/GeomDetEnumerators.h" #include "Geometry/MTDGeometryBuilder/interface/MTDGeometry.h" diff --git a/RecoLocalFastTime/FTLClusterizer/interface/MTDArrayBuffer.h b/RecoLocalFastTime/FTLClusterizer/interface/MTDArrayBuffer.h index 0a67b7cdffcf7..ceb3d05da5be3 100644 --- a/RecoLocalFastTime/FTLClusterizer/interface/MTDArrayBuffer.h +++ b/RecoLocalFastTime/FTLClusterizer/interface/MTDArrayBuffer.h @@ -12,7 +12,7 @@ #include "DataFormats/GeometrySurface/interface/LocalError.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" -#include "Geometry/CommonDetUnit/interface/GeomDetEnumerators.h" +#include "Geometry/CommonTopologies/interface/GeomDetEnumerators.h" #include #include diff --git a/RecoLocalFastTime/FTLClusterizer/interface/MTDCPEBase.h b/RecoLocalFastTime/FTLClusterizer/interface/MTDCPEBase.h index 44f38ecb84ace..fea3597b74d1d 100644 --- a/RecoLocalFastTime/FTLClusterizer/interface/MTDCPEBase.h +++ b/RecoLocalFastTime/FTLClusterizer/interface/MTDCPEBase.h @@ -16,7 +16,7 @@ #include "Geometry/MTDGeometryBuilder/interface/MTDGeomDetUnit.h" #include "Geometry/MTDGeometryBuilder/interface/ProxyMTDTopology.h" #include "Geometry/MTDGeometryBuilder/interface/RectangularMTDTopology.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" diff --git a/RecoLocalFastTime/FTLClusterizer/interface/MTDClusterParameterEstimator.h b/RecoLocalFastTime/FTLClusterizer/interface/MTDClusterParameterEstimator.h index 932a36a4c5c8c..37c1f6035ebd4 100644 --- a/RecoLocalFastTime/FTLClusterizer/interface/MTDClusterParameterEstimator.h +++ b/RecoLocalFastTime/FTLClusterizer/interface/MTDClusterParameterEstimator.h @@ -4,7 +4,7 @@ #include "DataFormats/GeometrySurface/interface/LocalError.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/TrajectoryState/interface/LocalTrajectoryParameters.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" diff --git a/RecoLocalFastTime/FTLCommonAlgos/src/MTDTimeCalib.cc b/RecoLocalFastTime/FTLCommonAlgos/src/MTDTimeCalib.cc index fd34289a9714e..46a8c05762e72 100644 --- a/RecoLocalFastTime/FTLCommonAlgos/src/MTDTimeCalib.cc +++ b/RecoLocalFastTime/FTLCommonAlgos/src/MTDTimeCalib.cc @@ -3,7 +3,7 @@ #include "DataFormats/ForwardDetId/interface/BTLDetId.h" #include "DataFormats/ForwardDetId/interface/ETLDetId.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" #include "Geometry/MTDGeometryBuilder/interface/ProxyMTDTopology.h" #include "Geometry/MTDGeometryBuilder/interface/RectangularMTDTopology.h" #include "Geometry/MTDCommonData/interface/MTDTopologyMode.h" diff --git a/RecoLocalMuon/CSCEfficiency/src/CSCEfficiency.h b/RecoLocalMuon/CSCEfficiency/src/CSCEfficiency.h index f064f5269c367..7a8ace043a04f 100644 --- a/RecoLocalMuon/CSCEfficiency/src/CSCEfficiency.h +++ b/RecoLocalMuon/CSCEfficiency/src/CSCEfficiency.h @@ -40,7 +40,7 @@ #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/MuonDetId/interface/CSCDetIdFwd.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "TrackingTools/PatternTools/interface/TrajectoryMeasurement.h" diff --git a/RecoLocalMuon/CSCValidation/src/CSCValidation.h b/RecoLocalMuon/CSCValidation/src/CSCValidation.h index c9c66e83d680b..578f8f6502be5 100644 --- a/RecoLocalMuon/CSCValidation/src/CSCValidation.h +++ b/RecoLocalMuon/CSCValidation/src/CSCValidation.h @@ -69,7 +69,7 @@ #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackReco/interface/TrackFwd.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "DataFormats/CSCRecHit/interface/CSCRecHit2DCollection.h" diff --git a/RecoLocalMuon/DTSegment/test/DTAnalyzerDetailed.cc b/RecoLocalMuon/DTSegment/test/DTAnalyzerDetailed.cc index 1fa49995680f7..3c20526245cf4 100644 --- a/RecoLocalMuon/DTSegment/test/DTAnalyzerDetailed.cc +++ b/RecoLocalMuon/DTSegment/test/DTAnalyzerDetailed.cc @@ -38,7 +38,7 @@ using namespace edm; #include "RecoLocalMuon/DTSegment/test/DTSegmentResidual.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "TrackingTools/TransientTrack/interface/TransientTrack.h" diff --git a/RecoLocalMuon/DTSegment/test/DTSegAnalyzer.cc b/RecoLocalMuon/DTSegment/test/DTSegAnalyzer.cc index cc97d920ad111..c072dec2b75e0 100644 --- a/RecoLocalMuon/DTSegment/test/DTSegAnalyzer.cc +++ b/RecoLocalMuon/DTSegment/test/DTSegAnalyzer.cc @@ -38,7 +38,7 @@ using namespace edm; #include "RecoLocalMuon/DTSegment/test/DTSegmentResidual.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "TrackingTools/TransientTrack/interface/TransientTrack.h" diff --git a/RecoLocalMuon/GEMCSCSegment/test/BuildFile.xml b/RecoLocalMuon/GEMCSCSegment/test/BuildFile.xml index 53a6bb4dbbb61..a6378daa9cfb1 100644 --- a/RecoLocalMuon/GEMCSCSegment/test/BuildFile.xml +++ b/RecoLocalMuon/GEMCSCSegment/test/BuildFile.xml @@ -4,7 +4,7 @@ - + diff --git a/RecoLocalMuon/GEMCSCSegment/test/TestGEMCSCSegmentAnalyzer.cc b/RecoLocalMuon/GEMCSCSegment/test/TestGEMCSCSegmentAnalyzer.cc index 47e2ef9790f7b..739143c553fbf 100644 --- a/RecoLocalMuon/GEMCSCSegment/test/TestGEMCSCSegmentAnalyzer.cc +++ b/RecoLocalMuon/GEMCSCSegment/test/TestGEMCSCSegmentAnalyzer.cc @@ -55,7 +55,7 @@ #include "SimDataFormats/Track/interface/SimTrackContainer.h" #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h" // // class declaration diff --git a/RecoLocalMuon/GEMRecHit/test/BuildFile.xml b/RecoLocalMuon/GEMRecHit/test/BuildFile.xml index a714a7423c0ce..c639716279a07 100644 --- a/RecoLocalMuon/GEMRecHit/test/BuildFile.xml +++ b/RecoLocalMuon/GEMRecHit/test/BuildFile.xml @@ -3,7 +3,7 @@ - + diff --git a/RecoLocalMuon/GEMRecHit/test/TestGEMRecHitAnalyzer.cc b/RecoLocalMuon/GEMRecHit/test/TestGEMRecHitAnalyzer.cc index 672ba8b24073a..ef3f97299d1ff 100644 --- a/RecoLocalMuon/GEMRecHit/test/TestGEMRecHitAnalyzer.cc +++ b/RecoLocalMuon/GEMRecHit/test/TestGEMRecHitAnalyzer.cc @@ -57,7 +57,7 @@ #include #include -#include +#include #include "DataFormats/Provenance/interface/Timestamp.h" #include @@ -69,7 +69,7 @@ #include #include #include -#include +#include #include #include diff --git a/RecoLocalMuon/RPCRecHit/plugins/CSCObjectMap.cc b/RecoLocalMuon/RPCRecHit/plugins/CSCObjectMap.cc index 2434162613364..1ab7baa27ff4d 100644 --- a/RecoLocalMuon/RPCRecHit/plugins/CSCObjectMap.cc +++ b/RecoLocalMuon/RPCRecHit/plugins/CSCObjectMap.cc @@ -1,6 +1,6 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" #include "Geometry/RPCGeometry/interface/RPCGeometry.h" #include "Geometry/RPCGeometry/interface/RPCGeomServ.h" #include "Geometry/RPCGeometry/interface/RPCChamber.h" diff --git a/RecoLocalMuon/RPCRecHit/plugins/CSCSegtoRPC.cc b/RecoLocalMuon/RPCRecHit/plugins/CSCSegtoRPC.cc index 6b6bf84b2ac8b..beb59afc84785 100644 --- a/RecoLocalMuon/RPCRecHit/plugins/CSCSegtoRPC.cc +++ b/RecoLocalMuon/RPCRecHit/plugins/CSCSegtoRPC.cc @@ -1,7 +1,7 @@ #include "Geometry/RPCGeometry/interface/RPCGeometry.h" #include "Geometry/CSCGeometry/interface/CSCGeometry.h" #include "DataFormats/CSCRecHit/interface/CSCSegmentCollection.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/Records/interface/MuonGeometryRecord.h" #include "Geometry/CommonTopologies/interface/TrapezoidalStripTopology.h" #include "FWCore/Framework/interface/ESHandle.h" diff --git a/RecoLocalMuon/RPCRecHit/plugins/DTObjectMap.cc b/RecoLocalMuon/RPCRecHit/plugins/DTObjectMap.cc index f77f6aa04c71c..99e5699e968d3 100644 --- a/RecoLocalMuon/RPCRecHit/plugins/DTObjectMap.cc +++ b/RecoLocalMuon/RPCRecHit/plugins/DTObjectMap.cc @@ -1,7 +1,7 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" #include "Geometry/Records/interface/MuonGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" #include "Geometry/RPCGeometry/interface/RPCGeometry.h" #include "Geometry/RPCGeometry/interface/RPCGeomServ.h" #include "Geometry/RPCGeometry/interface/RPCChamber.h" diff --git a/RecoLocalMuon/RPCRecHit/plugins/DTSegtoRPC.cc b/RecoLocalMuon/RPCRecHit/plugins/DTSegtoRPC.cc index aa14febec4449..dc5da52a69709 100644 --- a/RecoLocalMuon/RPCRecHit/plugins/DTSegtoRPC.cc +++ b/RecoLocalMuon/RPCRecHit/plugins/DTSegtoRPC.cc @@ -1,7 +1,7 @@ #include "Geometry/RPCGeometry/interface/RPCGeometry.h" #include "Geometry/DTGeometry/interface/DTGeometry.h" #include "DataFormats/DTRecHit/interface/DTRecSegment4DCollection.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/Records/interface/MuonGeometryRecord.h" #include "Geometry/CommonTopologies/interface/RectangularStripTopology.h" #include "FWCore/Framework/interface/ESHandle.h" diff --git a/RecoLocalMuon/RPCRecHit/plugins/TracktoRPC.cc b/RecoLocalMuon/RPCRecHit/plugins/TracktoRPC.cc index e47f6e8079547..82aeed1d6e4da 100644 --- a/RecoLocalMuon/RPCRecHit/plugins/TracktoRPC.cc +++ b/RecoLocalMuon/RPCRecHit/plugins/TracktoRPC.cc @@ -1,7 +1,7 @@ #include "Geometry/RPCGeometry/interface/RPCGeometry.h" #include "Geometry/DTGeometry/interface/DTGeometry.h" #include "DataFormats/DTRecHit/interface/DTRecSegment4DCollection.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/Records/interface/MuonGeometryRecord.h" #include "Geometry/CommonTopologies/interface/RectangularStripTopology.h" #include "Geometry/RPCGeometry/interface/RPCGeomServ.h" diff --git a/RecoLocalMuon/RPCRecHit/plugins/TracktoRPC.h b/RecoLocalMuon/RPCRecHit/plugins/TracktoRPC.h index 594b3a655e7b4..1b8790456e1dd 100644 --- a/RecoLocalMuon/RPCRecHit/plugins/TracktoRPC.h +++ b/RecoLocalMuon/RPCRecHit/plugins/TracktoRPC.h @@ -35,7 +35,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/RPCGeometry/interface/RPCGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" #include "Geometry/RPCGeometry/interface/RPCRoll.h" #include "Geometry/RPCGeometry/interface/RPCGeomServ.h" #include "Geometry/DTGeometry/interface/DTLayer.h" diff --git a/RecoLocalMuon/RPCRecHit/test/RPCRecHitReader.cc b/RecoLocalMuon/RPCRecHit/test/RPCRecHitReader.cc index b374cbf31b7ec..9513ee4d5005b 100644 --- a/RecoLocalMuon/RPCRecHit/test/RPCRecHitReader.cc +++ b/RecoLocalMuon/RPCRecHit/test/RPCRecHitReader.cc @@ -19,7 +19,7 @@ #include #include -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "DataFormats/RPCRecHit/interface/RPCRecHit.h" #include "DataFormats/RPCRecHit/interface/RPCRecHitCollection.h" diff --git a/RecoLocalTracker/ClusterParameterEstimator/interface/ClusterParameterEstimator.h b/RecoLocalTracker/ClusterParameterEstimator/interface/ClusterParameterEstimator.h index f34e87c938136..0281fc910a8dd 100644 --- a/RecoLocalTracker/ClusterParameterEstimator/interface/ClusterParameterEstimator.h +++ b/RecoLocalTracker/ClusterParameterEstimator/interface/ClusterParameterEstimator.h @@ -4,7 +4,7 @@ #include "DataFormats/GeometrySurface/interface/LocalError.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/TrajectoryState/interface/LocalTrajectoryParameters.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" diff --git a/RecoLocalTracker/ClusterParameterEstimator/interface/FakeCPE.h b/RecoLocalTracker/ClusterParameterEstimator/interface/FakeCPE.h index 32418e77ca92d..0f4783f50d11a 100644 --- a/RecoLocalTracker/ClusterParameterEstimator/interface/FakeCPE.h +++ b/RecoLocalTracker/ClusterParameterEstimator/interface/FakeCPE.h @@ -4,7 +4,7 @@ #include "DataFormats/GeometrySurface/interface/LocalError.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h" #include "DataFormats/SiStripCluster/interface/SiStripCluster.h" diff --git a/RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h b/RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h index 4490bea153380..040be049865cf 100644 --- a/RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h +++ b/RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h @@ -4,7 +4,7 @@ #include "DataFormats/GeometrySurface/interface/LocalError.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/TrajectoryState/interface/LocalTrajectoryParameters.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" diff --git a/RecoLocalTracker/ClusterParameterEstimator/interface/PixelFakeCPE.h b/RecoLocalTracker/ClusterParameterEstimator/interface/PixelFakeCPE.h index 8ffa26c5f2a0c..ead6958340ed3 100644 --- a/RecoLocalTracker/ClusterParameterEstimator/interface/PixelFakeCPE.h +++ b/RecoLocalTracker/ClusterParameterEstimator/interface/PixelFakeCPE.h @@ -4,7 +4,7 @@ #include "DataFormats/GeometrySurface/interface/LocalError.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/TrajectoryState/interface/LocalTrajectoryParameters.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" diff --git a/RecoLocalTracker/ClusterParameterEstimator/interface/StripClusterParameterEstimator.h b/RecoLocalTracker/ClusterParameterEstimator/interface/StripClusterParameterEstimator.h index b9e15c77327c3..68ac7c0259825 100644 --- a/RecoLocalTracker/ClusterParameterEstimator/interface/StripClusterParameterEstimator.h +++ b/RecoLocalTracker/ClusterParameterEstimator/interface/StripClusterParameterEstimator.h @@ -4,7 +4,7 @@ #include "DataFormats/GeometrySurface/interface/LocalError.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/TrajectoryState/interface/LocalTrajectoryParameters.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" diff --git a/RecoLocalTracker/ClusterParameterEstimator/interface/StripFakeCPE.h b/RecoLocalTracker/ClusterParameterEstimator/interface/StripFakeCPE.h index 7271f0b9bb939..b2969090ed87f 100644 --- a/RecoLocalTracker/ClusterParameterEstimator/interface/StripFakeCPE.h +++ b/RecoLocalTracker/ClusterParameterEstimator/interface/StripFakeCPE.h @@ -4,7 +4,7 @@ #include "DataFormats/GeometrySurface/interface/LocalError.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/TrajectoryState/interface/LocalTrajectoryParameters.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" diff --git a/RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPE.h b/RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPE.h index ededc193b3eae..d5e0117b7bf43 100644 --- a/RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPE.h +++ b/RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPE.h @@ -6,8 +6,8 @@ #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "RecoLocalTracker/ClusterParameterEstimator/interface/ClusterParameterEstimator.h" diff --git a/RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPEGeometric.h b/RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPEGeometric.h index 8f46fd00ea56f..b92a8e40e6cbf 100644 --- a/RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPEGeometric.h +++ b/RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPEGeometric.h @@ -2,7 +2,7 @@ #define RecoLocalTracker_Phase2TrackerRecHits_Phase2StripCPEGeometric_H #include "RecoLocalTracker/ClusterParameterEstimator/interface/ClusterParameterEstimator.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" diff --git a/RecoLocalTracker/Phase2TrackerRecHits/plugins/Phase2TrackerRecHits.cc b/RecoLocalTracker/Phase2TrackerRecHits/plugins/Phase2TrackerRecHits.cc index 343693fbffb2a..3acc8c060f373 100644 --- a/RecoLocalTracker/Phase2TrackerRecHits/plugins/Phase2TrackerRecHits.cc +++ b/RecoLocalTracker/Phase2TrackerRecHits/plugins/Phase2TrackerRecHits.cc @@ -11,10 +11,10 @@ #include "FWCore/PluginManager/interface/ModuleDef.h" #include "FWCore/Utilities/interface/InputTag.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h" diff --git a/RecoLocalTracker/Phase2TrackerRecHits/src/Phase2StripCPEGeometric.cc b/RecoLocalTracker/Phase2TrackerRecHits/src/Phase2StripCPEGeometric.cc index 702044ed67b8f..2a5aad528d251 100644 --- a/RecoLocalTracker/Phase2TrackerRecHits/src/Phase2StripCPEGeometric.cc +++ b/RecoLocalTracker/Phase2TrackerRecHits/src/Phase2StripCPEGeometric.cc @@ -1,6 +1,6 @@ #include "RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPEGeometric.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" // currently (?) use Pixel classes for GeomDetUnit and Topology diff --git a/RecoLocalTracker/Phase2TrackerRecHits/test/BuildFile.xml b/RecoLocalTracker/Phase2TrackerRecHits/test/BuildFile.xml index fc709ff0052fd..a6745d577a42e 100644 --- a/RecoLocalTracker/Phase2TrackerRecHits/test/BuildFile.xml +++ b/RecoLocalTracker/Phase2TrackerRecHits/test/BuildFile.xml @@ -5,7 +5,7 @@ - + diff --git a/RecoLocalTracker/Phase2TrackerRecHits/test/RecHitsValidation.cc b/RecoLocalTracker/Phase2TrackerRecHits/test/RecHitsValidation.cc index a50fd1400cecb..df7e91e3f2831 100644 --- a/RecoLocalTracker/Phase2TrackerRecHits/test/RecHitsValidation.cc +++ b/RecoLocalTracker/Phase2TrackerRecHits/test/RecHitsValidation.cc @@ -26,8 +26,8 @@ #include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/Utilities/interface/InputTag.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "SimDataFormats/Track/interface/SimTrackContainer.h" diff --git a/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizer.cc b/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizer.cc index 2e4bc361007e8..4c474159c5b30 100644 --- a/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizer.cc +++ b/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizer.cc @@ -15,10 +15,10 @@ #endif #include "Phase2TrackerClusterizerSequentialAlgorithm.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/Phase2TrackerDigi/interface/Phase2TrackerDigi.h" diff --git a/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizerAlgorithm.h b/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizerAlgorithm.h index 76b645b0281a4..fa413b420a790 100644 --- a/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizerAlgorithm.h +++ b/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizerAlgorithm.h @@ -6,7 +6,7 @@ #include "DataFormats/Phase2TrackerDigi/interface/Phase2TrackerDigi.h" #include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Phase2TrackerClusterizerArray.h" diff --git a/RecoLocalTracker/SiPhase2Clusterizer/test/BuildFile.xml b/RecoLocalTracker/SiPhase2Clusterizer/test/BuildFile.xml index b4b0f3641fa24..c7af4161b338c 100644 --- a/RecoLocalTracker/SiPhase2Clusterizer/test/BuildFile.xml +++ b/RecoLocalTracker/SiPhase2Clusterizer/test/BuildFile.xml @@ -7,7 +7,7 @@ - + diff --git a/RecoLocalTracker/SiPhase2Clusterizer/test/ClustersValidation.cc b/RecoLocalTracker/SiPhase2Clusterizer/test/ClustersValidation.cc index 6920dff392ade..cbf01c4980d2a 100644 --- a/RecoLocalTracker/SiPhase2Clusterizer/test/ClustersValidation.cc +++ b/RecoLocalTracker/SiPhase2Clusterizer/test/ClustersValidation.cc @@ -25,8 +25,8 @@ #include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/Utilities/interface/InputTag.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "SimDataFormats/Track/interface/SimTrackContainer.h" diff --git a/RecoLocalTracker/SiPhase2VectorHitBuilder/BuildFile.xml b/RecoLocalTracker/SiPhase2VectorHitBuilder/BuildFile.xml index 7e4ca2bae395b..fe18844f93e66 100644 --- a/RecoLocalTracker/SiPhase2VectorHitBuilder/BuildFile.xml +++ b/RecoLocalTracker/SiPhase2VectorHitBuilder/BuildFile.xml @@ -4,7 +4,7 @@ - + diff --git a/RecoLocalTracker/SiPhase2VectorHitBuilder/interface/VectorHitBuilderAlgorithmBase.h b/RecoLocalTracker/SiPhase2VectorHitBuilder/interface/VectorHitBuilderAlgorithmBase.h index 61d80a95cff87..962de8b4f07fc 100644 --- a/RecoLocalTracker/SiPhase2VectorHitBuilder/interface/VectorHitBuilderAlgorithmBase.h +++ b/RecoLocalTracker/SiPhase2VectorHitBuilder/interface/VectorHitBuilderAlgorithmBase.h @@ -9,10 +9,10 @@ #include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/StackGeomDet.h" +#include "Geometry/CommonTopologies/interface/StackGeomDet.h" #include "RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPE.h" #include "DataFormats/TrackerRecHit2D/interface/VectorHit.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "FWCore/Framework/interface/FrameworkfwdMostUsed.h" class VectorHitBuilderAlgorithmBase { diff --git a/RecoLocalTracker/SiPhase2VectorHitBuilder/src/VectorHitBuilderAlgorithm.cc b/RecoLocalTracker/SiPhase2VectorHitBuilder/src/VectorHitBuilderAlgorithm.cc index a32d1a6b0d004..0f05ba0283ef5 100644 --- a/RecoLocalTracker/SiPhase2VectorHitBuilder/src/VectorHitBuilderAlgorithm.cc +++ b/RecoLocalTracker/SiPhase2VectorHitBuilder/src/VectorHitBuilderAlgorithm.cc @@ -1,6 +1,6 @@ #include "RecoLocalTracker/SiPhase2VectorHitBuilder/interface/VectorHitBuilderAlgorithm.h" #include "RecoLocalTracker/ClusterParameterEstimator/interface/ClusterParameterEstimator.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "DataFormats/TrackerRecHit2D/interface/VectorHit2D.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/RecoLocalTracker/SiPhase2VectorHitBuilder/src/VectorHitBuilderAlgorithmBase.cc b/RecoLocalTracker/SiPhase2VectorHitBuilder/src/VectorHitBuilderAlgorithmBase.cc index 8f8785507c303..a0750f79cc6f1 100644 --- a/RecoLocalTracker/SiPhase2VectorHitBuilder/src/VectorHitBuilderAlgorithmBase.cc +++ b/RecoLocalTracker/SiPhase2VectorHitBuilder/src/VectorHitBuilderAlgorithmBase.cc @@ -4,8 +4,8 @@ #include "RecoLocalTracker/Records/interface/TkPhase2OTCPERecord.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/RecoLocalTracker/SiPhase2VectorHitBuilder/test/BuildFile.xml b/RecoLocalTracker/SiPhase2VectorHitBuilder/test/BuildFile.xml index 35335af02542d..78e6dda3a8009 100644 --- a/RecoLocalTracker/SiPhase2VectorHitBuilder/test/BuildFile.xml +++ b/RecoLocalTracker/SiPhase2VectorHitBuilder/test/BuildFile.xml @@ -11,7 +11,7 @@ - + diff --git a/RecoLocalTracker/SiPhase2VectorHitBuilder/test/ClustersValidationTGraph.cc b/RecoLocalTracker/SiPhase2VectorHitBuilder/test/ClustersValidationTGraph.cc index 3abfe5253e7f4..3ff55285f1773 100644 --- a/RecoLocalTracker/SiPhase2VectorHitBuilder/test/ClustersValidationTGraph.cc +++ b/RecoLocalTracker/SiPhase2VectorHitBuilder/test/ClustersValidationTGraph.cc @@ -26,8 +26,8 @@ #include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/Utilities/interface/InputTag.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "SimDataFormats/Track/interface/SimTrackContainer.h" diff --git a/RecoLocalTracker/SiPhase2VectorHitBuilder/test/VectorHitsBuilderValidation.cc b/RecoLocalTracker/SiPhase2VectorHitBuilder/test/VectorHitsBuilderValidation.cc index 049a84bbd6c97..cf18c51766c0d 100644 --- a/RecoLocalTracker/SiPhase2VectorHitBuilder/test/VectorHitsBuilderValidation.cc +++ b/RecoLocalTracker/SiPhase2VectorHitBuilder/test/VectorHitsBuilderValidation.cc @@ -17,8 +17,8 @@ #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/Common/interface/DetSetVectorNew.h" @@ -40,7 +40,7 @@ #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h" #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticleFwd.h" #include "SimTracker/TrackerHitAssociation/interface/ClusterTPAssociation.h" -#include "Geometry/CommonDetUnit/interface/StackGeomDet.h" +#include "Geometry/CommonTopologies/interface/StackGeomDet.h" #include "DataFormats/Phase2TrackerDigi/interface/Phase2TrackerDigi.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "RecoLocalTracker/Records/interface/TkPhase2OTCPERecord.h" diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/PixelThresholdClusterizer.cc b/RecoLocalTracker/SiPixelClusterizer/plugins/PixelThresholdClusterizer.cc index f1f41d605cfc2..636fa09225485 100644 --- a/RecoLocalTracker/SiPixelClusterizer/plugins/PixelThresholdClusterizer.cc +++ b/RecoLocalTracker/SiPixelClusterizer/plugins/PixelThresholdClusterizer.cc @@ -24,7 +24,7 @@ #include "SiPixelArrayBuffer.h" #include "CondFormats/SiPixelObjects/interface/SiPixelGainCalibrationOffline.h" // Geometry -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" //#include "Geometry/CommonTopologies/RectangularPixelTopology.h" diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.cc b/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.cc index 9034f003d712b..763c609f3022e 100644 --- a/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.cc +++ b/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.cc @@ -16,7 +16,7 @@ #include "PixelThresholdClusterizer.h" // Geometry -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" // Data Formats #include "DataFormats/Common/interface/DetSetVector.h" diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.h b/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.h index 6e8cb0c21496c..ecbf084ffc639 100644 --- a/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.h +++ b/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.h @@ -30,7 +30,7 @@ #include "PixelClusterizerBase.h" -//#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +//#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/RecoLocalTracker/SiPixelClusterizer/test/ReadPixClusters.cc b/RecoLocalTracker/SiPixelClusterizer/test/ReadPixClusters.cc index aef80ef63eaa1..e73632b4e5cb7 100644 --- a/RecoLocalTracker/SiPixelClusterizer/test/ReadPixClusters.cc +++ b/RecoLocalTracker/SiPixelClusterizer/test/ReadPixClusters.cc @@ -31,12 +31,12 @@ #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/TrackerCommon/interface/PixelBarrelName.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" // For L1 diff --git a/RecoLocalTracker/SiPixelClusterizer/test/TestClusters.cc b/RecoLocalTracker/SiPixelClusterizer/test/TestClusters.cc index 1633135f2639b..bc586a77ecc7d 100644 --- a/RecoLocalTracker/SiPixelClusterizer/test/TestClusters.cc +++ b/RecoLocalTracker/SiPixelClusterizer/test/TestClusters.cc @@ -33,12 +33,12 @@ #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/TrackerCommon/interface/PixelBarrelName.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" //#include "Geometry/TrackerTopology/interface/RectangularPixelTopology.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" diff --git a/RecoLocalTracker/SiPixelClusterizer/test/TestWithTracks.cc b/RecoLocalTracker/SiPixelClusterizer/test/TestWithTracks.cc index b6e3bd4fbf48e..301e4cd36d702 100644 --- a/RecoLocalTracker/SiPixelClusterizer/test/TestWithTracks.cc +++ b/RecoLocalTracker/SiPixelClusterizer/test/TestWithTracks.cc @@ -36,12 +36,12 @@ #include "DataFormats/TrackerCommon/interface/PixelBarrelName.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" //#include "Geometry/CommonTopologies/interface/PixelTopology.h" // For L1 diff --git a/RecoLocalTracker/SiPixelClusterizer/test/Triplet.cc b/RecoLocalTracker/SiPixelClusterizer/test/Triplet.cc index ebe5be5b3ffef..82528dab4577e 100644 --- a/RecoLocalTracker/SiPixelClusterizer/test/Triplet.cc +++ b/RecoLocalTracker/SiPixelClusterizer/test/Triplet.cc @@ -57,7 +57,7 @@ //#include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "FWCore/Framework/interface/ESHandle.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h b/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h index 958a278382b72..2608c2559a2c0 100644 --- a/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h +++ b/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h @@ -31,8 +31,8 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/CommonTopologies/interface/Topology.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" diff --git a/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEClusterRepair.h b/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEClusterRepair.h index 5843e75cfc78d..ac181fc5cc438 100644 --- a/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEClusterRepair.h +++ b/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEClusterRepair.h @@ -4,8 +4,8 @@ #include "RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h" // Already in the base class -//#include "Geometry/CommonDetUnit/interface/GeomDetType.h" -//#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +//#include "Geometry/CommonTopologies/interface/GeomDetType.h" +//#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" //#include "Geometry/CommonDetAlgo/interface/MeasurementPoint.h" //#include "Geometry/CommonDetAlgo/interface/MeasurementError.h" //#include "Geometry/Surface/interface/GloballyPositioned.h" diff --git a/RecoLocalTracker/SiPixelRecHits/interface/PixelCPETemplateReco.h b/RecoLocalTracker/SiPixelRecHits/interface/PixelCPETemplateReco.h index b4f034f9925a2..0585ce2d73b22 100644 --- a/RecoLocalTracker/SiPixelRecHits/interface/PixelCPETemplateReco.h +++ b/RecoLocalTracker/SiPixelRecHits/interface/PixelCPETemplateReco.h @@ -4,8 +4,8 @@ #include "RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h" // Already in the base class -//#include "Geometry/CommonDetUnit/interface/GeomDetType.h" -//#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +//#include "Geometry/CommonTopologies/interface/GeomDetType.h" +//#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" //#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" //#include "Geometry/CommonDetAlgo/interface/MeasurementPoint.h" //#include "Geometry/CommonDetAlgo/interface/MeasurementError.h" diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitConverter.cc b/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitConverter.cc index 03edf914183e4..f796b7b8f77cd 100644 --- a/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitConverter.cc +++ b/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitConverter.cc @@ -64,7 +64,7 @@ // Geometry #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" // Data Formats #include "DataFormats/DetId/interface/DetId.h" diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitFromSoAAlpaka.cc b/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitFromSoAAlpaka.cc index 53d6f056be386..a37ed09da69ef 100644 --- a/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitFromSoAAlpaka.cc +++ b/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitFromSoAAlpaka.cc @@ -15,7 +15,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "FWCore/Utilities/interface/InputTag.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/SimplePixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" diff --git a/RecoLocalTracker/SiPixelRecHits/src/PixelCPEBase.cc b/RecoLocalTracker/SiPixelRecHits/src/PixelCPEBase.cc index 3d2d47d9dd6a8..6edd0b977b9d0 100644 --- a/RecoLocalTracker/SiPixelRecHits/src/PixelCPEBase.cc +++ b/RecoLocalTracker/SiPixelRecHits/src/PixelCPEBase.cc @@ -5,7 +5,7 @@ // change to use Lorentz angle from DB Lotte Wilke, Jan. 31st, 2008 // Change to use Generic error & Template calibration from DB - D.Fehling 11/08 -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h" #define CORRECT_FOR_BIG_PIXELS diff --git a/RecoLocalTracker/SiPixelRecHits/src/PixelCPEClusterRepair.cc b/RecoLocalTracker/SiPixelRecHits/src/PixelCPEClusterRepair.cc index 24fdb00d9edb3..35d112d77c8ba 100644 --- a/RecoLocalTracker/SiPixelRecHits/src/PixelCPEClusterRepair.cc +++ b/RecoLocalTracker/SiPixelRecHits/src/PixelCPEClusterRepair.cc @@ -2,7 +2,7 @@ #include "RecoLocalTracker/SiPixelRecHits/interface/PixelCPEClusterRepair.h" // Geometry services -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" // MessageLogger diff --git a/RecoLocalTracker/SiPixelRecHits/src/PixelCPEFast.cc b/RecoLocalTracker/SiPixelRecHits/src/PixelCPEFast.cc index 264568bb43ee6..e873b236c8331 100644 --- a/RecoLocalTracker/SiPixelRecHits/src/PixelCPEFast.cc +++ b/RecoLocalTracker/SiPixelRecHits/src/PixelCPEFast.cc @@ -1,7 +1,7 @@ #include "CondFormats/SiPixelTransient/interface/SiPixelTemplate.h" #include "DataFormats/DetId/interface/DetId.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/SimplePixelTopology.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "RecoLocalTracker/SiPixelRecHits/interface/PixelCPEFast.h" diff --git a/RecoLocalTracker/SiPixelRecHits/src/PixelCPEGeneric.cc b/RecoLocalTracker/SiPixelRecHits/src/PixelCPEGeneric.cc index d3ddb480b2c69..a91b6234fbf6f 100644 --- a/RecoLocalTracker/SiPixelRecHits/src/PixelCPEGeneric.cc +++ b/RecoLocalTracker/SiPixelRecHits/src/PixelCPEGeneric.cc @@ -1,6 +1,6 @@ #include "RecoLocalTracker/SiPixelRecHits/interface/PixelCPEGeneric.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "DataFormats/DetId/interface/DetId.h" // Pixel templates contain the rec hit error parameterizaiton diff --git a/RecoLocalTracker/SiPixelRecHits/src/PixelCPETemplateReco.cc b/RecoLocalTracker/SiPixelRecHits/src/PixelCPETemplateReco.cc index de04276201101..5144288f96e36 100644 --- a/RecoLocalTracker/SiPixelRecHits/src/PixelCPETemplateReco.cc +++ b/RecoLocalTracker/SiPixelRecHits/src/PixelCPETemplateReco.cc @@ -2,7 +2,7 @@ #include "RecoLocalTracker/SiPixelRecHits/interface/PixelCPETemplateReco.h" // Geometry services -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" //#define DEBUG diff --git a/RecoLocalTracker/SiPixelRecHits/test/ReadPixelRecHit.cc b/RecoLocalTracker/SiPixelRecHits/test/ReadPixelRecHit.cc index fdc2e6df5fb10..7a2558db01f9f 100644 --- a/RecoLocalTracker/SiPixelRecHits/test/ReadPixelRecHit.cc +++ b/RecoLocalTracker/SiPixelRecHits/test/ReadPixelRecHit.cc @@ -18,10 +18,10 @@ #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h" diff --git a/RecoLocalTracker/SiStripRecHitConverter/BuildFile.xml b/RecoLocalTracker/SiStripRecHitConverter/BuildFile.xml index 0bbf434606371..7a9d92c8e9904 100644 --- a/RecoLocalTracker/SiStripRecHitConverter/BuildFile.xml +++ b/RecoLocalTracker/SiStripRecHitConverter/BuildFile.xml @@ -7,7 +7,7 @@ - + diff --git a/RecoLocalTracker/SiStripRecHitConverter/interface/SiStripRecHitMatcher.h b/RecoLocalTracker/SiStripRecHitConverter/interface/SiStripRecHitMatcher.h index 70c6301b55087..bd11bdf8dd7ce 100644 --- a/RecoLocalTracker/SiStripRecHitConverter/interface/SiStripRecHitMatcher.h +++ b/RecoLocalTracker/SiStripRecHitConverter/interface/SiStripRecHitMatcher.h @@ -6,7 +6,7 @@ #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2D.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2DCollection.h" #include "DataFormats/DetId/interface/DetId.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "DataFormats/CLHEP/interface/AlgebraicObjects.h" @@ -126,7 +126,7 @@ using mathSSE::Vec3D; using mathSSE::Vec3F; #endif -#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" +#include "Geometry/CommonTopologies/interface/GluedGeomDet.h" #include "TrackingTools/TransientTrackingRecHit/interface/HelpertRecHit2DLocalPos.h" namespace matcherDetails { diff --git a/RecoLocalTracker/SiStripRecHitConverter/src/SiStripRecHitConverterAlgorithm.cc b/RecoLocalTracker/SiStripRecHitConverter/src/SiStripRecHitConverterAlgorithm.cc index 3e30655d7aba1..9f67d6ed354ea 100644 --- a/RecoLocalTracker/SiStripRecHitConverter/src/SiStripRecHitConverterAlgorithm.cc +++ b/RecoLocalTracker/SiStripRecHitConverter/src/SiStripRecHitConverterAlgorithm.cc @@ -2,7 +2,7 @@ #include "RecoLocalTracker/Records/interface/TkStripCPERecord.h" #include "CalibTracker/Records/interface/SiStripQualityRcd.h" -#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" +#include "Geometry/CommonTopologies/interface/GluedGeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" diff --git a/RecoLocalTracker/SiStripRecHitConverter/src/SiStripRecHitMatcher.cc b/RecoLocalTracker/SiStripRecHitConverter/src/SiStripRecHitMatcher.cc index cd15122e54a6a..2305a979d1510 100644 --- a/RecoLocalTracker/SiStripRecHitConverter/src/SiStripRecHitMatcher.cc +++ b/RecoLocalTracker/SiStripRecHitConverter/src/SiStripRecHitMatcher.cc @@ -3,7 +3,7 @@ // Author: C.Genta #include "RecoLocalTracker/SiStripRecHitConverter/interface/SiStripRecHitMatcher.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" -#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" +#include "Geometry/CommonTopologies/interface/GluedGeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "DataFormats/CLHEP/interface/AlgebraicObjects.h" diff --git a/RecoLocalTracker/SubCollectionProducers/BuildFile.xml b/RecoLocalTracker/SubCollectionProducers/BuildFile.xml index 23bf0167efb2a..e9177a7e89800 100644 --- a/RecoLocalTracker/SubCollectionProducers/BuildFile.xml +++ b/RecoLocalTracker/SubCollectionProducers/BuildFile.xml @@ -10,7 +10,7 @@ - + diff --git a/RecoLocalTracker/SubCollectionProducers/interface/PixelClusterSelectorTopBottom.h b/RecoLocalTracker/SubCollectionProducers/interface/PixelClusterSelectorTopBottom.h index 23d2cb167376a..83adc88f775ae 100644 --- a/RecoLocalTracker/SubCollectionProducers/interface/PixelClusterSelectorTopBottom.h +++ b/RecoLocalTracker/SubCollectionProducers/interface/PixelClusterSelectorTopBottom.h @@ -18,7 +18,7 @@ #include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "DataFormats/DetId/interface/DetId.h" #include "FWCore/Utilities/interface/InputTag.h" diff --git a/RecoLocalTracker/SubCollectionProducers/src/HITrackClusterRemover.cc b/RecoLocalTracker/SubCollectionProducers/src/HITrackClusterRemover.cc index 33b995c43bc4b..951473673ee0b 100644 --- a/RecoLocalTracker/SubCollectionProducers/src/HITrackClusterRemover.cc +++ b/RecoLocalTracker/SubCollectionProducers/src/HITrackClusterRemover.cc @@ -32,8 +32,8 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" #include "RecoTracker/TransientTrackingRecHit/interface/Traj2TrackHits.h" diff --git a/RecoLocalTracker/SubCollectionProducers/src/HLTTrackClusterRemoverNew.cc b/RecoLocalTracker/SubCollectionProducers/src/HLTTrackClusterRemoverNew.cc index c0de4a047378f..05e0b0ad3d5f0 100644 --- a/RecoLocalTracker/SubCollectionProducers/src/HLTTrackClusterRemoverNew.cc +++ b/RecoLocalTracker/SubCollectionProducers/src/HLTTrackClusterRemoverNew.cc @@ -31,8 +31,8 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" // // class decleration diff --git a/RecoLocalTracker/SubCollectionProducers/src/JetCoreClusterSplitter.cc b/RecoLocalTracker/SubCollectionProducers/src/JetCoreClusterSplitter.cc index 03329eb0258b0..aac0152dcf9be 100644 --- a/RecoLocalTracker/SubCollectionProducers/src/JetCoreClusterSplitter.cc +++ b/RecoLocalTracker/SubCollectionProducers/src/JetCoreClusterSplitter.cc @@ -13,7 +13,7 @@ #include "RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h" #include "RecoLocalTracker/Records/interface/TkPixelCPERecord.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "DataFormats/GeometryVector/interface/VectorUtil.h" diff --git a/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemover.cc b/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemover.cc index ca5c560e12f1f..608d63b2a1e01 100644 --- a/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemover.cc +++ b/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemover.cc @@ -28,8 +28,8 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" // // class decleration diff --git a/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemoverPhase2.cc b/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemoverPhase2.cc index a338a9247abef..db80de6157f54 100644 --- a/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemoverPhase2.cc +++ b/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemoverPhase2.cc @@ -18,8 +18,8 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "FWCore/Utilities/interface/InputTag.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "TrackingTools/PatternTools/interface/Trajectory.h" diff --git a/RecoLuminosity/LumiProducer/test/analysis/plugins/PCCNTupler.h b/RecoLuminosity/LumiProducer/test/analysis/plugins/PCCNTupler.h index 7c216f4e60cf2..7d55dffb72fd6 100644 --- a/RecoLuminosity/LumiProducer/test/analysis/plugins/PCCNTupler.h +++ b/RecoLuminosity/LumiProducer/test/analysis/plugins/PCCNTupler.h @@ -21,7 +21,7 @@ #include "DataFormats/DetId/interface/DetIdFwd.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/ServiceRegistry/interface/Service.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "TrackingTools/TrackAssociator/interface/TrackDetectorAssociator.h" #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h" #include "SimDataFormats/PileupSummaryInfo/interface/PileupSummaryInfo.h" diff --git a/RecoMET/METAlgorithms/interface/EcalHaloAlgo.h b/RecoMET/METAlgorithms/interface/EcalHaloAlgo.h index 12f8d955e215b..73c548894e568 100644 --- a/RecoMET/METAlgorithms/interface/EcalHaloAlgo.h +++ b/RecoMET/METAlgorithms/interface/EcalHaloAlgo.h @@ -8,7 +8,7 @@ */ #include "DataFormats/METReco/interface/EcalHaloData.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/GeometrySurface/interface/BoundPlane.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" diff --git a/RecoMET/METProducers/interface/CSCHaloDataProducer.h b/RecoMET/METProducers/interface/CSCHaloDataProducer.h index e054e40b65468..6523fc8fff2eb 100644 --- a/RecoMET/METProducers/interface/CSCHaloDataProducer.h +++ b/RecoMET/METProducers/interface/CSCHaloDataProducer.h @@ -100,7 +100,7 @@ #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/PluginManager/interface/ModuleDef.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/CSCGeometry/interface/CSCGeometry.h" #include "Geometry/CSCGeometry/interface/CSCChamber.h" #include "Geometry/CSCGeometry/interface/CSCLayer.h" diff --git a/RecoMET/METProducers/interface/EcalHaloDataProducer.h b/RecoMET/METProducers/interface/EcalHaloDataProducer.h index c884163aff402..1a5728a5f34d6 100644 --- a/RecoMET/METProducers/interface/EcalHaloDataProducer.h +++ b/RecoMET/METProducers/interface/EcalHaloDataProducer.h @@ -83,7 +83,7 @@ #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/RecoMET/METProducers/interface/GlobalHaloDataProducer.h b/RecoMET/METProducers/interface/GlobalHaloDataProducer.h index 9ad745c1485b5..c9c7501c25c2c 100644 --- a/RecoMET/METProducers/interface/GlobalHaloDataProducer.h +++ b/RecoMET/METProducers/interface/GlobalHaloDataProducer.h @@ -137,9 +137,9 @@ #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/CSCGeometry/interface/CSCGeometry.h" @@ -155,10 +155,10 @@ #include "Geometry/Records/interface/MuonGeometryRecord.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" +#include "Geometry/CommonTopologies/interface/GluedGeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" diff --git a/RecoMTD/DetLayers/src/BTLDetLayerGeometryBuilder.cc b/RecoMTD/DetLayers/src/BTLDetLayerGeometryBuilder.cc index 34017c356e341..497f999bb04e7 100644 --- a/RecoMTD/DetLayers/src/BTLDetLayerGeometryBuilder.cc +++ b/RecoMTD/DetLayers/src/BTLDetLayerGeometryBuilder.cc @@ -3,12 +3,12 @@ #include "RecoMTD/DetLayers/interface/BTLDetLayerGeometryBuilder.h" #include -#include +#include #include #include #include -#include +#include #include diff --git a/RecoMTD/DetLayers/src/ETLDetLayerGeometryBuilder.cc b/RecoMTD/DetLayers/src/ETLDetLayerGeometryBuilder.cc index b950b74198ab3..0025e0e36f2eb 100644 --- a/RecoMTD/DetLayers/src/ETLDetLayerGeometryBuilder.cc +++ b/RecoMTD/DetLayers/src/ETLDetLayerGeometryBuilder.cc @@ -5,11 +5,11 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/RecoMTD/DetLayers/src/MTDDetSector.cc b/RecoMTD/DetLayers/src/MTDDetSector.cc index cfb893b258867..221b7a64e407f 100644 --- a/RecoMTD/DetLayers/src/MTDDetSector.cc +++ b/RecoMTD/DetLayers/src/MTDDetSector.cc @@ -2,7 +2,7 @@ #include "RecoMTD/DetLayers/interface/MTDDetSector.h" #include "DataFormats/ForwardDetId/interface/ETLDetId.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/GeomPropagators/interface/Propagator.h" #include "TrackingTools/DetLayers/interface/MeasurementEstimator.h" #include "MTDDiskSectorBuilderFromDet.h" diff --git a/RecoMTD/DetLayers/src/MTDDetTray.cc b/RecoMTD/DetLayers/src/MTDDetTray.cc index 8665913ddbc3f..e2a6acc911229 100644 --- a/RecoMTD/DetLayers/src/MTDDetTray.cc +++ b/RecoMTD/DetLayers/src/MTDDetTray.cc @@ -6,7 +6,7 @@ */ #include "RecoMTD/DetLayers/interface/MTDDetTray.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/GeomPropagators/interface/Propagator.h" #include "TrackingTools/DetLayers/interface/MeasurementEstimator.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/RecoMTD/DetLayers/src/MTDDiskSectorBuilderFromDet.h b/RecoMTD/DetLayers/src/MTDDiskSectorBuilderFromDet.h index 504321c927029..a49b68bf31d5f 100644 --- a/RecoMTD/DetLayers/src/MTDDiskSectorBuilderFromDet.h +++ b/RecoMTD/DetLayers/src/MTDDiskSectorBuilderFromDet.h @@ -3,7 +3,7 @@ #include "DataFormats/GeometrySurface/interface/BoundDiskSector.h" #include "DataFormats/GeometrySurface/interface/DiskSectorBounds.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include #include diff --git a/RecoMTD/DetLayers/src/MTDSectorForwardDoubleLayer.cc b/RecoMTD/DetLayers/src/MTDSectorForwardDoubleLayer.cc index 92f6d35271871..cb5037409fd05 100644 --- a/RecoMTD/DetLayers/src/MTDSectorForwardDoubleLayer.cc +++ b/RecoMTD/DetLayers/src/MTDSectorForwardDoubleLayer.cc @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/RecoMTD/DetLayers/src/MTDSectorForwardLayer.cc b/RecoMTD/DetLayers/src/MTDSectorForwardLayer.cc index f2ba187d7a434..5c7e4d7098848 100644 --- a/RecoMTD/DetLayers/src/MTDSectorForwardLayer.cc +++ b/RecoMTD/DetLayers/src/MTDSectorForwardLayer.cc @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/RecoMTD/DetLayers/src/MTDTrayBarrelLayer.cc b/RecoMTD/DetLayers/src/MTDTrayBarrelLayer.cc index d5a0319554dd0..5ed36b47be163 100644 --- a/RecoMTD/DetLayers/src/MTDTrayBarrelLayer.cc +++ b/RecoMTD/DetLayers/src/MTDTrayBarrelLayer.cc @@ -7,7 +7,7 @@ #include "RecoMTD/DetLayers/interface/MTDTrayBarrelLayer.h" #include "RecoMTD/DetLayers/interface/MTDDetTray.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/GeomPropagators/interface/Propagator.h" #include "TrackingTools/DetLayers/interface/MeasurementEstimator.h" #include "Utilities/BinningTools/interface/PeriodicBinFinderInPhi.h" diff --git a/RecoMTD/TransientTrackingRecHit/BuildFile.xml b/RecoMTD/TransientTrackingRecHit/BuildFile.xml index 8a11863739f5a..bc1979005e620 100644 --- a/RecoMTD/TransientTrackingRecHit/BuildFile.xml +++ b/RecoMTD/TransientTrackingRecHit/BuildFile.xml @@ -3,7 +3,7 @@ - + diff --git a/RecoMTD/TransientTrackingRecHit/interface/MTDTransientTrackingRecHitBuilder.h b/RecoMTD/TransientTrackingRecHit/interface/MTDTransientTrackingRecHitBuilder.h index 97a9f746432b8..0e5f814bf7bfb 100644 --- a/RecoMTD/TransientTrackingRecHit/interface/MTDTransientTrackingRecHitBuilder.h +++ b/RecoMTD/TransientTrackingRecHit/interface/MTDTransientTrackingRecHitBuilder.h @@ -6,7 +6,7 @@ #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHitBuilder.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "FWCore/Framework/interface/ESHandle.h" class MTDTransientTrackingRecHitBuilder : public TransientTrackingRecHitBuilder { diff --git a/RecoMTD/TransientTrackingRecHit/plugins/BuildFile.xml b/RecoMTD/TransientTrackingRecHit/plugins/BuildFile.xml index 3248a5a6e86b8..29b33067ce874 100644 --- a/RecoMTD/TransientTrackingRecHit/plugins/BuildFile.xml +++ b/RecoMTD/TransientTrackingRecHit/plugins/BuildFile.xml @@ -1,7 +1,7 @@ - + diff --git a/RecoMTD/TransientTrackingRecHit/plugins/MTDTransientTrackingRecHitBuilderESProducer.cc b/RecoMTD/TransientTrackingRecHit/plugins/MTDTransientTrackingRecHitBuilderESProducer.cc index b2b22cc001a60..c56c04e674a91 100644 --- a/RecoMTD/TransientTrackingRecHit/plugins/MTDTransientTrackingRecHitBuilderESProducer.cc +++ b/RecoMTD/TransientTrackingRecHit/plugins/MTDTransientTrackingRecHitBuilderESProducer.cc @@ -7,7 +7,7 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "TrackingTools/Records/interface/TransientRecHitRecord.h" #include diff --git a/RecoMTD/TransientTrackingRecHit/src/MTDTransientTrackingRecHit.cc b/RecoMTD/TransientTrackingRecHit/src/MTDTransientTrackingRecHit.cc index bcf8a0a0f1eaa..2dfe69601a9ce 100644 --- a/RecoMTD/TransientTrackingRecHit/src/MTDTransientTrackingRecHit.cc +++ b/RecoMTD/TransientTrackingRecHit/src/MTDTransientTrackingRecHit.cc @@ -3,7 +3,7 @@ */ #include "RecoMTD/TransientTrackingRecHit/interface/MTDTransientTrackingRecHit.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/GeometryCommonDetAlgo/interface/ErrorFrameTransformer.h" #include "DataFormats/ForwardDetId/interface/MTDDetId.h" diff --git a/RecoMuon/CosmicMuonProducer/BuildFile.xml b/RecoMuon/CosmicMuonProducer/BuildFile.xml index b52858682f79a..fd578e26eade3 100644 --- a/RecoMuon/CosmicMuonProducer/BuildFile.xml +++ b/RecoMuon/CosmicMuonProducer/BuildFile.xml @@ -12,7 +12,7 @@ - + diff --git a/RecoMuon/CosmicMuonProducer/src/CosmicMuonTrajectoryBuilder.cc b/RecoMuon/CosmicMuonProducer/src/CosmicMuonTrajectoryBuilder.cc index a4a3e60b0136c..fd49dc2bf33b2 100644 --- a/RecoMuon/CosmicMuonProducer/src/CosmicMuonTrajectoryBuilder.cc +++ b/RecoMuon/CosmicMuonProducer/src/CosmicMuonTrajectoryBuilder.cc @@ -12,7 +12,7 @@ /* Collaborating Class Header */ #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/PatternTools/interface/Trajectory.h" #include "TrackingTools/GeomPropagators/interface/Propagator.h" #include "DataFormats/TrajectorySeed/interface/TrajectorySeed.h" diff --git a/RecoMuon/CosmicMuonProducer/test/CosmicMuonValidator.cc b/RecoMuon/CosmicMuonProducer/test/CosmicMuonValidator.cc index 4da963b3f839d..d81df4c18f338 100644 --- a/RecoMuon/CosmicMuonProducer/test/CosmicMuonValidator.cc +++ b/RecoMuon/CosmicMuonProducer/test/CosmicMuonValidator.cc @@ -26,7 +26,7 @@ #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" diff --git a/RecoMuon/CosmicMuonProducer/test/RealCosmicDataAnalyzer.cc b/RecoMuon/CosmicMuonProducer/test/RealCosmicDataAnalyzer.cc index 5e50a1c113f82..c08764b66e040 100644 --- a/RecoMuon/CosmicMuonProducer/test/RealCosmicDataAnalyzer.cc +++ b/RecoMuon/CosmicMuonProducer/test/RealCosmicDataAnalyzer.cc @@ -18,7 +18,7 @@ #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" diff --git a/RecoMuon/DetLayers/src/MuDetRing.cc b/RecoMuon/DetLayers/src/MuDetRing.cc index a439b177afc62..0526a66e7c598 100644 --- a/RecoMuon/DetLayers/src/MuDetRing.cc +++ b/RecoMuon/DetLayers/src/MuDetRing.cc @@ -4,7 +4,7 @@ */ #include "RecoMuon/DetLayers/interface/MuDetRing.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/GeomPropagators/interface/Propagator.h" #include "TrackingTools/DetLayers/interface/MeasurementEstimator.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/RecoMuon/DetLayers/src/MuDetRod.cc b/RecoMuon/DetLayers/src/MuDetRod.cc index ade96146c0a3f..d91e897881cec 100644 --- a/RecoMuon/DetLayers/src/MuDetRod.cc +++ b/RecoMuon/DetLayers/src/MuDetRod.cc @@ -4,7 +4,7 @@ */ #include "RecoMuon/DetLayers/interface/MuDetRod.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/GeomPropagators/interface/Propagator.h" #include "TrackingTools/DetLayers/interface/MeasurementEstimator.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/RecoMuon/DetLayers/src/MuRingForwardDoubleLayer.cc b/RecoMuon/DetLayers/src/MuRingForwardDoubleLayer.cc index 26041968c4dce..4734ee517c4a4 100644 --- a/RecoMuon/DetLayers/src/MuRingForwardDoubleLayer.cc +++ b/RecoMuon/DetLayers/src/MuRingForwardDoubleLayer.cc @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include diff --git a/RecoMuon/DetLayers/src/MuRingForwardLayer.cc b/RecoMuon/DetLayers/src/MuRingForwardLayer.cc index 92fbb3bb35db4..567c40695657a 100644 --- a/RecoMuon/DetLayers/src/MuRingForwardLayer.cc +++ b/RecoMuon/DetLayers/src/MuRingForwardLayer.cc @@ -5,7 +5,7 @@ #include "RecoMuon/DetLayers/interface/MuRingForwardLayer.h" #include "RecoMuon/DetLayers/interface/MuDetRing.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/GeometrySurface/interface/SimpleDiskBounds.h" #include "TrackingTools/GeomPropagators/interface/Propagator.h" #include "TrackingTools/DetLayers/interface/MeasurementEstimator.h" diff --git a/RecoMuon/DetLayers/src/MuRodBarrelLayer.cc b/RecoMuon/DetLayers/src/MuRodBarrelLayer.cc index f6dbe9eaae788..c7e3aae3ec5c7 100644 --- a/RecoMuon/DetLayers/src/MuRodBarrelLayer.cc +++ b/RecoMuon/DetLayers/src/MuRodBarrelLayer.cc @@ -5,7 +5,7 @@ #include "RecoMuon/DetLayers/interface/MuRodBarrelLayer.h" #include "RecoMuon/DetLayers/interface/MuDetRod.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/GeomPropagators/interface/Propagator.h" #include "TrackingTools/DetLayers/interface/MeasurementEstimator.h" #include "TrackingTools/DetLayers/interface/GeneralBinFinderInPhi.h" diff --git a/RecoMuon/DetLayers/src/MuonCSCDetLayerGeometryBuilder.cc b/RecoMuon/DetLayers/src/MuonCSCDetLayerGeometryBuilder.cc index 11e6de7c16255..43ff6e5083c8c 100644 --- a/RecoMuon/DetLayers/src/MuonCSCDetLayerGeometryBuilder.cc +++ b/RecoMuon/DetLayers/src/MuonCSCDetLayerGeometryBuilder.cc @@ -3,10 +3,10 @@ #include #include #include -#include +#include #include -#include +#include #include diff --git a/RecoMuon/DetLayers/src/MuonDTDetLayerGeometryBuilder.cc b/RecoMuon/DetLayers/src/MuonDTDetLayerGeometryBuilder.cc index b24f6b7741bf8..9008ddadb793f 100644 --- a/RecoMuon/DetLayers/src/MuonDTDetLayerGeometryBuilder.cc +++ b/RecoMuon/DetLayers/src/MuonDTDetLayerGeometryBuilder.cc @@ -1,12 +1,12 @@ #include #include -#include +#include #include #include #include -#include +#include #include diff --git a/RecoMuon/DetLayers/src/MuonGEMDetLayerGeometryBuilder.cc b/RecoMuon/DetLayers/src/MuonGEMDetLayerGeometryBuilder.cc index 41e627894d354..e545974a66517 100644 --- a/RecoMuon/DetLayers/src/MuonGEMDetLayerGeometryBuilder.cc +++ b/RecoMuon/DetLayers/src/MuonGEMDetLayerGeometryBuilder.cc @@ -1,14 +1,14 @@ #include #include -#include +#include #include #include #include #include #include -#include +#include #include diff --git a/RecoMuon/DetLayers/src/MuonME0DetLayerGeometryBuilder.cc b/RecoMuon/DetLayers/src/MuonME0DetLayerGeometryBuilder.cc index ff76e0897d8b5..969b747366070 100644 --- a/RecoMuon/DetLayers/src/MuonME0DetLayerGeometryBuilder.cc +++ b/RecoMuon/DetLayers/src/MuonME0DetLayerGeometryBuilder.cc @@ -1,7 +1,7 @@ #include #include -#include +#include //#include #include "RecoMuon/DetLayers/interface/MuRingForwardLayer.h" #include "RecoMuon/DetLayers/interface/MuRodBarrelLayer.h" @@ -9,7 +9,7 @@ #include "RecoMuon/DetLayers/interface/MuDetRod.h" #include "Utilities/General/interface/precomputed_value_sort.h" -#include "Geometry/CommonDetUnit/interface/DetSorting.h" +#include "Geometry/CommonTopologies/interface/DetSorting.h" #include "Utilities/BinningTools/interface/ClusterizingHistogram.h" #include diff --git a/RecoMuon/DetLayers/src/MuonRPCDetLayerGeometryBuilder.cc b/RecoMuon/DetLayers/src/MuonRPCDetLayerGeometryBuilder.cc index 314706732da5d..e172b13b4eb50 100644 --- a/RecoMuon/DetLayers/src/MuonRPCDetLayerGeometryBuilder.cc +++ b/RecoMuon/DetLayers/src/MuonRPCDetLayerGeometryBuilder.cc @@ -1,14 +1,14 @@ #include #include -#include +#include #include #include #include #include #include -#include +#include #include "Utilities/BinningTools/interface/ClusterizingHistogram.h" #include diff --git a/RecoMuon/GlobalMuonProducer/test/GLBMuonAnalyzer.cc b/RecoMuon/GlobalMuonProducer/test/GLBMuonAnalyzer.cc index cdeed74220510..d28677995ea15 100644 --- a/RecoMuon/GlobalMuonProducer/test/GLBMuonAnalyzer.cc +++ b/RecoMuon/GlobalMuonProducer/test/GLBMuonAnalyzer.cc @@ -20,8 +20,8 @@ #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/TransientTrack/interface/TransientTrack.h" #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h" diff --git a/RecoMuon/GlobalTrackingTools/BuildFile.xml b/RecoMuon/GlobalTrackingTools/BuildFile.xml index 8e9ba4c9724b6..b7e78a4aafcaa 100644 --- a/RecoMuon/GlobalTrackingTools/BuildFile.xml +++ b/RecoMuon/GlobalTrackingTools/BuildFile.xml @@ -14,7 +14,7 @@ - + diff --git a/RecoMuon/GlobalTrackingTools/interface/ChamberSegmentUtility.h b/RecoMuon/GlobalTrackingTools/interface/ChamberSegmentUtility.h index 352e10f9b7e6f..1027169829326 100644 --- a/RecoMuon/GlobalTrackingTools/interface/ChamberSegmentUtility.h +++ b/RecoMuon/GlobalTrackingTools/interface/ChamberSegmentUtility.h @@ -18,7 +18,7 @@ #include "DataFormats/GeometrySurface/interface/LocalError.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/CSCGeometry/interface/CSCGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "Geometry/DTGeometry/interface/DTChamber.h" diff --git a/RecoMuon/GlobalTrackingTools/src/GlobalMuonTrackMatcher.cc b/RecoMuon/GlobalTrackingTools/src/GlobalMuonTrackMatcher.cc index 60293efb48da1..2013e03eb57b6 100644 --- a/RecoMuon/GlobalTrackingTools/src/GlobalMuonTrackMatcher.cc +++ b/RecoMuon/GlobalTrackingTools/src/GlobalMuonTrackMatcher.cc @@ -38,7 +38,7 @@ #include "DataFormats/GeometrySurface/interface/TangentPlane.h" #include "DataFormats/Math/interface/deltaR.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" using namespace std; using namespace reco; diff --git a/RecoMuon/MuonIdentification/BuildFile.xml b/RecoMuon/MuonIdentification/BuildFile.xml index 8a05f7d27c9f7..5cee1c5c8e1b9 100644 --- a/RecoMuon/MuonIdentification/BuildFile.xml +++ b/RecoMuon/MuonIdentification/BuildFile.xml @@ -21,7 +21,7 @@ - + diff --git a/RecoMuon/MuonIdentification/interface/CSCTimingExtractor.h b/RecoMuon/MuonIdentification/interface/CSCTimingExtractor.h index 0d21eaabd791a..c467505569fe5 100644 --- a/RecoMuon/MuonIdentification/interface/CSCTimingExtractor.h +++ b/RecoMuon/MuonIdentification/interface/CSCTimingExtractor.h @@ -27,7 +27,7 @@ #include "DataFormats/Common/interface/Ref.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "DataFormats/MuonReco/interface/Muon.h" #include "DataFormats/MuonReco/interface/MuonFwd.h" diff --git a/RecoMuon/MuonIdentification/interface/DTTimingExtractor.h b/RecoMuon/MuonIdentification/interface/DTTimingExtractor.h index 516db33c2a226..17b6efce53850 100644 --- a/RecoMuon/MuonIdentification/interface/DTTimingExtractor.h +++ b/RecoMuon/MuonIdentification/interface/DTTimingExtractor.h @@ -27,7 +27,7 @@ #include "DataFormats/Common/interface/Ref.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "DataFormats/MuonReco/interface/Muon.h" #include "DataFormats/MuonReco/interface/MuonFwd.h" diff --git a/RecoMuon/MuonIdentification/interface/MuonCosmicCompatibilityFiller.h b/RecoMuon/MuonIdentification/interface/MuonCosmicCompatibilityFiller.h index 2414dc55d2d5f..ff2b207486dd5 100644 --- a/RecoMuon/MuonIdentification/interface/MuonCosmicCompatibilityFiller.h +++ b/RecoMuon/MuonIdentification/interface/MuonCosmicCompatibilityFiller.h @@ -31,7 +31,7 @@ #include "DataFormats/VertexReco/interface/Vertex.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" namespace edm { class ParameterSet; diff --git a/RecoMuon/MuonIdentification/interface/MuonIdTruthInfo.h b/RecoMuon/MuonIdentification/interface/MuonIdTruthInfo.h index 6ddca65cf2eee..00bb2c6aed6b0 100644 --- a/RecoMuon/MuonIdentification/interface/MuonIdTruthInfo.h +++ b/RecoMuon/MuonIdentification/interface/MuonIdTruthInfo.h @@ -14,7 +14,7 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/TrackReco/interface/Track.h" #include "SimDataFormats/Track/interface/SimTrack.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/ConsumesCollector.h" diff --git a/RecoMuon/MuonIdentification/plugins/BuildFile.xml b/RecoMuon/MuonIdentification/plugins/BuildFile.xml index 5e84606563722..00a0bf98430bf 100644 --- a/RecoMuon/MuonIdentification/plugins/BuildFile.xml +++ b/RecoMuon/MuonIdentification/plugins/BuildFile.xml @@ -8,7 +8,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/RecoMuon/MuonIdentification/plugins/GlobalMuonToMuonProducer.cc b/RecoMuon/MuonIdentification/plugins/GlobalMuonToMuonProducer.cc index c505f8217dc87..177a47bdd7ef7 100644 --- a/RecoMuon/MuonIdentification/plugins/GlobalMuonToMuonProducer.cc +++ b/RecoMuon/MuonIdentification/plugins/GlobalMuonToMuonProducer.cc @@ -12,7 +12,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" // tmp -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h" diff --git a/RecoMuon/MuonIdentification/plugins/GlobalMuonToMuonProducer.h b/RecoMuon/MuonIdentification/plugins/GlobalMuonToMuonProducer.h index eb50c28377a25..625356261811e 100644 --- a/RecoMuon/MuonIdentification/plugins/GlobalMuonToMuonProducer.h +++ b/RecoMuon/MuonIdentification/plugins/GlobalMuonToMuonProducer.h @@ -16,7 +16,7 @@ namespace reco { } #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Utilities/interface/ESGetToken.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "DataFormats/MuonReco/interface/Muon.h" #include "DataFormats/MuonReco/interface/MuonTrackLinks.h" diff --git a/RecoMuon/MuonIdentification/plugins/MuonProducer.h b/RecoMuon/MuonIdentification/plugins/MuonProducer.h index 6c720fadfda1a..2a06eba94f76d 100644 --- a/RecoMuon/MuonIdentification/plugins/MuonProducer.h +++ b/RecoMuon/MuonIdentification/plugins/MuonProducer.h @@ -21,7 +21,7 @@ namespace reco { class Track; } #include "FWCore/Framework/interface/ESHandle.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" diff --git a/RecoMuon/MuonIdentification/plugins/TrajectorySeedFromMuonProducer.cc b/RecoMuon/MuonIdentification/plugins/TrajectorySeedFromMuonProducer.cc index c27616063a062..60a8450b4c6ed 100644 --- a/RecoMuon/MuonIdentification/plugins/TrajectorySeedFromMuonProducer.cc +++ b/RecoMuon/MuonIdentification/plugins/TrajectorySeedFromMuonProducer.cc @@ -38,7 +38,7 @@ #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "TrackingTools/PatternTools/interface/TrajectoryMeasurement.h" #include "DataFormats/TrajectorySeed/interface/PropagationDirection.h" diff --git a/RecoMuon/MuonIdentification/src/CSCTimingExtractor.cc b/RecoMuon/MuonIdentification/src/CSCTimingExtractor.cc index 8f60a1c1c0be1..38a8b7329915e 100644 --- a/RecoMuon/MuonIdentification/src/CSCTimingExtractor.cc +++ b/RecoMuon/MuonIdentification/src/CSCTimingExtractor.cc @@ -30,7 +30,7 @@ #include "DataFormats/MuonDetId/interface/MuonSubdetId.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "TrackingTools/Records/interface/TrackingComponentsRecord.h" #include "DataFormats/MuonReco/interface/Muon.h" diff --git a/RecoMuon/MuonIdentification/src/DTTimingExtractor.cc b/RecoMuon/MuonIdentification/src/DTTimingExtractor.cc index 6097d74c2e9af..40603474af11d 100644 --- a/RecoMuon/MuonIdentification/src/DTTimingExtractor.cc +++ b/RecoMuon/MuonIdentification/src/DTTimingExtractor.cc @@ -36,7 +36,7 @@ #include "DataFormats/DTRecHit/interface/DTRecSegment2D.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "TrackingTools/Records/interface/TrackingComponentsRecord.h" #include "DataFormats/MuonReco/interface/Muon.h" diff --git a/RecoMuon/MuonIdentification/src/MuonIdTruthInfo.cc b/RecoMuon/MuonIdentification/src/MuonIdTruthInfo.cc index fb13039029622..7afb77fe069a1 100644 --- a/RecoMuon/MuonIdentification/src/MuonIdTruthInfo.cc +++ b/RecoMuon/MuonIdentification/src/MuonIdTruthInfo.cc @@ -5,7 +5,7 @@ #include "DataFormats/MuonDetId/interface/DTChamberId.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "FWCore/Framework/interface/ConsumesCollector.h" void MuonIdTruthInfo::registerConsumes(edm::ConsumesCollector& iC) { diff --git a/RecoMuon/MuonIdentification/src/MuonShowerInformationFiller.cc b/RecoMuon/MuonIdentification/src/MuonShowerInformationFiller.cc index 353419ac6b213..d984416c9bb1e 100644 --- a/RecoMuon/MuonIdentification/src/MuonShowerInformationFiller.cc +++ b/RecoMuon/MuonIdentification/src/MuonShowerInformationFiller.cc @@ -32,7 +32,7 @@ #include "DataFormats/GeometrySurface/interface/Bounds.h" #include "RecoMuon/MeasurementDet/interface/MuonDetLayerMeasurements.h" #include "DataFormats/MuonDetId/interface/MuonSubdetId.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h" diff --git a/RecoMuon/MuonIdentification/test/MuonTimingValidator.cc b/RecoMuon/MuonIdentification/test/MuonTimingValidator.cc index 1c0d07506567a..d6402c5e88fb9 100644 --- a/RecoMuon/MuonIdentification/test/MuonTimingValidator.cc +++ b/RecoMuon/MuonIdentification/test/MuonTimingValidator.cc @@ -57,7 +57,7 @@ #include "DataFormats/MuonReco/interface/MuonTimeExtraMap.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h" #include "DataFormats/TrackReco/interface/TrackExtra.h" diff --git a/RecoMuon/MuonIdentification/test/RPCMuonAnalyzer.cc b/RecoMuon/MuonIdentification/test/RPCMuonAnalyzer.cc index d58110e5fd91e..7c20e23a91bf4 100644 --- a/RecoMuon/MuonIdentification/test/RPCMuonAnalyzer.cc +++ b/RecoMuon/MuonIdentification/test/RPCMuonAnalyzer.cc @@ -11,7 +11,7 @@ //#include "DataFormats/TrackReco/interface/Track.h" //#include "Geometry/Records/interface/MuonGeometryRecord.h" -//#include "Geometry/CommonDetUnit/interface/GeomDet.h" +//#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/MuonReco/interface/Muon.h" #include "DataFormats/MuonReco/interface/MuonFwd.h" #include "DataFormats/MuonReco/interface/MuonSelectors.h" diff --git a/RecoMuon/MuonSeedGenerator/BuildFile.xml b/RecoMuon/MuonSeedGenerator/BuildFile.xml index 82b52fa84006f..bb6c3fb8f1a2c 100644 --- a/RecoMuon/MuonSeedGenerator/BuildFile.xml +++ b/RecoMuon/MuonSeedGenerator/BuildFile.xml @@ -10,7 +10,7 @@ - + diff --git a/RecoMuon/MuonSeedGenerator/plugins/CosmicMuonSeedGenerator.cc b/RecoMuon/MuonSeedGenerator/plugins/CosmicMuonSeedGenerator.cc index 02bf523e3ebcb..f3d4f373932d0 100644 --- a/RecoMuon/MuonSeedGenerator/plugins/CosmicMuonSeedGenerator.cc +++ b/RecoMuon/MuonSeedGenerator/plugins/CosmicMuonSeedGenerator.cc @@ -11,7 +11,7 @@ #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h" #include "DataFormats/Common/interface/Handle.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "RecoMuon/TrackingTools/interface/MuonPatternRecoDumper.h" diff --git a/RecoMuon/MuonSeedGenerator/plugins/MuonSeedGenerator.cc b/RecoMuon/MuonSeedGenerator/plugins/MuonSeedGenerator.cc index 9618f6b5cc388..6b91d95b36c7c 100644 --- a/RecoMuon/MuonSeedGenerator/plugins/MuonSeedGenerator.cc +++ b/RecoMuon/MuonSeedGenerator/plugins/MuonSeedGenerator.cc @@ -24,7 +24,7 @@ #include "RecoMuon/Records/interface/MuonRecoGeometryRecord.h" // Geometry -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/DetLayers/interface/DetLayer.h" #include "RecoMuon/MeasurementDet/interface/MuonDetLayerMeasurements.h" diff --git a/RecoMuon/MuonSeedGenerator/plugins/MuonSeedProducer.cc b/RecoMuon/MuonSeedGenerator/plugins/MuonSeedProducer.cc index c6c9bb941a1c1..b4de14ad0955f 100644 --- a/RecoMuon/MuonSeedGenerator/plugins/MuonSeedProducer.cc +++ b/RecoMuon/MuonSeedGenerator/plugins/MuonSeedProducer.cc @@ -11,7 +11,7 @@ #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h" // Geometry -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/DetLayers/interface/DetLayer.h" // Framework diff --git a/RecoMuon/MuonSeedGenerator/plugins/SETMuonSeedProducer.cc b/RecoMuon/MuonSeedGenerator/plugins/SETMuonSeedProducer.cc index d30d95c23d902..922529c1b98fe 100644 --- a/RecoMuon/MuonSeedGenerator/plugins/SETMuonSeedProducer.cc +++ b/RecoMuon/MuonSeedGenerator/plugins/SETMuonSeedProducer.cc @@ -22,7 +22,7 @@ #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h" #include "TrackingTools/DetLayers/interface/DetLayer.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TMath.h" using namespace edm; diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedBuilder.cc b/RecoMuon/MuonSeedGenerator/src/MuonSeedBuilder.cc index ddf8455256d6d..0737aeae7252a 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonSeedBuilder.cc +++ b/RecoMuon/MuonSeedGenerator/src/MuonSeedBuilder.cc @@ -19,7 +19,7 @@ #include // Geometry -#include +#include #include #include #include diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedCleaner.cc b/RecoMuon/MuonSeedGenerator/src/MuonSeedCleaner.cc index 7e6538152b55c..6a460fb9e5791 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonSeedCleaner.cc +++ b/RecoMuon/MuonSeedGenerator/src/MuonSeedCleaner.cc @@ -17,7 +17,7 @@ #include // Geometry -#include +#include #include #include #include diff --git a/RecoMuon/MuonSeedGenerator/src/MuonSeedOrcaPatternRecognition.cc b/RecoMuon/MuonSeedGenerator/src/MuonSeedOrcaPatternRecognition.cc index aaff41de76855..3ec9f8eac335f 100644 --- a/RecoMuon/MuonSeedGenerator/src/MuonSeedOrcaPatternRecognition.cc +++ b/RecoMuon/MuonSeedGenerator/src/MuonSeedOrcaPatternRecognition.cc @@ -22,7 +22,7 @@ #include "RecoMuon/TrackingTools/interface/MuonPatternRecoDumper.h" // Geometry -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/DetLayers/interface/DetLayer.h" // Framework diff --git a/RecoMuon/MuonSeedGenerator/src/RPCSeedOverlapper.cc b/RecoMuon/MuonSeedGenerator/src/RPCSeedOverlapper.cc index 34d56345aed31..689007631d5f2 100644 --- a/RecoMuon/MuonSeedGenerator/src/RPCSeedOverlapper.cc +++ b/RecoMuon/MuonSeedGenerator/src/RPCSeedOverlapper.cc @@ -5,7 +5,7 @@ #include "RecoMuon/MuonSeedGenerator/interface/RPCSeedOverlapper.h" #include -#include +#include using namespace std; using namespace edm; diff --git a/RecoMuon/MuonSeedGenerator/src/RPCSeedPattern.cc b/RecoMuon/MuonSeedGenerator/src/RPCSeedPattern.cc index a03598ff30124..6287f8c5fed67 100644 --- a/RecoMuon/MuonSeedGenerator/src/RPCSeedPattern.cc +++ b/RecoMuon/MuonSeedGenerator/src/RPCSeedPattern.cc @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/RecoMuon/MuonSeedGenerator/src/SETPatternRecognition.cc b/RecoMuon/MuonSeedGenerator/src/SETPatternRecognition.cc index ab06827886ea3..f2acceed910b4 100644 --- a/RecoMuon/MuonSeedGenerator/src/SETPatternRecognition.cc +++ b/RecoMuon/MuonSeedGenerator/src/SETPatternRecognition.cc @@ -8,7 +8,7 @@ #include "RecoMuon/TrackingTools/interface/MuonPatternRecoDumper.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "TrackingTools/DetLayers/interface/DetLayer.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TMath.h" using namespace edm; diff --git a/RecoMuon/MuonSeedGenerator/src/SETSeedFinder.cc b/RecoMuon/MuonSeedGenerator/src/SETSeedFinder.cc index 56833cd1dc25e..2754b2e42c529 100644 --- a/RecoMuon/MuonSeedGenerator/src/SETSeedFinder.cc +++ b/RecoMuon/MuonSeedGenerator/src/SETSeedFinder.cc @@ -8,7 +8,7 @@ #include "RecoMuon/TrackingTools/interface/MuonPatternRecoDumper.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "TrackingTools/DetLayers/interface/DetLayer.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/MuonDetId/interface/MuonSubdetId.h" #include "DataFormats/MuonDetId/interface/CSCDetId.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h" diff --git a/RecoMuon/MuonSeedGenerator/test/MCSeedGenerator/MCMuonSeedGenerator.h b/RecoMuon/MuonSeedGenerator/test/MCSeedGenerator/MCMuonSeedGenerator.h index 22355d556ea59..9232c09770658 100644 --- a/RecoMuon/MuonSeedGenerator/test/MCSeedGenerator/MCMuonSeedGenerator.h +++ b/RecoMuon/MuonSeedGenerator/test/MCSeedGenerator/MCMuonSeedGenerator.h @@ -11,8 +11,8 @@ #include "FWCore/Utilities/interface/InputTag.h" #include "FWCore/Framework/interface/ESHandle.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/TrajectorySeed/interface/TrajectorySeedFwd.h" diff --git a/RecoMuon/StandAloneMuonProducer/test/STAMuonAnalyzer.cc b/RecoMuon/StandAloneMuonProducer/test/STAMuonAnalyzer.cc index 4d2c737e94317..4f529ac93a1d0 100644 --- a/RecoMuon/StandAloneMuonProducer/test/STAMuonAnalyzer.cc +++ b/RecoMuon/StandAloneMuonProducer/test/STAMuonAnalyzer.cc @@ -15,8 +15,8 @@ #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/TransientTrack/interface/TransientTrack.h" #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h" diff --git a/RecoMuon/StandAloneTrackFinder/BuildFile.xml b/RecoMuon/StandAloneTrackFinder/BuildFile.xml index 14d91f93b9ca6..afa15f67c37af 100644 --- a/RecoMuon/StandAloneTrackFinder/BuildFile.xml +++ b/RecoMuon/StandAloneTrackFinder/BuildFile.xml @@ -4,7 +4,7 @@ - + diff --git a/RecoMuon/StandAloneTrackFinder/src/StandAloneTrajectoryBuilder.cc b/RecoMuon/StandAloneTrackFinder/src/StandAloneTrajectoryBuilder.cc index ded67522d4d5c..ecda25926748c 100644 --- a/RecoMuon/StandAloneTrackFinder/src/StandAloneTrajectoryBuilder.cc +++ b/RecoMuon/StandAloneTrackFinder/src/StandAloneTrajectoryBuilder.cc @@ -32,7 +32,7 @@ #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h" #include "TrackingTools/DetLayers/interface/DetLayer.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/TrackRefitter/interface/SeedTransformer.h" using namespace edm; diff --git a/RecoMuon/TrackerSeedGenerator/BuildFile.xml b/RecoMuon/TrackerSeedGenerator/BuildFile.xml index 13eea01f4a3a0..62cd92107ea0d 100644 --- a/RecoMuon/TrackerSeedGenerator/BuildFile.xml +++ b/RecoMuon/TrackerSeedGenerator/BuildFile.xml @@ -28,7 +28,6 @@ - diff --git a/RecoMuon/TrackerSeedGenerator/plugins/BuildFile.xml b/RecoMuon/TrackerSeedGenerator/plugins/BuildFile.xml index 244165f6a2816..49f40a75a04bc 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/BuildFile.xml +++ b/RecoMuon/TrackerSeedGenerator/plugins/BuildFile.xml @@ -22,7 +22,7 @@ - + diff --git a/RecoMuon/TrackerSeedGenerator/plugins/TSGForOIDNN.cc b/RecoMuon/TrackerSeedGenerator/plugins/TSGForOIDNN.cc index 640d0116218fd..89e1ba08d235b 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/TSGForOIDNN.cc +++ b/RecoMuon/TrackerSeedGenerator/plugins/TSGForOIDNN.cc @@ -12,7 +12,7 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" diff --git a/RecoMuon/TrackerSeedGenerator/plugins/TSGForOIFromL2.h b/RecoMuon/TrackerSeedGenerator/plugins/TSGForOIFromL2.h index 8ff8e3eaa3989..5ac08b04e68d0 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/TSGForOIFromL2.h +++ b/RecoMuon/TrackerSeedGenerator/plugins/TSGForOIFromL2.h @@ -15,7 +15,7 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" diff --git a/RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.h b/RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.h index b9bb2f3a5b52a..6f37b090c245f 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.h +++ b/RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.h @@ -25,7 +25,7 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "DataFormats/TrajectorySeed/interface/TrajectorySeed.h" #include "DataFormats/TrackReco/interface/Track.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include #include #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/RecoMuon/TrackingTools/BuildFile.xml b/RecoMuon/TrackingTools/BuildFile.xml index 2c0cd2a83c534..98a3a88579a88 100644 --- a/RecoMuon/TrackingTools/BuildFile.xml +++ b/RecoMuon/TrackingTools/BuildFile.xml @@ -10,7 +10,7 @@ - + diff --git a/RecoMuon/TrackingTools/interface/MuonServiceProxy.h b/RecoMuon/TrackingTools/interface/MuonServiceProxy.h index 915911c5f1203..04062c48acabd 100644 --- a/RecoMuon/TrackingTools/interface/MuonServiceProxy.h +++ b/RecoMuon/TrackingTools/interface/MuonServiceProxy.h @@ -19,7 +19,7 @@ #include "FWCore/Utilities/interface/ESGetToken.h" // EventSetup data types -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "RecoMuon/DetLayers/interface/MuonDetLayerGeometry.h" #include "TrackingTools/GeomPropagators/interface/Propagator.h" diff --git a/RecoMuon/TrackingTools/src/MuonTrackLoader.cc b/RecoMuon/TrackingTools/src/MuonTrackLoader.cc index 71d94c55983de..f5e127658a6a8 100644 --- a/RecoMuon/TrackingTools/src/MuonTrackLoader.cc +++ b/RecoMuon/TrackingTools/src/MuonTrackLoader.cc @@ -24,7 +24,7 @@ #include "TrackingTools/DetLayers/interface/BarrelDetLayer.h" #include "TrackingTools/DetLayers/interface/ForwardDetLayer.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Framework/interface/Event.h" diff --git a/RecoMuon/TrackingTools/src/SegmentsTrackAssociator.cc b/RecoMuon/TrackingTools/src/SegmentsTrackAssociator.cc index c7e2cb47f2dff..f09caa5ef0e2c 100644 --- a/RecoMuon/TrackingTools/src/SegmentsTrackAssociator.cc +++ b/RecoMuon/TrackingTools/src/SegmentsTrackAssociator.cc @@ -26,8 +26,8 @@ #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include diff --git a/RecoMuon/TransientTrackingRecHit/BuildFile.xml b/RecoMuon/TransientTrackingRecHit/BuildFile.xml index 7c171c514d66c..bb87b73ae8e9e 100644 --- a/RecoMuon/TransientTrackingRecHit/BuildFile.xml +++ b/RecoMuon/TransientTrackingRecHit/BuildFile.xml @@ -3,7 +3,7 @@ - + diff --git a/RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHitBuilder.h b/RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHitBuilder.h index 3a414019e7a1b..2697acb26e18a 100644 --- a/RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHitBuilder.h +++ b/RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHitBuilder.h @@ -6,7 +6,7 @@ #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHitBuilder.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "FWCore/Framework/interface/ESHandle.h" class MuonTransientTrackingRecHitBuilder : public TransientTrackingRecHitBuilder { diff --git a/RecoMuon/TransientTrackingRecHit/plugins/BuildFile.xml b/RecoMuon/TransientTrackingRecHit/plugins/BuildFile.xml index d574b36130a17..f30c47b2bac0f 100644 --- a/RecoMuon/TransientTrackingRecHit/plugins/BuildFile.xml +++ b/RecoMuon/TransientTrackingRecHit/plugins/BuildFile.xml @@ -1,7 +1,7 @@ - + diff --git a/RecoMuon/TransientTrackingRecHit/plugins/MuonTransientTrackingRecHitBuilderESProducer.cc b/RecoMuon/TransientTrackingRecHit/plugins/MuonTransientTrackingRecHitBuilderESProducer.cc index 4443220a2b255..aba2006a394f5 100644 --- a/RecoMuon/TransientTrackingRecHit/plugins/MuonTransientTrackingRecHitBuilderESProducer.cc +++ b/RecoMuon/TransientTrackingRecHit/plugins/MuonTransientTrackingRecHitBuilderESProducer.cc @@ -17,7 +17,7 @@ #include "FWCore/Framework/interface/ModuleFactory.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "TrackingTools/Records/interface/TransientRecHitRecord.h" #include diff --git a/RecoMuon/TransientTrackingRecHit/src/MuonTransientTrackingRecHit.cc b/RecoMuon/TransientTrackingRecHit/src/MuonTransientTrackingRecHit.cc index bf28b96ef0823..49485ba542a3d 100644 --- a/RecoMuon/TransientTrackingRecHit/src/MuonTransientTrackingRecHit.cc +++ b/RecoMuon/TransientTrackingRecHit/src/MuonTransientTrackingRecHit.cc @@ -3,7 +3,7 @@ */ #include "RecoMuon/TransientTrackingRecHit/interface/MuonTransientTrackingRecHit.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/GeometryCommonDetAlgo/interface/ErrorFrameTransformer.h" #include "DataFormats/MuonDetId/interface/MuonSubdetId.h" diff --git a/RecoParticleFlow/PFSimProducer/plugins/BuildFile.xml b/RecoParticleFlow/PFSimProducer/plugins/BuildFile.xml index 9a8922eb4909c..271bc8dd03c67 100644 --- a/RecoParticleFlow/PFSimProducer/plugins/BuildFile.xml +++ b/RecoParticleFlow/PFSimProducer/plugins/BuildFile.xml @@ -12,7 +12,7 @@ - + diff --git a/RecoParticleFlow/PFSimProducer/plugins/PFSimParticleProducer.cc b/RecoParticleFlow/PFSimProducer/plugins/PFSimParticleProducer.cc index 93f2d978123f9..c49969c30bc74 100644 --- a/RecoParticleFlow/PFSimProducer/plugins/PFSimParticleProducer.cc +++ b/RecoParticleFlow/PFSimProducer/plugins/PFSimParticleProducer.cc @@ -36,7 +36,7 @@ #include "FastSimulation/Event/interface/FSimEvent.h" #include "FastSimulation/Event/interface/FSimTrack.h" #include "FastSimulation/Event/interface/FSimVertex.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/RecoParticleFlow/PFTracking/BuildFile.xml b/RecoParticleFlow/PFTracking/BuildFile.xml index 8c2d863558809..993fb5824d86d 100644 --- a/RecoParticleFlow/PFTracking/BuildFile.xml +++ b/RecoParticleFlow/PFTracking/BuildFile.xml @@ -8,7 +8,7 @@ - + diff --git a/RecoParticleFlow/PFTracking/interface/PFCheckHitPattern.h b/RecoParticleFlow/PFTracking/interface/PFCheckHitPattern.h index e187189742694..f59ee1103aa92 100644 --- a/RecoParticleFlow/PFTracking/interface/PFCheckHitPattern.h +++ b/RecoParticleFlow/PFTracking/interface/PFCheckHitPattern.h @@ -13,7 +13,7 @@ #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/DetId/interface/DetIdFwd.h" #include "RecoVertex/VertexPrimitives/interface/TransientVertex.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #define DEBUG_CHECKHITPATTERN diff --git a/RecoParticleFlow/PFTracking/plugins/PFDisplacedVertexProducer.cc b/RecoParticleFlow/PFTracking/plugins/PFDisplacedVertexProducer.cc index 93e450b6205de..a1ab7c3e82388 100644 --- a/RecoParticleFlow/PFTracking/plugins/PFDisplacedVertexProducer.cc +++ b/RecoParticleFlow/PFTracking/plugins/PFDisplacedVertexProducer.cc @@ -17,8 +17,8 @@ together by the criterion which is by default the minimal approach distance. #include "FWCore/ParameterSet/interface/FileInPath.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/Exception.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/RecoParticleFlow/PFTracking/src/PFCheckHitPattern.cc b/RecoParticleFlow/PFTracking/src/PFCheckHitPattern.cc index 9ef51a9834454..67297c1e022b3 100644 --- a/RecoParticleFlow/PFTracking/src/PFCheckHitPattern.cc +++ b/RecoParticleFlow/PFTracking/src/PFCheckHitPattern.cc @@ -5,7 +5,7 @@ #include "FWCore/Utilities/interface/Exception.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" // To convert detId to subdet/layer number. #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" diff --git a/RecoParticleFlow/PFTracking/src/PFDisplacedVertexFinder.cc b/RecoParticleFlow/PFTracking/src/PFDisplacedVertexFinder.cc index a2d374a28c52a..01aaa29632108 100644 --- a/RecoParticleFlow/PFTracking/src/PFDisplacedVertexFinder.cc +++ b/RecoParticleFlow/PFTracking/src/PFDisplacedVertexFinder.cc @@ -15,7 +15,7 @@ #include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/RecoTracker/ConversionSeedGenerators/plugins/BuildFile.xml b/RecoTracker/ConversionSeedGenerators/plugins/BuildFile.xml index 74d2ca9a14b3f..ab9a396efde6d 100644 --- a/RecoTracker/ConversionSeedGenerators/plugins/BuildFile.xml +++ b/RecoTracker/ConversionSeedGenerators/plugins/BuildFile.xml @@ -3,7 +3,7 @@ - + diff --git a/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilter.cc b/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilter.cc index 936eda8299a02..e499fc2109dda 100644 --- a/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilter.cc +++ b/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilter.cc @@ -26,7 +26,7 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilterCharge.cc b/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilterCharge.cc index 0cc6f160a046f..a042fe617c700 100644 --- a/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilterCharge.cc +++ b/RecoTracker/ConversionSeedGenerators/plugins/ConversionSeedFilterCharge.cc @@ -24,7 +24,7 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/RecoTracker/DeDx/interface/DeDxTools.h b/RecoTracker/DeDx/interface/DeDxTools.h index 7f24c29565e09..2a11f3eee8900 100644 --- a/RecoTracker/DeDx/interface/DeDxTools.h +++ b/RecoTracker/DeDx/interface/DeDxTools.h @@ -22,10 +22,10 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "CondFormats/PhysicsToolsObjects/interface/Histogram3D.h" #include "CondFormats/DataRecord/interface/SiStripDeDxMip_3D_Rcd.h" diff --git a/RecoTracker/DeDx/plugins/DeDxEstimatorProducer.h b/RecoTracker/DeDx/plugins/DeDxEstimatorProducer.h index 24102b0aa8396..ab46d757dc7cc 100644 --- a/RecoTracker/DeDx/plugins/DeDxEstimatorProducer.h +++ b/RecoTracker/DeDx/plugins/DeDxEstimatorProducer.h @@ -13,8 +13,8 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" -#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/GluedGeomDet.h" #include "DataFormats/Common/interface/ValueMap.h" #include "DataFormats/TrackReco/interface/DeDxData.h" diff --git a/RecoTracker/DeDx/plugins/DeDxHitCalibrator.cc b/RecoTracker/DeDx/plugins/DeDxHitCalibrator.cc index 247f00ecc50a9..41687c5c77294 100644 --- a/RecoTracker/DeDx/plugins/DeDxHitCalibrator.cc +++ b/RecoTracker/DeDx/plugins/DeDxHitCalibrator.cc @@ -17,7 +17,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineService.h" diff --git a/RecoTracker/DeDx/plugins/DeDxHitInfoProducer.cc b/RecoTracker/DeDx/plugins/DeDxHitInfoProducer.cc index c2f0bbd5a4710..6965c0ccc2aa8 100644 --- a/RecoTracker/DeDx/plugins/DeDxHitInfoProducer.cc +++ b/RecoTracker/DeDx/plugins/DeDxHitInfoProducer.cc @@ -31,7 +31,7 @@ #include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/ESGetToken.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "RecoTracker/DeDx/interface/DeDxTools.h" diff --git a/RecoTracker/DebugTools/plugins/CkfDebugger.h b/RecoTracker/DebugTools/plugins/CkfDebugger.h index ec19450938197..a4bca9f35a6d9 100644 --- a/RecoTracker/DebugTools/plugins/CkfDebugger.h +++ b/RecoTracker/DebugTools/plugins/CkfDebugger.h @@ -9,7 +9,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "SimDataFormats/TrackingHit/interface/PSimHit.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/RecoTracker/DebugTools/plugins/TSOSFromSimHitFactory.h b/RecoTracker/DebugTools/plugins/TSOSFromSimHitFactory.h index bdbf62a8bb1d4..0281850b94afe 100644 --- a/RecoTracker/DebugTools/plugins/TSOSFromSimHitFactory.h +++ b/RecoTracker/DebugTools/plugins/TSOSFromSimHitFactory.h @@ -4,7 +4,7 @@ #include "FTSFromSimHitFactory.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "SimDataFormats/TrackingHit/interface/PSimHit.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" class SimHit; class MagneticField; diff --git a/RecoTracker/DebugTools/plugins/TestHits.cc b/RecoTracker/DebugTools/plugins/TestHits.cc index 1386b1cd754fc..faca2f0866d2c 100644 --- a/RecoTracker/DebugTools/plugins/TestHits.cc +++ b/RecoTracker/DebugTools/plugins/TestHits.cc @@ -9,7 +9,7 @@ #include "TrackingTools/PatternTools/interface/TSCPBuilderNoMaterial.h" #include "TrackingTools/TrackFitters/interface/TrajectoryStateCombiner.h" #include -#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" +#include "Geometry/CommonTopologies/interface/GluedGeomDet.h" #include "TrackingTools/TrackFitters/interface/KFTrajectoryFitter.h" #include "TrackingTools/TrackFitters/interface/TrajectoryFitter.h" diff --git a/RecoTracker/DebugTools/plugins/TestHits.h b/RecoTracker/DebugTools/plugins/TestHits.h index 7c66f4d3a2f52..375bf1a5859e5 100644 --- a/RecoTracker/DebugTools/plugins/TestHits.h +++ b/RecoTracker/DebugTools/plugins/TestHits.h @@ -33,7 +33,7 @@ #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "TrackingTools/Records/interface/TrackingComponentsRecord.h" #include "TrackingTools/Records/interface/TransientRecHitRecord.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" #include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h" #include "TrackingTools/GeomPropagators/interface/Propagator.h" #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHitBuilder.h" diff --git a/RecoTracker/DebugTools/plugins/TestOutliers.cc b/RecoTracker/DebugTools/plugins/TestOutliers.cc index 0d0a43b96bd1e..219141e2a798b 100644 --- a/RecoTracker/DebugTools/plugins/TestOutliers.cc +++ b/RecoTracker/DebugTools/plugins/TestOutliers.cc @@ -41,7 +41,7 @@ #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/GeometryCommonDetAlgo/interface/ErrorFrameTransformer.h" diff --git a/RecoTracker/DebugTools/plugins/TestSmoothHits.cc b/RecoTracker/DebugTools/plugins/TestSmoothHits.cc index 5dae58d99dc1b..441b95378d22a 100644 --- a/RecoTracker/DebugTools/plugins/TestSmoothHits.cc +++ b/RecoTracker/DebugTools/plugins/TestSmoothHits.cc @@ -9,7 +9,7 @@ #include "TrackingTools/PatternTools/interface/TSCPBuilderNoMaterial.h" #include "TrackingTools/TrackFitters/interface/TrajectoryStateCombiner.h" #include -#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" +#include "Geometry/CommonTopologies/interface/GluedGeomDet.h" #include "TrackingTools/TrackFitters/interface/TrajectoryFitter.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" diff --git a/RecoTracker/DebugTools/plugins/TestSmoothHits.h b/RecoTracker/DebugTools/plugins/TestSmoothHits.h index 23d736a31b90c..5117eece8acfb 100644 --- a/RecoTracker/DebugTools/plugins/TestSmoothHits.h +++ b/RecoTracker/DebugTools/plugins/TestSmoothHits.h @@ -34,7 +34,7 @@ #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "TrackingTools/Records/interface/TrackingComponentsRecord.h" #include "TrackingTools/Records/interface/TransientRecHitRecord.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" #include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h" #include "TrackingTools/GeomPropagators/interface/Propagator.h" #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHitBuilder.h" diff --git a/RecoTracker/DebugTools/plugins/TestTrackHits.h b/RecoTracker/DebugTools/plugins/TestTrackHits.h index 577499b03659d..f746cdd30ecca 100644 --- a/RecoTracker/DebugTools/plugins/TestTrackHits.h +++ b/RecoTracker/DebugTools/plugins/TestTrackHits.h @@ -28,7 +28,7 @@ #include "FWCore/Utilities/interface/InputTag.h" #include "TrackingTools/PatternTools/interface/Trajectory.h" #include "MagneticField/Engine/interface/MagneticField.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHitBuilder.h" #include "RecoTracker/TransientTrackingRecHit/interface/TkTransientTrackingRecHitBuilder.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" @@ -41,7 +41,7 @@ #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h" #include "TrackingTools/PatternTools/interface/TrajectoryStateUpdator.h" #include "TrackingTools/GeomPropagators/interface/Propagator.h" -#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" +#include "Geometry/CommonTopologies/interface/GluedGeomDet.h" #include #include #include diff --git a/RecoTracker/FinalTrackSelectors/plugins/BuildFile.xml b/RecoTracker/FinalTrackSelectors/plugins/BuildFile.xml index ed0db0add7b33..c54e77d353eb0 100644 --- a/RecoTracker/FinalTrackSelectors/plugins/BuildFile.xml +++ b/RecoTracker/FinalTrackSelectors/plugins/BuildFile.xml @@ -18,7 +18,7 @@ - + diff --git a/RecoTracker/FinalTrackSelectors/plugins/CosmicTrackSplitter.cc b/RecoTracker/FinalTrackSelectors/plugins/CosmicTrackSplitter.cc index 445a8d0a220eb..5d2f24e50fd65 100644 --- a/RecoTracker/FinalTrackSelectors/plugins/CosmicTrackSplitter.cc +++ b/RecoTracker/FinalTrackSelectors/plugins/CosmicTrackSplitter.cc @@ -21,8 +21,8 @@ // added by me -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/GeometrySurface/interface/Surface.h" #include "DataFormats/GeometrySurface/interface/GloballyPositioned.h" #include "TrackingTools/TransientTrack/interface/TransientTrack.h" diff --git a/RecoTracker/FinalTrackSelectors/plugins/TrackListMerger.cc b/RecoTracker/FinalTrackSelectors/plugins/TrackListMerger.cc index 84f0b83f2b0a5..75522a6136ab0 100644 --- a/RecoTracker/FinalTrackSelectors/plugins/TrackListMerger.cc +++ b/RecoTracker/FinalTrackSelectors/plugins/TrackListMerger.cc @@ -137,7 +137,7 @@ class dso_hidden TrackListMerger : public edm::stream::EDProducer<> { #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/RecoTracker/LST/plugins/LSTOutputConverter.cc b/RecoTracker/LST/plugins/LSTOutputConverter.cc index 2f1ff99541c2e..7ebf9e9388f60 100644 --- a/RecoTracker/LST/plugins/LSTOutputConverter.cc +++ b/RecoTracker/LST/plugins/LSTOutputConverter.cc @@ -9,7 +9,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/Exception.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" diff --git a/RecoTracker/MeasurementDet/plugins/MeasurementTrackerImpl.cc b/RecoTracker/MeasurementDet/plugins/MeasurementTrackerImpl.cc index e9abd2d623527..00e4a0ed4c7fa 100644 --- a/RecoTracker/MeasurementDet/plugins/MeasurementTrackerImpl.cc +++ b/RecoTracker/MeasurementDet/plugins/MeasurementTrackerImpl.cc @@ -4,9 +4,9 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" -#include "Geometry/CommonDetUnit/interface/StackGeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GluedGeomDet.h" +#include "Geometry/CommonTopologies/interface/StackGeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" diff --git a/RecoTracker/MeasurementDet/plugins/RecHitPropagator.h b/RecoTracker/MeasurementDet/plugins/RecHitPropagator.h index e7d5ec3ba2b72..20e2292c16641 100644 --- a/RecoTracker/MeasurementDet/plugins/RecHitPropagator.h +++ b/RecoTracker/MeasurementDet/plugins/RecHitPropagator.h @@ -14,7 +14,7 @@ class dso_hidden RecHitPropagator { const TrajectoryStateOnSurface& ts) const; }; -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" // propagate from glued to mono/stereo inline TrajectoryStateOnSurface fastProp(const TrajectoryStateOnSurface& ts, const Plane& oPlane, const Plane& tPlane) { diff --git a/RecoTracker/MeasurementDet/plugins/TkGluedMeasurementDet.cc b/RecoTracker/MeasurementDet/plugins/TkGluedMeasurementDet.cc index fb65be671b381..c7c794865b0a5 100644 --- a/RecoTracker/MeasurementDet/plugins/TkGluedMeasurementDet.cc +++ b/RecoTracker/MeasurementDet/plugins/TkGluedMeasurementDet.cc @@ -1,7 +1,7 @@ #include "TkGluedMeasurementDet.h" #include "TrackingTools/MeasurementDet/interface/MeasurementDetException.h" #include "RecoTracker/TransientTrackingRecHit/interface/TSiStripMatchedRecHit.h" -#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" +#include "Geometry/CommonTopologies/interface/GluedGeomDet.h" #include "RecoLocalTracker/SiStripRecHitConverter/interface/SiStripRecHitMatcher.h" #include "NonPropagatingDetMeasurements.h" #include "TrackingTools/PatternTools/interface/TrajectoryMeasurement.h" diff --git a/RecoTracker/MeasurementDet/plugins/TkPhase2OTMeasurementDet.h b/RecoTracker/MeasurementDet/plugins/TkPhase2OTMeasurementDet.h index 41ee1ba5599e4..7a892e237f708 100644 --- a/RecoTracker/MeasurementDet/plugins/TkPhase2OTMeasurementDet.h +++ b/RecoTracker/MeasurementDet/plugins/TkPhase2OTMeasurementDet.h @@ -3,7 +3,7 @@ #include "TrackingTools/MeasurementDet/interface/MeasurementDet.h" #include "RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPE.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "DataFormats/Common/interface/Handle.h" #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h" diff --git a/RecoTracker/MeasurementDet/plugins/TkPixelMeasurementDet.h b/RecoTracker/MeasurementDet/plugins/TkPixelMeasurementDet.h index 9df5a5bdca716..e57a60120b288 100644 --- a/RecoTracker/MeasurementDet/plugins/TkPixelMeasurementDet.h +++ b/RecoTracker/MeasurementDet/plugins/TkPixelMeasurementDet.h @@ -4,7 +4,7 @@ #include "TrackingTools/MeasurementDet/interface/MeasurementDet.h" #include "RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h" //#include "DataFormats/SiPixelCluster/interface/SiPixelClusterFwd.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "DataFormats/Common/interface/Handle.h" #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h" diff --git a/RecoTracker/MeasurementDet/plugins/TkStackMeasurementDet.h b/RecoTracker/MeasurementDet/plugins/TkStackMeasurementDet.h index 93fdcfc2e457e..358bd8b6f1cdb 100644 --- a/RecoTracker/MeasurementDet/plugins/TkStackMeasurementDet.h +++ b/RecoTracker/MeasurementDet/plugins/TkStackMeasurementDet.h @@ -4,7 +4,7 @@ #include "TrackingTools/MeasurementDet/interface/MeasurementDet.h" #include "TkPhase2OTMeasurementDet.h" -#include "Geometry/CommonDetUnit/interface/StackGeomDet.h" +#include "Geometry/CommonTopologies/interface/StackGeomDet.h" #include "RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h" #include "FWCore/Utilities/interface/Visibility.h" diff --git a/RecoTracker/PixelLowPtUtilities/bin/PixelClusterShapeExtractor.cc b/RecoTracker/PixelLowPtUtilities/bin/PixelClusterShapeExtractor.cc index 996c77bf51c93..d283da5cd8931 100644 --- a/RecoTracker/PixelLowPtUtilities/bin/PixelClusterShapeExtractor.cc +++ b/RecoTracker/PixelLowPtUtilities/bin/PixelClusterShapeExtractor.cc @@ -20,7 +20,7 @@ #include "RecoTracker/Record/interface/CkfComponentsRecord.h" #include "RecoTracker/PixelLowPtUtilities/interface/ClusterShapeHitFilter.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" # diff --git a/RecoTracker/PixelLowPtUtilities/interface/ClusterShapeHitFilter.h b/RecoTracker/PixelLowPtUtilities/interface/ClusterShapeHitFilter.h index 877df0fb4f01c..5a6dfc2f29553 100644 --- a/RecoTracker/PixelLowPtUtilities/interface/ClusterShapeHitFilter.h +++ b/RecoTracker/PixelLowPtUtilities/interface/ClusterShapeHitFilter.h @@ -10,7 +10,7 @@ #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h" #include "DataFormats/SiPixelCluster/interface/SiPixelClusterShapeCache.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "RecoTracker/PixelLowPtUtilities/interface/ClusterData.h" diff --git a/RecoTracker/PixelLowPtUtilities/plugins/PixelVertexProducerClusters.cc b/RecoTracker/PixelLowPtUtilities/plugins/PixelVertexProducerClusters.cc index 78f66a1d4c1d8..71cef5b61bf92 100644 --- a/RecoTracker/PixelLowPtUtilities/plugins/PixelVertexProducerClusters.cc +++ b/RecoTracker/PixelLowPtUtilities/plugins/PixelVertexProducerClusters.cc @@ -9,10 +9,10 @@ #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" diff --git a/RecoTracker/PixelLowPtUtilities/plugins/SiPixelClusterShapeCacheProducer.cc b/RecoTracker/PixelLowPtUtilities/plugins/SiPixelClusterShapeCacheProducer.cc index ee75aa4cb3403..d23533e0b056f 100644 --- a/RecoTracker/PixelLowPtUtilities/plugins/SiPixelClusterShapeCacheProducer.cc +++ b/RecoTracker/PixelLowPtUtilities/plugins/SiPixelClusterShapeCacheProducer.cc @@ -13,7 +13,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" diff --git a/RecoTracker/PixelLowPtUtilities/src/ClusterShape.cc b/RecoTracker/PixelLowPtUtilities/src/ClusterShape.cc index 72c8a822f8599..8a4d0b53ea4fb 100644 --- a/RecoTracker/PixelLowPtUtilities/src/ClusterShape.cc +++ b/RecoTracker/PixelLowPtUtilities/src/ClusterShape.cc @@ -1,7 +1,7 @@ #include "RecoTracker/PixelLowPtUtilities/interface/ClusterShape.h" #include "RecoTracker/PixelLowPtUtilities/interface/ClusterData.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h" diff --git a/RecoTracker/PixelLowPtUtilities/src/ClusterShapeHitFilter.cc b/RecoTracker/PixelLowPtUtilities/src/ClusterShapeHitFilter.cc index 1e6c7320fe941..3f9003778b70f 100644 --- a/RecoTracker/PixelLowPtUtilities/src/ClusterShapeHitFilter.cc +++ b/RecoTracker/PixelLowPtUtilities/src/ClusterShapeHitFilter.cc @@ -8,12 +8,12 @@ #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" diff --git a/RecoTracker/PixelLowPtUtilities/src/ClusterShapeTrackFilter.cc b/RecoTracker/PixelLowPtUtilities/src/ClusterShapeTrackFilter.cc index 8fac8ef088855..cce68c4c38d5c 100644 --- a/RecoTracker/PixelLowPtUtilities/src/ClusterShapeTrackFilter.cc +++ b/RecoTracker/PixelLowPtUtilities/src/ClusterShapeTrackFilter.cc @@ -4,7 +4,7 @@ #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h" #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "RecoTracker/PixelLowPtUtilities/interface/ClusterShapeHitFilter.h" #include "RecoTracker/PixelLowPtUtilities/interface/ClusterShapeTrackFilter.h" diff --git a/RecoTracker/PixelLowPtUtilities/src/ClusterShapeTrajectoryFilter.cc b/RecoTracker/PixelLowPtUtilities/src/ClusterShapeTrajectoryFilter.cc index cf0e768f641ce..7a040db4279e9 100644 --- a/RecoTracker/PixelLowPtUtilities/src/ClusterShapeTrajectoryFilter.cc +++ b/RecoTracker/PixelLowPtUtilities/src/ClusterShapeTrajectoryFilter.cc @@ -19,8 +19,8 @@ #include "DataFormats/TrackerRecHit2D/interface/ProjectedSiStripRecHit2D.h" #include "DataFormats/SiPixelCluster/interface/SiPixelClusterShapeCache.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/RecoTracker/PixelLowPtUtilities/src/StripSubClusterShapeTrajectoryFilter.cc b/RecoTracker/PixelLowPtUtilities/src/StripSubClusterShapeTrajectoryFilter.cc index 362d15005167a..d4f2e7f14f32a 100644 --- a/RecoTracker/PixelLowPtUtilities/src/StripSubClusterShapeTrajectoryFilter.cc +++ b/RecoTracker/PixelLowPtUtilities/src/StripSubClusterShapeTrajectoryFilter.cc @@ -15,7 +15,7 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ServiceRegistry/interface/Service.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/RecoTracker/PixelLowPtUtilities/src/TrackFitter.cc b/RecoTracker/PixelLowPtUtilities/src/TrackFitter.cc index bad273a6af08e..221fdf4419a7b 100644 --- a/RecoTracker/PixelLowPtUtilities/src/TrackFitter.cc +++ b/RecoTracker/PixelLowPtUtilities/src/TrackFitter.cc @@ -7,9 +7,9 @@ #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "RecoTracker/PixelLowPtUtilities/interface/TrackFitter.h" diff --git a/RecoTracker/PixelLowPtUtilities/test/BuildFile.xml b/RecoTracker/PixelLowPtUtilities/test/BuildFile.xml index 62083438fabc2..84270ef909661 100644 --- a/RecoTracker/PixelLowPtUtilities/test/BuildFile.xml +++ b/RecoTracker/PixelLowPtUtilities/test/BuildFile.xml @@ -1,7 +1,7 @@ - + diff --git a/RecoTracker/PixelLowPtUtilities/test/ClusterShapeExtractor.cc b/RecoTracker/PixelLowPtUtilities/test/ClusterShapeExtractor.cc index 1c4b870b89195..7bdb00fcd72d8 100644 --- a/RecoTracker/PixelLowPtUtilities/test/ClusterShapeExtractor.cc +++ b/RecoTracker/PixelLowPtUtilities/test/ClusterShapeExtractor.cc @@ -19,8 +19,8 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "RecoTracker/PixelLowPtUtilities/interface/ClusterShapeHitFilter.h" diff --git a/RecoTracker/PixelSeeding/plugins/MatchedHitRZCorrectionFromBending.cc b/RecoTracker/PixelSeeding/plugins/MatchedHitRZCorrectionFromBending.cc index 8f972391cbf14..e56143ca1c7f4 100644 --- a/RecoTracker/PixelSeeding/plugins/MatchedHitRZCorrectionFromBending.cc +++ b/RecoTracker/PixelSeeding/plugins/MatchedHitRZCorrectionFromBending.cc @@ -1,6 +1,6 @@ #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetEnumerators.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetEnumerators.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "DataFormats/SiStripDetId/interface/SiStripDetId.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" diff --git a/RecoTracker/PixelTrackFitting/BuildFile.xml b/RecoTracker/PixelTrackFitting/BuildFile.xml index 38b9e58d83aeb..6056e001bdb80 100644 --- a/RecoTracker/PixelTrackFitting/BuildFile.xml +++ b/RecoTracker/PixelTrackFitting/BuildFile.xml @@ -14,7 +14,7 @@ - + diff --git a/RecoTracker/PixelTrackFitting/interface/KFBasedPixelFitter.h b/RecoTracker/PixelTrackFitting/interface/KFBasedPixelFitter.h index cc4b50e4179dd..4fb0756b1efda 100644 --- a/RecoTracker/PixelTrackFitting/interface/KFBasedPixelFitter.h +++ b/RecoTracker/PixelTrackFitting/interface/KFBasedPixelFitter.h @@ -2,7 +2,7 @@ #define RecoTracker_PixelTrackFitting_KFBasedPixelFitter_h #include "RecoTracker/PixelTrackFitting/interface/PixelFitterBase.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/TransientTrackingRecHit/interface/TValidTrackingRecHit.h" #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/BeamSpot/interface/BeamSpotFwd.h" diff --git a/RecoTracker/PixelTrackFitting/src/PixelFitterByConformalMappingAndLine.cc b/RecoTracker/PixelTrackFitting/src/PixelFitterByConformalMappingAndLine.cc index 3bdb2477f230c..ded87040222e2 100644 --- a/RecoTracker/PixelTrackFitting/src/PixelFitterByConformalMappingAndLine.cc +++ b/RecoTracker/PixelTrackFitting/src/PixelFitterByConformalMappingAndLine.cc @@ -12,8 +12,8 @@ #include "TrackingTools/DetLayers/interface/DetLayer.h" #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" #include "ConformalMappingFit.h" #include "RecoTracker/PixelTrackFitting/interface/PixelTrackBuilder.h" diff --git a/RecoTracker/PixelTrackFitting/src/PixelFitterByHelixProjections.cc b/RecoTracker/PixelTrackFitting/src/PixelFitterByHelixProjections.cc index a52482f460033..17e7d8867ca50 100644 --- a/RecoTracker/PixelTrackFitting/src/PixelFitterByHelixProjections.cc +++ b/RecoTracker/PixelTrackFitting/src/PixelFitterByHelixProjections.cc @@ -8,7 +8,7 @@ #include "DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h" #include "TrackingTools/DetLayers/interface/DetLayer.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" //#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "RecoTracker/TkMSParametrization/interface/PixelRecoUtilities.h" @@ -16,8 +16,8 @@ #include "CommonTools/Statistics/interface/LinearFit.h" #include "DataFormats/GeometryCommonDetAlgo/interface/Measurement1D.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/RecoTracker/PixelTrackFitting/src/PixelNtupletsFitter.cc b/RecoTracker/PixelTrackFitting/src/PixelNtupletsFitter.cc index 054230046a17f..ebc2d1389e190 100644 --- a/RecoTracker/PixelTrackFitting/src/PixelNtupletsFitter.cc +++ b/RecoTracker/PixelTrackFitting/src/PixelNtupletsFitter.cc @@ -7,8 +7,8 @@ #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "RecoTracker/PixelTrackFitting/interface/BrokenLine.h" #include "RecoTracker/PixelTrackFitting/interface/PixelNtupletsFitter.h" diff --git a/RecoTracker/SiTrackerMRHTools/interface/SimpleDAFHitCollector.h b/RecoTracker/SiTrackerMRHTools/interface/SimpleDAFHitCollector.h index 9666949c35d2a..c777ecfd036e0 100644 --- a/RecoTracker/SiTrackerMRHTools/interface/SimpleDAFHitCollector.h +++ b/RecoTracker/SiTrackerMRHTools/interface/SimpleDAFHitCollector.h @@ -5,7 +5,7 @@ #include "RecoTracker/TransientTrackingRecHit/interface/TkClonerImpl.h" #include "RecoTracker/TransientTrackingRecHit/interface/TkTransientTrackingRecHitBuilder.h" #include "RecoTracker/SiTrackerMRHTools/interface/SiTrackerMultiRecHitUpdator.h" -#include +#include #include #include diff --git a/RecoTracker/SiTrackerMRHTools/src/SiTrackerMultiRecHitUpdator.cc b/RecoTracker/SiTrackerMRHTools/src/SiTrackerMultiRecHitUpdator.cc index f44b87ef4b4a1..0623a2b39eeb3 100644 --- a/RecoTracker/SiTrackerMRHTools/src/SiTrackerMultiRecHitUpdator.cc +++ b/RecoTracker/SiTrackerMRHTools/src/SiTrackerMultiRecHitUpdator.cc @@ -10,7 +10,7 @@ #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "TrackingTools/TransientTrackingRecHit/interface/TrackingRecHitProjector.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/RecoTracker/SpecialSeedGenerators/BuildFile.xml b/RecoTracker/SpecialSeedGenerators/BuildFile.xml index d4d17a24513ad..54a6fb93f4cbf 100644 --- a/RecoTracker/SpecialSeedGenerators/BuildFile.xml +++ b/RecoTracker/SpecialSeedGenerators/BuildFile.xml @@ -10,7 +10,7 @@ - + diff --git a/RecoTracker/SpecialSeedGenerators/interface/CosmicRegionalSeedGenerator.h b/RecoTracker/SpecialSeedGenerators/interface/CosmicRegionalSeedGenerator.h index 0ce9aef659d18..e82ad100de772 100644 --- a/RecoTracker/SpecialSeedGenerators/interface/CosmicRegionalSeedGenerator.h +++ b/RecoTracker/SpecialSeedGenerators/interface/CosmicRegionalSeedGenerator.h @@ -37,8 +37,8 @@ #include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "FWCore/Framework/interface/ConsumesCollector.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" diff --git a/RecoTracker/SpecialSeedGenerators/src/OutsideInMuonSeeder.cc b/RecoTracker/SpecialSeedGenerators/src/OutsideInMuonSeeder.cc index d8a65b67ce05e..6f37fc22a7c6a 100644 --- a/RecoTracker/SpecialSeedGenerators/src/OutsideInMuonSeeder.cc +++ b/RecoTracker/SpecialSeedGenerators/src/OutsideInMuonSeeder.cc @@ -14,7 +14,7 @@ #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/InputTag.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" diff --git a/RecoTracker/SpecialSeedGenerators/src/SeedFromGenericPairOrTriplet.cc b/RecoTracker/SpecialSeedGenerators/src/SeedFromGenericPairOrTriplet.cc index 5a8c5628f47c0..8764368afc0be 100644 --- a/RecoTracker/SpecialSeedGenerators/src/SeedFromGenericPairOrTriplet.cc +++ b/RecoTracker/SpecialSeedGenerators/src/SeedFromGenericPairOrTriplet.cc @@ -3,7 +3,7 @@ #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h" #include "TrackingTools/KalmanUpdators/interface/KFUpdator.h" diff --git a/RecoTracker/TkDetLayers/src/BarrelUtil.h b/RecoTracker/TkDetLayers/src/BarrelUtil.h index d48bf8f14f2d0..c1244ceb3ef78 100644 --- a/RecoTracker/TkDetLayers/src/BarrelUtil.h +++ b/RecoTracker/TkDetLayers/src/BarrelUtil.h @@ -1,7 +1,7 @@ #ifndef TkDetLayers_BarrelUtil_h #define TkDetLayers_BarrelUtil_h -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/DetLayers/interface/GeometricSearchDet.h" #include "TrackingTools/DetLayers/interface/MeasurementEstimator.h" diff --git a/RecoTracker/TkDetLayers/src/BladeShapeBuilderFromDet.h b/RecoTracker/TkDetLayers/src/BladeShapeBuilderFromDet.h index 107b4bedeb290..580d25dc46354 100644 --- a/RecoTracker/TkDetLayers/src/BladeShapeBuilderFromDet.h +++ b/RecoTracker/TkDetLayers/src/BladeShapeBuilderFromDet.h @@ -3,7 +3,7 @@ #include "DataFormats/GeometrySurface/interface/BoundDiskSector.h" #include "DataFormats/GeometrySurface/interface/DiskSectorBounds.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include #include diff --git a/RecoTracker/TkDetLayers/src/ForwardDiskSectorBuilderFromDet.h b/RecoTracker/TkDetLayers/src/ForwardDiskSectorBuilderFromDet.h index f95e4b30fa900..bcce47c951979 100644 --- a/RecoTracker/TkDetLayers/src/ForwardDiskSectorBuilderFromDet.h +++ b/RecoTracker/TkDetLayers/src/ForwardDiskSectorBuilderFromDet.h @@ -3,7 +3,7 @@ #include "DataFormats/GeometrySurface/interface/BoundDiskSector.h" #include "DataFormats/GeometrySurface/interface/DiskSectorBounds.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include #include diff --git a/RecoTracker/TkDetLayers/src/GeometricSearchTrackerBuilder.cc b/RecoTracker/TkDetLayers/src/GeometricSearchTrackerBuilder.cc index 6b2fd5a607634..0f4d35618b775 100644 --- a/RecoTracker/TkDetLayers/src/GeometricSearchTrackerBuilder.cc +++ b/RecoTracker/TkDetLayers/src/GeometricSearchTrackerBuilder.cc @@ -11,7 +11,7 @@ #include "TIDLayerBuilder.h" #include "TECLayerBuilder.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" using namespace std; diff --git a/RecoTracker/TkDetLayers/src/TkDetUtil.h b/RecoTracker/TkDetLayers/src/TkDetUtil.h index 52747296547db..3023154946970 100644 --- a/RecoTracker/TkDetLayers/src/TkDetUtil.h +++ b/RecoTracker/TkDetLayers/src/TkDetUtil.h @@ -1,7 +1,7 @@ #ifndef TkDetLayers_TkDetUtil_h #define TkDetLayers_TkDetUtil_h -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/DetLayers/interface/MeasurementEstimator.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "TrackingTools/DetLayers/interface/rangesIntersect.h" diff --git a/RecoTracker/TkDetLayers/test/BuildFile.xml b/RecoTracker/TkDetLayers/test/BuildFile.xml index cf28cf85b7efe..263aecf7718ba 100644 --- a/RecoTracker/TkDetLayers/test/BuildFile.xml +++ b/RecoTracker/TkDetLayers/test/BuildFile.xml @@ -1,5 +1,5 @@ - + diff --git a/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.cc b/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.cc index de284c9d50296..be04238071000 100644 --- a/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.cc +++ b/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.cc @@ -25,7 +25,7 @@ // for trie #include "Geometry/TrackerGeometryBuilder/interface/trackerHierarchy.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/Common/interface/Trie.h" // for the test diff --git a/RecoTracker/TkMSParametrization/src/MSLayersKeeperX0DetLayer.cc b/RecoTracker/TkMSParametrization/src/MSLayersKeeperX0DetLayer.cc index 58dce6983f47c..83e24295cd3b8 100644 --- a/RecoTracker/TkMSParametrization/src/MSLayersKeeperX0DetLayer.cc +++ b/RecoTracker/TkMSParametrization/src/MSLayersKeeperX0DetLayer.cc @@ -4,7 +4,7 @@ #include "TrackingTools/DetLayers/interface/ForwardDetLayer.h" #include "DataFormats/GeometrySurface/interface/BoundSurface.h" #include "DataFormats/GeometrySurface/interface/MediumProperties.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include diff --git a/RecoTracker/TkSeedGenerator/BuildFile.xml b/RecoTracker/TkSeedGenerator/BuildFile.xml index 5a0ab23d0868a..11cd745905ad2 100644 --- a/RecoTracker/TkSeedGenerator/BuildFile.xml +++ b/RecoTracker/TkSeedGenerator/BuildFile.xml @@ -5,7 +5,7 @@ - + diff --git a/RecoTracker/TkSeedGenerator/plugins/BuildFile.xml b/RecoTracker/TkSeedGenerator/plugins/BuildFile.xml index ada2991b1cdb2..4980e9d84af1d 100644 --- a/RecoTracker/TkSeedGenerator/plugins/BuildFile.xml +++ b/RecoTracker/TkSeedGenerator/plugins/BuildFile.xml @@ -18,7 +18,7 @@ - + diff --git a/RecoTracker/TkSeedGenerator/plugins/DeepCoreSeedGenerator.cc b/RecoTracker/TkSeedGenerator/plugins/DeepCoreSeedGenerator.cc index a6b460994eba8..0e84d242c7665 100644 --- a/RecoTracker/TkSeedGenerator/plugins/DeepCoreSeedGenerator.cc +++ b/RecoTracker/TkSeedGenerator/plugins/DeepCoreSeedGenerator.cc @@ -30,9 +30,9 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" @@ -63,7 +63,7 @@ #include "FWCore/ServiceRegistry/interface/Service.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h" diff --git a/RecoTracker/TkSeedGenerator/plugins/SeedGeneratorFromL1TTracksEDProducer.cc b/RecoTracker/TkSeedGenerator/plugins/SeedGeneratorFromL1TTracksEDProducer.cc index e1bf0579b2f2e..a2efa162340e4 100644 --- a/RecoTracker/TkSeedGenerator/plugins/SeedGeneratorFromL1TTracksEDProducer.cc +++ b/RecoTracker/TkSeedGenerator/plugins/SeedGeneratorFromL1TTracksEDProducer.cc @@ -14,10 +14,10 @@ #include "DataFormats/L1TrackTrigger/interface/TTTrack.h" #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "RecoTracker/MeasurementDet/interface/MeasurementTrackerEvent.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/RecoTracker/TkSeedGenerator/src/SeedFromProtoTrack.cc b/RecoTracker/TkSeedGenerator/src/SeedFromProtoTrack.cc index 5dfcc809c6a72..fcb13134af647 100644 --- a/RecoTracker/TkSeedGenerator/src/SeedFromProtoTrack.cc +++ b/RecoTracker/TkSeedGenerator/src/SeedFromProtoTrack.cc @@ -4,7 +4,7 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/ConsumesCollector.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/RecoTracker/TkSeedingLayers/BuildFile.xml b/RecoTracker/TkSeedingLayers/BuildFile.xml index fb014bf518019..432b53dbb97b5 100644 --- a/RecoTracker/TkSeedingLayers/BuildFile.xml +++ b/RecoTracker/TkSeedingLayers/BuildFile.xml @@ -5,7 +5,7 @@ - + diff --git a/RecoTracker/TkSeedingLayers/interface/SeedingLayerSetsBuilder.h b/RecoTracker/TkSeedingLayers/interface/SeedingLayerSetsBuilder.h index c559467c8d0d1..5e04a1d7de6fa 100644 --- a/RecoTracker/TkSeedingLayers/interface/SeedingLayerSetsBuilder.h +++ b/RecoTracker/TkSeedingLayers/interface/SeedingLayerSetsBuilder.h @@ -9,7 +9,7 @@ #include "FWCore/Utilities/interface/InputTag.h" #include "FWCore/Framework/interface/ESWatcher.h" #include "FWCore/Utilities/interface/EDGetToken.h" -#include "Geometry/CommonDetUnit/interface/GeomDetEnumerators.h" +#include "Geometry/CommonTopologies/interface/GeomDetEnumerators.h" #include "DataFormats/TrackerCommon/interface/TrackerDetSide.h" #include "DataFormats/TrackerRecHit2D/interface/FastTrackerRecHit.h" #include "DataFormats/TrackerRecHit2D/interface/FastTrackerRecHitCollection.h" diff --git a/RecoTracker/TrackProducer/BuildFile.xml b/RecoTracker/TrackProducer/BuildFile.xml index 26a8c6a75d63d..8a39a8fd409dd 100644 --- a/RecoTracker/TrackProducer/BuildFile.xml +++ b/RecoTracker/TrackProducer/BuildFile.xml @@ -8,7 +8,7 @@ - + diff --git a/RecoTracker/TrackProducer/interface/TrackProducerAlgorithm.icc b/RecoTracker/TrackProducer/interface/TrackProducerAlgorithm.icc index 1c36e854bb3ae..e372ee2ccafd5 100644 --- a/RecoTracker/TrackProducer/interface/TrackProducerAlgorithm.icc +++ b/RecoTracker/TrackProducer/interface/TrackProducerAlgorithm.icc @@ -4,7 +4,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "MagneticField/Engine/interface/MagneticField.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" #include "DataFormats/TrajectorySeed/interface/TrajectorySeed.h" #include "DataFormats/TrackCandidate/interface/TrackCandidate.h" diff --git a/RecoTracker/TrackProducer/src/DAFTrackProducerAlgorithm.cc b/RecoTracker/TrackProducer/src/DAFTrackProducerAlgorithm.cc index 616dcaea25426..c9e9899e100ec 100644 --- a/RecoTracker/TrackProducer/src/DAFTrackProducerAlgorithm.cc +++ b/RecoTracker/TrackProducer/src/DAFTrackProducerAlgorithm.cc @@ -6,7 +6,7 @@ #include "DataFormats/TrackingRecHit/interface/InvalidTrackingRecHit.h" #include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "RecoTracker/SiTrackerMRHTools/interface/MultiRecHitCollector.h" #include "RecoTracker/SiTrackerMRHTools/interface/SiTrackerMultiRecHitUpdator.h" diff --git a/RecoTracker/TrackProducer/src/TrackProducerAlgorithm.cc b/RecoTracker/TrackProducer/src/TrackProducerAlgorithm.cc index 97974c419fc26..c73b7b189f023 100644 --- a/RecoTracker/TrackProducer/src/TrackProducerAlgorithm.cc +++ b/RecoTracker/TrackProducer/src/TrackProducerAlgorithm.cc @@ -10,7 +10,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Utilities/interface/Exception.h" #include "FWCore/Utilities/interface/thread_safety_macros.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "RecoTracker/TrackProducer/interface/TrackProducerAlgorithm.h" #include "RecoTracker/TransientTrackingRecHit/interface/TRecHit1DMomConstraint.h" diff --git a/RecoTracker/TrackProducer/test/FakeCPEFiller.cc b/RecoTracker/TrackProducer/test/FakeCPEFiller.cc index aa9d26b2ec2c3..5ce4127e023e1 100644 --- a/RecoTracker/TrackProducer/test/FakeCPEFiller.cc +++ b/RecoTracker/TrackProducer/test/FakeCPEFiller.cc @@ -25,7 +25,7 @@ #include "TrackingTools/PatternTools/interface/Trajectory.h" #include "TrackingTools/TrackFitters/interface/TrajectoryStateCombiner.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "DataFormats/GeometryCommonDetAlgo/interface/MeasurementPoint.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" diff --git a/RecoTracker/TrackProducer/test/TrackAnalyzer.cc b/RecoTracker/TrackProducer/test/TrackAnalyzer.cc index 00ea7ad054414..29f11cc97b915 100644 --- a/RecoTracker/TrackProducer/test/TrackAnalyzer.cc +++ b/RecoTracker/TrackProducer/test/TrackAnalyzer.cc @@ -14,7 +14,7 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include diff --git a/RecoTracker/TransientTrackingRecHit/interface/TSiPixelRecHit.h b/RecoTracker/TransientTrackingRecHit/interface/TSiPixelRecHit.h index 0586ca7fb717c..4ec1a36503171 100644 --- a/RecoTracker/TransientTrackingRecHit/interface/TSiPixelRecHit.h +++ b/RecoTracker/TransientTrackingRecHit/interface/TSiPixelRecHit.h @@ -4,7 +4,7 @@ #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h" #include "RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #endif diff --git a/RecoTracker/TransientTrackingRecHit/interface/TSiStripMatchedRecHit.h b/RecoTracker/TransientTrackingRecHit/interface/TSiStripMatchedRecHit.h index 0e30f30153bcb..d3ee67e37a9d7 100644 --- a/RecoTracker/TransientTrackingRecHit/interface/TSiStripMatchedRecHit.h +++ b/RecoTracker/TransientTrackingRecHit/interface/TSiStripMatchedRecHit.h @@ -4,7 +4,7 @@ #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h" #include -#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" +#include "Geometry/CommonTopologies/interface/GluedGeomDet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" class SiStripRecHitMatcher; diff --git a/RecoTracker/TransientTrackingRecHit/interface/TSiStripRecHit2DLocalPos.h b/RecoTracker/TransientTrackingRecHit/interface/TSiStripRecHit2DLocalPos.h index 3aae1e4ad60d2..0c43ed20d4cc0 100644 --- a/RecoTracker/TransientTrackingRecHit/interface/TSiStripRecHit2DLocalPos.h +++ b/RecoTracker/TransientTrackingRecHit/interface/TSiStripRecHit2DLocalPos.h @@ -2,7 +2,7 @@ #define RECOTRACKER_TRANSIENTRACKINGRECHIT_TSiStripRecHit2DLocalPos_H #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #endif diff --git a/RecoTracker/TransientTrackingRecHit/interface/Traj2TrackHits.h b/RecoTracker/TransientTrackingRecHit/interface/Traj2TrackHits.h index d34bd0826e991..2daf6b2829d23 100644 --- a/RecoTracker/TransientTrackingRecHit/interface/Traj2TrackHits.h +++ b/RecoTracker/TransientTrackingRecHit/interface/Traj2TrackHits.h @@ -10,8 +10,8 @@ #include "RecoTracker/TransientTrackingRecHit/interface/TkTransientTrackingRecHitBuilder.h" #include "RecoLocalTracker/ClusterParameterEstimator/interface/StripClusterParameterEstimator.h" -#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GluedGeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" class Traj2TrackHits { private: diff --git a/RecoTracker/TransientTrackingRecHit/plugins/TkTransientTrackingRecHitBuilderESProducer.cc b/RecoTracker/TransientTrackingRecHit/plugins/TkTransientTrackingRecHitBuilderESProducer.cc index 1f4f4f31cbb7e..b23ddf2f8329e 100644 --- a/RecoTracker/TransientTrackingRecHit/plugins/TkTransientTrackingRecHitBuilderESProducer.cc +++ b/RecoTracker/TransientTrackingRecHit/plugins/TkTransientTrackingRecHitBuilderESProducer.cc @@ -1,7 +1,7 @@ #include "FWCore/Framework/interface/ESProducer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "TrackingTools/Records/interface/TransientRecHitRecord.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHitBuilder.h" #include "RecoLocalTracker/Records/interface/TrackerCPERecord.h" diff --git a/RecoTracker/TransientTrackingRecHit/src/TkClonerImpl.cc b/RecoTracker/TransientTrackingRecHit/src/TkClonerImpl.cc index 8c396591f7a96..f037a8c84f462 100644 --- a/RecoTracker/TransientTrackingRecHit/src/TkClonerImpl.cc +++ b/RecoTracker/TransientTrackingRecHit/src/TkClonerImpl.cc @@ -8,18 +8,18 @@ #include "DataFormats/TrackerRecHit2D/interface/Phase2TrackerRecHit1D.h" #include "DataFormats/TrackerRecHit2D/interface/VectorHit.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h" #include "RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h" -#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" +#include "Geometry/CommonTopologies/interface/GluedGeomDet.h" #include "DataFormats/SiStripCluster/interface/SiStripCluster.h" #include "RecoLocalTracker/ClusterParameterEstimator/interface/StripClusterParameterEstimator.h" #include "RecoLocalTracker/SiStripRecHitConverter/interface/SiStripRecHitMatcher.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelGeomDetUnit.h" #include #include diff --git a/RecoVertex/V0Producer/BuildFile.xml b/RecoVertex/V0Producer/BuildFile.xml index da5388f030cba..6cd6153817c25 100644 --- a/RecoVertex/V0Producer/BuildFile.xml +++ b/RecoVertex/V0Producer/BuildFile.xml @@ -6,7 +6,7 @@ - + diff --git a/RecoVertex/V0Producer/src/V0Fitter.cc b/RecoVertex/V0Producer/src/V0Fitter.cc index ba75035ef00d7..a9073d8f07ff3 100644 --- a/RecoVertex/V0Producer/src/V0Fitter.cc +++ b/RecoVertex/V0Producer/src/V0Fitter.cc @@ -19,7 +19,7 @@ #include "V0Fitter.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "TrackingTools/PatternTools/interface/ClosestApproachInRPhi.h" #include "TrackingTools/PatternTools/interface/TSCBLBuilderNoMaterial.h" #include "TrackingTools/Records/interface/TransientTrackRecord.h" diff --git a/RecoVertex/V0Producer/test/BuildFile.xml b/RecoVertex/V0Producer/test/BuildFile.xml index de76f912dccc6..f628cfd54c686 100644 --- a/RecoVertex/V0Producer/test/BuildFile.xml +++ b/RecoVertex/V0Producer/test/BuildFile.xml @@ -9,7 +9,7 @@ - + diff --git a/RecoVertex/V0Producer/test/V0Analyzer.cc b/RecoVertex/V0Producer/test/V0Analyzer.cc index 1f7304b4b155a..a939f3f00c33b 100644 --- a/RecoVertex/V0Producer/test/V0Analyzer.cc +++ b/RecoVertex/V0Producer/test/V0Analyzer.cc @@ -47,11 +47,11 @@ #include "SimDataFormats/Vertex/interface/SimVertex.h" #include "SimDataFormats/Vertex/interface/SimVertexContainer.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GluedGeomDet.h" #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" diff --git a/TrackPropagation/SteppingHelixPropagator/test/SteppingHelixPropagatorAnalyzer.cc b/TrackPropagation/SteppingHelixPropagator/test/SteppingHelixPropagatorAnalyzer.cc index 78dd88258ef17..83799e7492f95 100644 --- a/TrackPropagation/SteppingHelixPropagator/test/SteppingHelixPropagatorAnalyzer.cc +++ b/TrackPropagation/SteppingHelixPropagator/test/SteppingHelixPropagatorAnalyzer.cc @@ -40,7 +40,7 @@ #include "DataFormats/GeometrySurface/interface/Cylinder.h" #include "DataFormats/GeometrySurface/interface/Plane.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "Geometry/CSCGeometry/interface/CSCGeometry.h" @@ -48,7 +48,7 @@ //#include "Geometry/RPCGeometry/interface/RPCRoll.h" #include "Geometry/Records/interface/MuonGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" diff --git a/TrackingTools/DetLayers/interface/CylinderBuilderFromDet.h b/TrackingTools/DetLayers/interface/CylinderBuilderFromDet.h index d53706edd5be7..7cb3b094a15e7 100644 --- a/TrackingTools/DetLayers/interface/CylinderBuilderFromDet.h +++ b/TrackingTools/DetLayers/interface/CylinderBuilderFromDet.h @@ -9,7 +9,7 @@ * */ -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/GeometrySurface/interface/BoundCylinder.h" #include diff --git a/TrackingTools/DetLayers/interface/DetGroup.h b/TrackingTools/DetLayers/interface/DetGroup.h index 4e4f9ae7330ab..bba39d9a79af1 100644 --- a/TrackingTools/DetLayers/interface/DetGroup.h +++ b/TrackingTools/DetLayers/interface/DetGroup.h @@ -1,7 +1,7 @@ #ifndef DetLayers_DetGroup_h #define DetLayers_DetGroup_h -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include #include diff --git a/TrackingTools/DetLayers/interface/GeomDetCompatibilityChecker.h b/TrackingTools/DetLayers/interface/GeomDetCompatibilityChecker.h index a8fc2f123f76a..e6a75b7495ff7 100644 --- a/TrackingTools/DetLayers/interface/GeomDetCompatibilityChecker.h +++ b/TrackingTools/DetLayers/interface/GeomDetCompatibilityChecker.h @@ -1,7 +1,7 @@ #ifndef DetLayers_GeomDetCompatibilityChecker_h #define DetLayers_GeomDetCompatibilityChecker_h -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/GeomPropagators/interface/Propagator.h" #include "TrackingTools/DetLayers/interface/MeasurementEstimator.h" diff --git a/TrackingTools/DetLayers/interface/GeometricSearchDet.h b/TrackingTools/DetLayers/interface/GeometricSearchDet.h index 1edebebde48e5..8072ca5f39ec8 100644 --- a/TrackingTools/DetLayers/interface/GeometricSearchDet.h +++ b/TrackingTools/DetLayers/interface/GeometricSearchDet.h @@ -1,7 +1,7 @@ #ifndef DetLayers_GeometricSearchDet_h #define DetLayers_GeometricSearchDet_h -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/GeometrySurface/interface/BoundSurface.h" #include "TrackingTools/DetLayers/interface/DetGroup.h" diff --git a/TrackingTools/DetLayers/interface/PeriodicBinFinderInZ.h b/TrackingTools/DetLayers/interface/PeriodicBinFinderInZ.h index ade7bfb905897..f061fcd76bfa8 100644 --- a/TrackingTools/DetLayers/interface/PeriodicBinFinderInZ.h +++ b/TrackingTools/DetLayers/interface/PeriodicBinFinderInZ.h @@ -2,7 +2,7 @@ #define DetLayers_PeriodicBinFinderInZ_H #include "Utilities/BinningTools/interface/BaseBinFinder.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include /** Bin finder along the global Z for (almost) equidistant bins. diff --git a/TrackingTools/DetLayers/interface/PhiBorderFinder.h b/TrackingTools/DetLayers/interface/PhiBorderFinder.h index 460bc57d5b51c..39a1c73084616 100644 --- a/TrackingTools/DetLayers/interface/PhiBorderFinder.h +++ b/TrackingTools/DetLayers/interface/PhiBorderFinder.h @@ -8,7 +8,7 @@ * \author N. Amapane - INFN Torino */ -#include +#include #include #include diff --git a/TrackingTools/DetLayers/interface/RBorderFinder.h b/TrackingTools/DetLayers/interface/RBorderFinder.h index ca34935ba54e9..bdf8f70b90e20 100644 --- a/TrackingTools/DetLayers/interface/RBorderFinder.h +++ b/TrackingTools/DetLayers/interface/RBorderFinder.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #include diff --git a/TrackingTools/DetLayers/interface/RodPlaneBuilderFromDet.h b/TrackingTools/DetLayers/interface/RodPlaneBuilderFromDet.h index 5b6109f22414f..b13808b3af7d2 100644 --- a/TrackingTools/DetLayers/interface/RodPlaneBuilderFromDet.h +++ b/TrackingTools/DetLayers/interface/RodPlaneBuilderFromDet.h @@ -1,7 +1,7 @@ #ifndef DetLayers_RodPlaneBuilderFromDet_H #define DetLayers_RodPlaneBuilderFromDet_H -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/GeometrySurface/interface/Plane.h" #include diff --git a/TrackingTools/DetLayers/src/DetRodOneR.cc b/TrackingTools/DetLayers/src/DetRodOneR.cc index faccf36ce2c71..80ea9eec585a1 100644 --- a/TrackingTools/DetLayers/src/DetRodOneR.cc +++ b/TrackingTools/DetLayers/src/DetRodOneR.cc @@ -3,7 +3,7 @@ #include "TrackingTools/DetLayers/interface/RodPlaneBuilderFromDet.h" #include -#include +#include #include #include diff --git a/TrackingTools/DetLayers/src/ForwardDetRing.cc b/TrackingTools/DetLayers/src/ForwardDetRing.cc index ee097fcf3ce95..6908cd0c9fb51 100644 --- a/TrackingTools/DetLayers/src/ForwardDetRing.cc +++ b/TrackingTools/DetLayers/src/ForwardDetRing.cc @@ -1,7 +1,7 @@ #include "TrackingTools/DetLayers/interface/ForwardDetRing.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" //#include "TrackingTools/DetLayers/interface/ForwardRingDiskBuilderFromDet.h" -//#include "Geometry/CommonDetUnit/interface/ModifiedSurfaceGenerator.h" +//#include "Geometry/CommonTopologies/interface/ModifiedSurfaceGenerator.h" #include #include diff --git a/TrackingTools/DetLayers/src/ForwardDetRingOneZ.cc b/TrackingTools/DetLayers/src/ForwardDetRingOneZ.cc index 86d654cfce0ac..e7d51ca3bbc88 100644 --- a/TrackingTools/DetLayers/src/ForwardDetRingOneZ.cc +++ b/TrackingTools/DetLayers/src/ForwardDetRingOneZ.cc @@ -4,7 +4,7 @@ //#include "TrackingTools/GeomPropagators/interface/Propagator.h" #include -#include +#include #include #include diff --git a/TrackingTools/GsfTools/BuildFile.xml b/TrackingTools/GsfTools/BuildFile.xml index 03ff0ce3c650e..49f788bd2c4ba 100644 --- a/TrackingTools/GsfTools/BuildFile.xml +++ b/TrackingTools/GsfTools/BuildFile.xml @@ -5,7 +5,7 @@ - + diff --git a/TrackingTools/GsfTools/src/MultiTrajectoryStateTransform.cc b/TrackingTools/GsfTools/src/MultiTrajectoryStateTransform.cc index 35bf96743fd42..88858e21100cf 100644 --- a/TrackingTools/GsfTools/src/MultiTrajectoryStateTransform.cc +++ b/TrackingTools/GsfTools/src/MultiTrajectoryStateTransform.cc @@ -7,8 +7,8 @@ #include "TrackingTools/GsfTools/interface/BasicMultiTrajectoryState.h" #include "TrackingTools/TrajectoryParametrization/interface/LocalTrajectoryParameters.h" #include "TrackingTools/TrajectoryParametrization/interface/LocalTrajectoryError.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/GeomPropagators/interface/AnalyticalPropagator.h" #include "TrackingTools/GsfTools/interface/GsfPropagatorAdapter.h" #include "TrackingTools/PatternTools/interface/TransverseImpactPointExtrapolator.h" diff --git a/TrackingTools/KalmanUpdators/BuildFile.xml b/TrackingTools/KalmanUpdators/BuildFile.xml index 4979580f0beb4..d75ad4d4fb5c3 100644 --- a/TrackingTools/KalmanUpdators/BuildFile.xml +++ b/TrackingTools/KalmanUpdators/BuildFile.xml @@ -6,7 +6,7 @@ - + diff --git a/TrackingTools/KalmanUpdators/src/Chi2Strip1DEstimator.cc b/TrackingTools/KalmanUpdators/src/Chi2Strip1DEstimator.cc index 73e221396f052..36a658a298d1e 100644 --- a/TrackingTools/KalmanUpdators/src/Chi2Strip1DEstimator.cc +++ b/TrackingTools/KalmanUpdators/src/Chi2Strip1DEstimator.cc @@ -1,7 +1,7 @@ #include "TrackingTools/KalmanUpdators/interface/Chi2Strip1DEstimator.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h" using namespace std; diff --git a/TrackingTools/KalmanUpdators/src/Chi2Switching1DEstimator.cc b/TrackingTools/KalmanUpdators/src/Chi2Switching1DEstimator.cc index 920432d2ee2b7..3b9e037121a2f 100644 --- a/TrackingTools/KalmanUpdators/src/Chi2Switching1DEstimator.cc +++ b/TrackingTools/KalmanUpdators/src/Chi2Switching1DEstimator.cc @@ -1,6 +1,6 @@ #include "TrackingTools/KalmanUpdators/interface/Chi2Switching1DEstimator.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h" using namespace std; diff --git a/TrackingTools/KalmanUpdators/src/KFSwitching1DUpdator.cc b/TrackingTools/KalmanUpdators/src/KFSwitching1DUpdator.cc index c5a1e93d71f1f..1dd7e7e6d0cf7 100644 --- a/TrackingTools/KalmanUpdators/src/KFSwitching1DUpdator.cc +++ b/TrackingTools/KalmanUpdators/src/KFSwitching1DUpdator.cc @@ -1,7 +1,7 @@ #include "TrackingTools/KalmanUpdators/interface/KFSwitching1DUpdator.h" #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" TrajectoryStateOnSurface KFSwitching1DUpdator::update(const TSOS& aTsos, const TrackingRecHit& aHit) const { if (!aHit.detUnit() || aHit.detUnit()->type().isTrackerPixel() || diff --git a/TrackingTools/KalmanUpdators/src/Strip1DMeasurementTransformator.cc b/TrackingTools/KalmanUpdators/src/Strip1DMeasurementTransformator.cc index b80c995b0ece6..2b7ed0ae4a63f 100644 --- a/TrackingTools/KalmanUpdators/src/Strip1DMeasurementTransformator.cc +++ b/TrackingTools/KalmanUpdators/src/Strip1DMeasurementTransformator.cc @@ -1,6 +1,6 @@ #include "TrackingTools/KalmanUpdators/interface/Strip1DMeasurementTransformator.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetType.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDetType.h" // #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h" #include "Geometry/CommonTopologies/interface/RadialStripTopology.h" diff --git a/TrackingTools/KalmanUpdators/test/KFUpdator_t.cpp b/TrackingTools/KalmanUpdators/test/KFUpdator_t.cpp index 5c8d6f27516dc..1c6cf8148075b 100644 --- a/TrackingTools/KalmanUpdators/test/KFUpdator_t.cpp +++ b/TrackingTools/KalmanUpdators/test/KFUpdator_t.cpp @@ -4,7 +4,7 @@ #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "DataFormats/GeometrySurface/interface/Surface.h" #include "DataFormats/GeometrySurface/interface/BoundPlane.h" -#include +#include #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/TrackingTools/MeasurementDet/interface/MeasurementDet.h b/TrackingTools/MeasurementDet/interface/MeasurementDet.h index 181ef2512efe8..c960ab611758f 100644 --- a/TrackingTools/MeasurementDet/interface/MeasurementDet.h +++ b/TrackingTools/MeasurementDet/interface/MeasurementDet.h @@ -3,7 +3,7 @@ #include "TrackingTools/MeasurementDet/interface/TempMeasurements.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/PatternTools/interface/TrajectoryMeasurement.h" #include "DataFormats/TrackerRecHit2D/interface/BaseTrackerRecHit.h" #include "DataFormats/TrackingRecHit/interface/InvalidTrackingRecHit.h" diff --git a/TrackingTools/MeasurementDet/src/LayerMeasurements.cc b/TrackingTools/MeasurementDet/src/LayerMeasurements.cc index cf41ebece1746..fa8bc97e2c628 100644 --- a/TrackingTools/MeasurementDet/src/LayerMeasurements.cc +++ b/TrackingTools/MeasurementDet/src/LayerMeasurements.cc @@ -36,7 +36,7 @@ namespace { // (e.g. global position of TSOS within detector volume) // - current implementation does not make use of layer argument, // see below for an example of how to use it - // #include "Geometry/CommonDetUnit/interface/GeomDetEnumerators.h" + // #include "Geometry/CommonTopologies/interface/GeomDetEnumerators.h" // [..] // using namespace GeomDetEnumerators; // auto const& det = layer.subDetector(); diff --git a/TrackingTools/PatternTools/BuildFile.xml b/TrackingTools/PatternTools/BuildFile.xml index 041003a4a4026..f281470d00db9 100644 --- a/TrackingTools/PatternTools/BuildFile.xml +++ b/TrackingTools/PatternTools/BuildFile.xml @@ -7,7 +7,7 @@ - + diff --git a/TrackingTools/PatternTools/src/TempTrajectory.cc b/TrackingTools/PatternTools/src/TempTrajectory.cc index 211f6c0641866..951014cc2dbe5 100644 --- a/TrackingTools/PatternTools/src/TempTrajectory.cc +++ b/TrackingTools/PatternTools/src/TempTrajectory.cc @@ -4,7 +4,7 @@ #include "DataFormats/TrackerRecHit2D/interface/OmniClusterRef.h" #include "DataFormats/TrackerRecHit2D/interface/BaseTrackerRecHit.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "FWCore/Utilities/interface/Exception.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "FWCore/Utilities/interface/Likely.h" diff --git a/TrackingTools/TrackAssociator/BuildFile.xml b/TrackingTools/TrackAssociator/BuildFile.xml index a5d4c7af07a7d..2214cc6bbaf01 100644 --- a/TrackingTools/TrackAssociator/BuildFile.xml +++ b/TrackingTools/TrackAssociator/BuildFile.xml @@ -21,7 +21,7 @@ - + diff --git a/TrackingTools/TrackAssociator/interface/CachedTrajectory.h b/TrackingTools/TrackAssociator/interface/CachedTrajectory.h index 31c1cef5b622e..3d7af381cfe30 100644 --- a/TrackingTools/TrackAssociator/interface/CachedTrajectory.h +++ b/TrackingTools/TrackAssociator/interface/CachedTrajectory.h @@ -25,8 +25,8 @@ #include "TrackingTools/TrackAssociator/interface/TAMuonChamberMatch.h" #include "TrackingTools/TrackAssociator/interface/FiducialVolume.h" #include "TrackPropagation/SteppingHelixPropagator/interface/SteppingHelixStateInfo.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/DetId/interface/DetId.h" #include #include "FWCore/Utilities/interface/Visibility.h" diff --git a/TrackingTools/TrackAssociator/interface/DetIdAssociator.h b/TrackingTools/TrackAssociator/interface/DetIdAssociator.h index 22d054418a57b..76733f304efba 100644 --- a/TrackingTools/TrackAssociator/interface/DetIdAssociator.h +++ b/TrackingTools/TrackAssociator/interface/DetIdAssociator.h @@ -38,7 +38,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "TrackPropagation/SteppingHelixPropagator/interface/SteppingHelixStateInfo.h" #include "TrackingTools/TrackAssociator/interface/FiducialVolume.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include #include diff --git a/TrackingTools/TrackAssociator/plugins/MuonDetIdAssociator.h b/TrackingTools/TrackAssociator/plugins/MuonDetIdAssociator.h index fbdb7dd342c9a..edd4b5e3b0e76 100644 --- a/TrackingTools/TrackAssociator/plugins/MuonDetIdAssociator.h +++ b/TrackingTools/TrackAssociator/plugins/MuonDetIdAssociator.h @@ -21,8 +21,8 @@ #include "TrackingTools/TrackAssociator/interface/DetIdAssociator.h" #include "TrackingTools/TrackAssociator/interface/TAMuonChamberMatch.h" #include "TrackPropagation/SteppingHelixPropagator/interface/SteppingHelixStateInfo.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "DataFormats/DetId/interface/DetId.h" #include "CondFormats/CSCObjects/interface/CSCBadChambers.h" diff --git a/TrackingTools/TrackAssociator/src/TrackDetectorAssociator.cc b/TrackingTools/TrackAssociator/src/TrackDetectorAssociator.cc index b31118fbdba1a..f19a6c97a6481 100644 --- a/TrackingTools/TrackAssociator/src/TrackDetectorAssociator.cc +++ b/TrackingTools/TrackAssociator/src/TrackDetectorAssociator.cc @@ -44,7 +44,7 @@ #include "DataFormats/GEMRecHit/interface/ME0RecHitCollection.h" // calorimeter and muon infos -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "Geometry/Records/interface/MuonGeometryRecord.h" #include "Geometry/DTGeometry/interface/DTGeometry.h" diff --git a/TrackingTools/TrackAssociator/test/BuildFile.xml b/TrackingTools/TrackAssociator/test/BuildFile.xml index 3e6e780b4a5dc..05426c505987a 100644 --- a/TrackingTools/TrackAssociator/test/BuildFile.xml +++ b/TrackingTools/TrackAssociator/test/BuildFile.xml @@ -7,7 +7,7 @@ - + diff --git a/TrackingTools/TrackAssociator/test/CaloMatchingExample.cc b/TrackingTools/TrackAssociator/test/CaloMatchingExample.cc index 732d7975f8681..32d98795ccd52 100644 --- a/TrackingTools/TrackAssociator/test/CaloMatchingExample.cc +++ b/TrackingTools/TrackAssociator/test/CaloMatchingExample.cc @@ -62,7 +62,7 @@ #include "DataFormats/GeometrySurface/interface/Cylinder.h" #include "DataFormats/GeometrySurface/interface/Plane.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" diff --git a/TrackingTools/TrackAssociator/test/TestTrackAssociator.cc b/TrackingTools/TrackAssociator/test/TestTrackAssociator.cc index 48a63e78cf563..266288f52c16d 100644 --- a/TrackingTools/TrackAssociator/test/TestTrackAssociator.cc +++ b/TrackingTools/TrackAssociator/test/TestTrackAssociator.cc @@ -64,7 +64,7 @@ #include "DataFormats/GeometrySurface/interface/Cylinder.h" #include "DataFormats/GeometrySurface/interface/Plane.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" diff --git a/TrackingTools/TrackRefitter/interface/TrackTransformer.h b/TrackingTools/TrackRefitter/interface/TrackTransformer.h index 89576e7e1223b..97411a7145ba8 100644 --- a/TrackingTools/TrackRefitter/interface/TrackTransformer.h +++ b/TrackingTools/TrackRefitter/interface/TrackTransformer.h @@ -21,7 +21,7 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Utilities/interface/ESGetToken.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h" #include "TrackingTools/PatternTools/interface/TrajectoryFwd.h" diff --git a/TrackingTools/TrackRefitter/interface/TrackTransformerForCosmicMuons.h b/TrackingTools/TrackRefitter/interface/TrackTransformerForCosmicMuons.h index 06741dedf1187..50171263539e4 100644 --- a/TrackingTools/TrackRefitter/interface/TrackTransformerForCosmicMuons.h +++ b/TrackingTools/TrackRefitter/interface/TrackTransformerForCosmicMuons.h @@ -22,7 +22,7 @@ #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "FWCore/Framework/interface/ConsumesCollector.h" #include "FWCore/Framework/interface/ESHandle.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" diff --git a/TrackingTools/TrackRefitter/interface/TrackTransformerForGlobalCosmicMuons.h b/TrackingTools/TrackRefitter/interface/TrackTransformerForGlobalCosmicMuons.h index f2a59e95a6bef..f39fe573f04e9 100644 --- a/TrackingTools/TrackRefitter/interface/TrackTransformerForGlobalCosmicMuons.h +++ b/TrackingTools/TrackRefitter/interface/TrackTransformerForGlobalCosmicMuons.h @@ -16,7 +16,7 @@ #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "FWCore/Framework/interface/ConsumesCollector.h" #include "FWCore/Framework/interface/ESHandle.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" diff --git a/TrackingTools/TrackRefitter/src/SeedTransformer.cc b/TrackingTools/TrackRefitter/src/SeedTransformer.cc index 4287fc7a005be..7ab509d3aa3b4 100644 --- a/TrackingTools/TrackRefitter/src/SeedTransformer.cc +++ b/TrackingTools/TrackRefitter/src/SeedTransformer.cc @@ -25,8 +25,8 @@ // Geometry and Magnetic field #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" // Other include files #include "TrackingTools/Records/interface/TransientRecHitRecord.h" diff --git a/TrackingTools/TrackRefitter/test/TrackReader.cc b/TrackingTools/TrackRefitter/test/TrackReader.cc index 464a48b094717..3592acf6584a8 100644 --- a/TrackingTools/TrackRefitter/test/TrackReader.cc +++ b/TrackingTools/TrackRefitter/test/TrackReader.cc @@ -16,8 +16,8 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/InputTag.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h" diff --git a/TrackingTools/TrackRefitter/test/TrajectoryReader.cc b/TrackingTools/TrackRefitter/test/TrajectoryReader.cc index bfff8818871b6..4df13f41cd587 100644 --- a/TrackingTools/TrackRefitter/test/TrajectoryReader.cc +++ b/TrackingTools/TrackRefitter/test/TrajectoryReader.cc @@ -15,8 +15,8 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/InputTag.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h" diff --git a/TrackingTools/TrajectoryState/src/TrajectoryStateTransform.cc b/TrackingTools/TrajectoryState/src/TrajectoryStateTransform.cc index fe4492c88b7f4..f55a338bfd98c 100644 --- a/TrackingTools/TrajectoryState/src/TrajectoryStateTransform.cc +++ b/TrackingTools/TrajectoryState/src/TrajectoryStateTransform.cc @@ -4,8 +4,8 @@ #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h" #include "DataFormats/GeometrySurface/interface/Surface.h" #include "TrackingTools/TrajectoryParametrization/interface/GlobalTrajectoryParameters.h" -#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/TrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" namespace trajectoryStateTransform { diff --git a/TrackingTools/TransientTrack/BuildFile.xml b/TrackingTools/TransientTrack/BuildFile.xml index 62375f101bd31..be6c45d774b3f 100644 --- a/TrackingTools/TransientTrack/BuildFile.xml +++ b/TrackingTools/TransientTrack/BuildFile.xml @@ -3,7 +3,7 @@ - + diff --git a/TrackingTools/TransientTrack/interface/BasicTransientTrack.h b/TrackingTools/TransientTrack/interface/BasicTransientTrack.h index f1ceaf97168a8..a40767bbfc865 100644 --- a/TrackingTools/TransientTrack/interface/BasicTransientTrack.h +++ b/TrackingTools/TransientTrack/interface/BasicTransientTrack.h @@ -11,7 +11,7 @@ #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateClosestToPoint.h" #include "FWCore/Framework/interface/ESHandle.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "DataFormats/BeamSpot/interface/BeamSpot.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateClosestToBeamLine.h" #include "DataFormats/Candidate/interface/CandidateFwd.h" diff --git a/TrackingTools/TransientTrack/plugins/BuildFile.xml b/TrackingTools/TransientTrack/plugins/BuildFile.xml index bd9adad1c63ed..357e338ddaf41 100644 --- a/TrackingTools/TransientTrack/plugins/BuildFile.xml +++ b/TrackingTools/TransientTrack/plugins/BuildFile.xml @@ -1,5 +1,5 @@ - + diff --git a/TrackingTools/TransientTrack/plugins/TransientTrackBuilderESProducer.cc b/TrackingTools/TransientTrack/plugins/TransientTrackBuilderESProducer.cc index b4dace3a55c5a..441d5ea44219a 100644 --- a/TrackingTools/TransientTrack/plugins/TransientTrackBuilderESProducer.cc +++ b/TrackingTools/TransientTrack/plugins/TransientTrackBuilderESProducer.cc @@ -8,7 +8,7 @@ #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" -#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "TrackingTools/Records/interface/TransientTrackRecord.h" diff --git a/TrackingTools/TransientTrackingRecHit/BuildFile.xml b/TrackingTools/TransientTrackingRecHit/BuildFile.xml index 688af1dfdce8e..2d0c2447d519c 100644 --- a/TrackingTools/TransientTrackingRecHit/BuildFile.xml +++ b/TrackingTools/TransientTrackingRecHit/BuildFile.xml @@ -2,7 +2,7 @@ - + diff --git a/TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h b/TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h index cfeecb06d2b4d..b273df48af419 100644 --- a/TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h +++ b/TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h @@ -2,7 +2,7 @@ #define TransientTrackingRecHit_H #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" -#include "Geometry/CommonDetUnit/interface/GeomDet.h" +#include "Geometry/CommonTopologies/interface/GeomDet.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "DataFormats/GeometrySurface/interface/Surface.h"