From 389d6c3067aaee941c288fd3b6be36b597e19456 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Wed, 21 Jun 2017 12:15:38 +0200 Subject: [PATCH] Merge and resolve conflicts --- Alignment/APEEstimation/plugins/ApeEstimator.cc | 2 +- Alignment/CommonAlignment/src/AlignableBeamSpot.cc | 2 +- Alignment/CommonAlignment/src/AlignableDet.cc | 2 +- Alignment/CommonAlignment/src/AlignableDetUnit.cc | 2 +- Alignment/CommonAlignment/src/AlignableExtras.cc | 2 +- Alignment/HIPAlignmentAlgorithm/interface/LhcTrackAnalyzer.h | 2 +- Alignment/LaserAlignment/plugins/TkLasBeamFitter.cc | 2 +- Alignment/LaserAlignmentSimulation/test/SimAnalyzer.cc | 2 +- .../plugins/MillePedeAlignmentAlgorithm.cc | 2 +- Alignment/MillePedeAlignmentAlgorithm/src/MillePedeMonitor.cc | 2 +- Alignment/MillePedeAlignmentAlgorithm/src/PedeSteerer.cc | 2 +- .../src/PedeSteererWeakModeConstraints.cc | 2 +- Alignment/OfflineValidation/plugins/PrimaryVertexValidation.h | 2 +- .../OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc | 2 +- .../OfflineValidation/plugins/TrackerOfflineValidation.cc | 2 +- Alignment/OfflineValidation/src/TrackerValidationVariables.cc | 2 +- Alignment/TrackerAlignment/plugins/TrackerTreeGenerator.cc | 2 +- Alignment/TrackerAlignment/src/AlignableTrackerBuilder.cc | 2 +- .../TrackInfoProducer/src/TrackInfoProducerAlgorithm.cc | 2 +- .../SiStripObjects/test/plugins/testSiStripHashedDetId.cc | 2 +- .../SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc | 2 +- .../SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h | 2 +- CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc | 2 +- .../SiStripChannelGain/interface/SiStripGainsPCLWorker.h | 2 +- .../SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc | 2 +- .../SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc | 2 +- .../SiStripChannelGain/plugins/SiStripGainFromData.cc | 2 +- .../SiStripChannelGain/plugins/SiStripGainRandomCalculator.cc | 2 +- CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h | 2 +- .../SiStripCommon/plugins/SiStripDetInfoFileWriter.cc | 2 +- .../plugins/SiStripHitEffFromCalibTree.cc | 2 +- CalibTracker/SiStripHitEfficiency/src/HitEff.cc | 2 +- .../SiStripHitEfficiency/src/TrajectoryAtInvalidHit.cc | 2 +- .../SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc | 2 +- .../SiStripQuality/plugins/SiStripBadStripFromASCIIFile.cc | 2 +- Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc | 2 +- CondTools/SiPixel/test/SiPixelPerformanceSummaryBuilder.cc | 2 +- CondTools/SiStrip/plugins/SiStripDetVOffFakeBuilder.cc | 2 +- DPGAnalysis/SiStripTools/plugins/TrackerDpgAnalysis.cc | 2 +- DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h | 2 +- DQM/SiPixelMonitorCluster/interface/SiPixelClusterSource.h | 2 +- DQM/SiPixelMonitorDigi/interface/SiPixelDigiModule.h | 2 +- .../src/FineDelayHistosUsingDb.cc | 2 +- .../plugins/tracking/SiStripFineDelayHit.cc | 2 +- .../plugins/tracking/SiStripFineDelayTLA.cc | 2 +- DataFormats/TrackerRecHit2D/interface/TrackerSingleRecHit.h | 2 +- DataFormats/TrackingRecHit/src/TrackingRecHit.cc | 2 +- FastSimulation/Muons/plugins/FastTSGFromPropagation.cc | 2 +- .../Tracking/interface/TrajectorySeedHitCandidate.h | 2 +- FastSimulation/Tracking/test/testGeneralTracks.cc | 2 +- .../plugins/FastTrackerRecHitMatcher.cc | 2 +- .../plugins/PixelBarrelTemplateSmearerPlugin.cc | 2 +- .../plugins/PixelForwardTemplateSmearerPlugin.cc | 2 +- .../TrackingRecHitProducer/src/PixelTemplateSmearerBase.cc | 2 +- FastSimulation/TrajectoryManager/src/TrajectoryManager.cc | 2 +- Geometry/CSCGeometry/interface/CSCLayer.h | 2 +- Geometry/CSCGeometry/src/CSCGeometry.cc | 2 +- Geometry/CommonDetUnit/interface/DetPositioner.h | 2 +- Geometry/CommonDetUnit/interface/GeomDetUnit.h | 1 - Geometry/CommonDetUnit/src/GeomDet.cc | 2 +- Geometry/DTGeometry/interface/DTLayer.h | 2 +- Geometry/DTGeometry/src/DTGeometry.cc | 2 +- Geometry/DTGeometry/test/DTGeometryAnalyzer.cc | 2 +- Geometry/GEMGeometry/interface/GEMEtaPartition.h | 2 +- Geometry/GEMGeometry/interface/ME0EtaPartition.h | 2 +- Geometry/GEMGeometry/src/GEMGeometry.cc | 2 +- Geometry/GEMGeometry/src/ME0Geometry.cc | 2 +- Geometry/RPCGeometry/interface/RPCRoll.h | 2 +- Geometry/RPCGeometry/src/RPCGeometry.cc | 2 +- Geometry/TrackerGeometryBuilder/interface/GeomDetLess.h | 1 - Geometry/TrackerGeometryBuilder/interface/GluedGeomDet.h | 1 - .../interface/PlaneBuilderForGluedDet.h | 2 +- .../src/TrackerGeomBuilderFromGeometricDet.cc | 2 +- Geometry/TrackerGeometryBuilder/src/TrackerGeometry.cc | 2 +- Geometry/TrackingGeometryAligner/interface/GeometryAligner.h | 1 - JetMETCorrections/IsolatedParticles/test/TestIsoSimTracks.cc | 2 +- JetMETCorrections/IsolatedParticles/test/TestIsoTracks.cc | 2 +- .../EgammaElectronAlgos/interface/SiStripElectronAlgo.h | 2 +- .../interface/SiStripElectronSeedGenerator.h | 2 +- .../EgammaPhotonProducers/interface/ConversionProducer.h | 2 +- RecoEgamma/EgammaPhotonProducers/src/ConversionTrackMerger.cc | 2 +- RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.cc | 2 +- .../interface/ClusterParameterEstimator.h | 2 +- .../interface/PixelClusterParameterEstimator.h | 2 +- .../interface/StripClusterParameterEstimator.h | 2 +- .../Phase2TrackerRecHits/interface/Phase2StripCPE.h | 2 +- .../Phase2TrackerRecHits/interface/Phase2StripCPEGeometric.h | 2 +- .../Phase2TrackerRecHits/plugins/Phase2TrackerRecHits.cc | 2 +- .../Phase2TrackerRecHits/test/RecHitsValidation.cc | 2 +- .../SiPhase2Clusterizer/plugins/Phase2TrackerClusterizer.cc | 2 +- .../SiPhase2Clusterizer/test/ClustersValidation.cc | 2 +- RecoLocalTracker/SiPixelClusterizer/test/ReadPixClusters.cc | 2 +- RecoLocalTracker/SiPixelClusterizer/test/TestClusters.cc | 2 +- RecoLocalTracker/SiPixelClusterizer/test/TestPixTracks.cc | 2 +- RecoLocalTracker/SiPixelClusterizer/test/TestWithTracks.cc | 2 +- RecoLocalTracker/SiPixelClusterizer/test/Triplet.cc | 2 +- RecoLocalTracker/SiPixelRecHits/test/ReadPixelRecHit.cc | 2 +- .../SiStripRecHitConverter/interface/SiStripRecHitMatcher.h | 2 +- .../SubCollectionProducers/src/HITrackClusterRemover.cc | 2 +- .../SubCollectionProducers/src/HLTTrackClusterRemoverNew.cc | 2 +- .../SubCollectionProducers/src/SeedClusterRemover.cc | 2 +- .../SubCollectionProducers/src/SeedClusterRemoverPhase2.cc | 2 +- RecoMET/METAlgorithms/interface/EcalHaloAlgo.h | 2 +- RecoMuon/GlobalTrackingTools/src/GlobalMuonTrackMatcher.cc | 2 +- RecoMuon/MuonIdentification/test/RPCMuonAnalyzer.cc | 2 +- RecoMuon/MuonSeedGenerator/src/RPCSeedOverlapper.cc | 2 +- .../src/MuonTransientTrackingRecHit.cc | 2 +- .../PixelLowPtUtilities/interface/ClusterShapeHitFilter.h | 2 +- .../PixelLowPtUtilities/src/ClusterShapeHitFilter.cc | 2 +- RecoPixelVertexing/PixelLowPtUtilities/src/TrackFitter.cc | 2 +- .../PixelLowPtUtilities/test/ClusterShapeExtractor.cc | 2 +- .../src/PixelFitterByConformalMappingAndLine.cc | 2 +- .../PixelTrackFitting/src/PixelFitterByHelixProjections.cc | 2 +- RecoTracker/DeDx/interface/DeDxTools.h | 2 +- RecoTracker/DebugTools/interface/CkfDebugger.h | 2 +- RecoTracker/DebugTools/interface/TSOSFromSimHitFactory.h | 2 +- RecoTracker/DebugTools/src/FTSFromSimHitFactory.cc | 2 +- .../FinalTrackSelectors/plugins/CosmicTrackSplitter.cc | 2 +- .../FinalTrackSelectors/plugins/SimpleTrackListMerger.cc | 2 +- RecoTracker/FinalTrackSelectors/plugins/TrackListMerger.cc | 2 +- RecoTracker/MeasurementDet/plugins/MeasurementTrackerImpl.cc | 2 +- .../interface/CosmicRegionalSeedGenerator.h | 2 +- RecoTracker/TkDetLayers/src/BladeShapeBuilderFromDet.h | 2 +- RecoTracker/TkDetLayers/src/ForwardDiskSectorBuilderFromDet.h | 2 +- RecoTracker/TkDetLayers/src/GeometricSearchTrackerBuilder.cc | 2 +- RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.cc | 2 +- .../TkMSParametrization/src/MSLayersKeeperX0DetLayer.cc | 2 +- .../TransientTrackingRecHit/interface/TSiPixelRecHit.h | 2 +- .../interface/TSiStripRecHit2DLocalPos.h | 2 +- RecoTracker/TransientTrackingRecHit/src/TkClonerImpl.cc | 2 +- RecoVertex/V0Producer/test/V0Analyzer.cc | 2 +- SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.cc | 2 +- SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.h | 2 +- SUSYBSMAnalysis/HSCP/plugins/HSCPTreeBuilder.cc | 2 +- .../DataMixingModule/plugins/DataMixingSiPixelMCDigiWorker.h | 2 +- .../DataMixingModule/plugins/DataMixingSiStripMCDigiWorker.h | 2 +- SimMuon/MCTruth/src/MuonAssociatorByHits.cc | 2 +- SimMuon/MCTruth/src/MuonAssociatorByHitsHelper.cc | 2 +- SimMuon/MCTruth/src/MuonToSimAssociatorByHits.cc | 2 +- .../SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc | 2 +- SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.cc | 2 +- .../SiPhase2Digitizer/test/Phase2TrackerValidateDigi.cc | 2 +- SimTracker/SiPhase2Digitizer/test/TBeamTest.cc | 2 +- SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc | 2 +- SimTracker/SiPixelDigitizer/test/PixelDigisTest.cc | 2 +- SimTracker/SiPixelDigitizer/test/PixelMixedSimHitsTest.cc | 2 +- SimTracker/SiPixelDigitizer/test/PixelSimHitsTest.cc | 2 +- SimTracker/SiPixelDigitizer/test/PixelSimHitsTestForward.cc | 2 +- SimTracker/SiStripDigitizer/plugins/DigiSimLinkAlgorithm.h | 2 +- SimTracker/SiStripDigitizer/plugins/SiHitDigitizer.h | 2 +- .../SiStripDigitizer/plugins/SiStripDigitizerAlgorithm.h | 2 +- .../plugins/TrackAssociatorByHitsImpl.cc | 2 +- SimTracker/TrackerHitAssociation/test/TestAssociator.cc | 2 +- SimTracker/TrackerHitAssociation/test/TestAssociator.h | 2 +- .../test/SteppingHelixPropagatorAnalyzer.cc | 2 +- TrackingTools/KalmanUpdators/src/Chi2Strip1DEstimator.cc | 2 +- TrackingTools/KalmanUpdators/src/Chi2Switching1DEstimator.cc | 2 +- TrackingTools/KalmanUpdators/src/KFSwitching1DUpdator.cc | 2 +- .../KalmanUpdators/src/Strip1DMeasurementTransformator.cc | 2 +- TrackingTools/PatternTools/src/TempTrajectory.cc | 2 +- TrackingTools/TrackAssociator/src/TrackDetectorAssociator.cc | 2 +- TrackingTools/TrackAssociator/test/CaloMatchingExample.cc | 2 +- TrackingTools/TrackAssociator/test/TestTrackAssociator.cc | 2 +- Validation/GlobalHits/interface/GlobalHitsAnalyzer.h | 2 +- Validation/GlobalHits/interface/GlobalHitsHistogrammer.h | 2 +- Validation/GlobalHits/interface/GlobalHitsProdHist.h | 2 +- Validation/GlobalHits/interface/GlobalHitsProducer.h | 2 +- Validation/GlobalHits/interface/GlobalHitsTester.h | 2 +- Validation/GlobalRecHits/interface/GlobalRecHitsAnalyzer.h | 2 +- Validation/GlobalRecHits/interface/GlobalRecHitsProducer.h | 2 +- Validation/MuonHits/src/MuonSimHitsValidAnalyzer.h | 2 +- Validation/RecoEgamma/plugins/PhotonValidator.cc | 2 +- Validation/RecoEgamma/plugins/TkConvValidator.cc | 2 +- Validation/RecoTrack/interface/SiPixelTrackingRecHitsValid.h | 2 +- Validation/RecoTrack/interface/SiStripTrackingRecHitsValid.h | 2 +- Validation/RecoTrack/plugins/SiPixelTrackingRecHitsValid.cc | 2 +- Validation/RecoVertex/interface/V0Validator.h | 2 +- Validation/TrackerHits/src/TrackerHitAnalyzer.cc | 4 ++-- Validation/TrackerHits/src/TrackerHitProducer.cc | 2 +- Validation/TrackerRecHits/interface/SiStripRecHitsValid.h | 2 +- Validation/TrackerRecHits/src/SiPixelRecHitsValid.cc | 2 +- 181 files changed, 178 insertions(+), 182 deletions(-) delete mode 100644 Geometry/CommonDetUnit/interface/GeomDetUnit.h delete mode 100644 Geometry/TrackerGeometryBuilder/interface/GeomDetLess.h delete mode 100644 Geometry/TrackerGeometryBuilder/interface/GluedGeomDet.h diff --git a/Alignment/APEEstimation/plugins/ApeEstimator.cc b/Alignment/APEEstimation/plugins/ApeEstimator.cc index 40fd8d068ec44..6162953a38b65 100644 --- a/Alignment/APEEstimation/plugins/ApeEstimator.cc +++ b/Alignment/APEEstimation/plugins/ApeEstimator.cc @@ -67,7 +67,7 @@ #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/CommonTopologies/interface/RadialStripTopology.h" //added by Ajay 6Nov 2014 diff --git a/Alignment/CommonAlignment/src/AlignableBeamSpot.cc b/Alignment/CommonAlignment/src/AlignableBeamSpot.cc index 372c7c6ea89bd..5d3a3e70d42ee 100644 --- a/Alignment/CommonAlignment/src/AlignableBeamSpot.cc +++ b/Alignment/CommonAlignment/src/AlignableBeamSpot.cc @@ -13,7 +13,7 @@ #include "CLHEP/Vector/RotationInterfaces.h" #include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Alignment/CommonAlignment/interface/AlignableBeamSpot.h" diff --git a/Alignment/CommonAlignment/src/AlignableDet.cc b/Alignment/CommonAlignment/src/AlignableDet.cc index 365f7d39e66d9..36324b835ba57 100644 --- a/Alignment/CommonAlignment/src/AlignableDet.cc +++ b/Alignment/CommonAlignment/src/AlignableDet.cc @@ -4,7 +4,7 @@ #include "CLHEP/Vector/RotationInterfaces.h" #include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Alignment/CommonAlignment/interface/AlignableDet.h" diff --git a/Alignment/CommonAlignment/src/AlignableDetUnit.cc b/Alignment/CommonAlignment/src/AlignableDetUnit.cc index aa34956aaa741..0d272692a0369 100644 --- a/Alignment/CommonAlignment/src/AlignableDetUnit.cc +++ b/Alignment/CommonAlignment/src/AlignableDetUnit.cc @@ -1,6 +1,6 @@ #include "Alignment/CommonAlignment/interface/AlignableDetUnit.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "CondFormats/Alignment/interface/Alignments.h" #include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h" diff --git a/Alignment/CommonAlignment/src/AlignableExtras.cc b/Alignment/CommonAlignment/src/AlignableExtras.cc index ea4c6ee0aa655..639da6b359da1 100644 --- a/Alignment/CommonAlignment/src/AlignableExtras.cc +++ b/Alignment/CommonAlignment/src/AlignableExtras.cc @@ -12,7 +12,7 @@ // Geometry #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" // Alignment #include "Alignment/CommonAlignment/interface/AlignableBeamSpot.h" diff --git a/Alignment/HIPAlignmentAlgorithm/interface/LhcTrackAnalyzer.h b/Alignment/HIPAlignmentAlgorithm/interface/LhcTrackAnalyzer.h index 7d6bf2f9f4666..b313e1fa40263 100644 --- a/Alignment/HIPAlignmentAlgorithm/interface/LhcTrackAnalyzer.h +++ b/Alignment/HIPAlignmentAlgorithm/interface/LhcTrackAnalyzer.h @@ -37,7 +37,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" diff --git a/Alignment/LaserAlignment/plugins/TkLasBeamFitter.cc b/Alignment/LaserAlignment/plugins/TkLasBeamFitter.cc index ac51277362109..65fefae77cfba 100644 --- a/Alignment/LaserAlignment/plugins/TkLasBeamFitter.cc +++ b/Alignment/LaserAlignment/plugins/TkLasBeamFitter.cc @@ -27,7 +27,7 @@ #include "FWCore/ServiceRegistry/interface/Service.h" #include "CommonTools/UtilAlgos/interface/TFileService.h" -#include +#include #include #include #include diff --git a/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.cc b/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.cc index 74133daa8f425..eb93c780f14ba 100644 --- a/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.cc +++ b/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.cc @@ -14,7 +14,7 @@ #include "FWCore/Utilities/interface/EDMException.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "DataFormats/DetId/interface/DetId.h" #include "SimDataFormats/TrackingHit/interface/PSimHit.h" diff --git a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeAlignmentAlgorithm.cc b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeAlignmentAlgorithm.cc index 769af7cf88928..548638e95caee 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeAlignmentAlgorithm.cc +++ b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeAlignmentAlgorithm.cc @@ -54,7 +54,7 @@ #include "DataFormats/Alignment/interface/TkFittedLasBeam.h" #include "Alignment/LaserAlignment/interface/TsosVectorCollection.h" -#include +#include #include #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" diff --git a/Alignment/MillePedeAlignmentAlgorithm/src/MillePedeMonitor.cc b/Alignment/MillePedeAlignmentAlgorithm/src/MillePedeMonitor.cc index 4fb8dc03e2fd9..75e5e67e13237 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/src/MillePedeMonitor.cc +++ b/Alignment/MillePedeAlignmentAlgorithm/src/MillePedeMonitor.cc @@ -16,7 +16,7 @@ #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" -#include +#include #include #include "Alignment/CommonAlignment/interface/Alignable.h" diff --git a/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteerer.cc b/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteerer.cc index 7167af15572c3..b721ea2225c48 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteerer.cc +++ b/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteerer.cc @@ -31,7 +31,7 @@ #include "Alignment/CommonAlignment/interface/AlignableExtras.h" // GF doubts the need of these includes from include checker campaign: #include -#include +#include #include #include #include diff --git a/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteererWeakModeConstraints.cc b/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteererWeakModeConstraints.cc index ea59e1f7ef854..bc164c057b71b 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteererWeakModeConstraints.cc +++ b/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteererWeakModeConstraints.cc @@ -31,7 +31,7 @@ #include "Alignment/CommonAlignment/interface/AlignableExtras.h" // GF doubts the need of these includes from include checker campaign: #include -#include +#include #include #include #include diff --git a/Alignment/OfflineValidation/plugins/PrimaryVertexValidation.h b/Alignment/OfflineValidation/plugins/PrimaryVertexValidation.h index 427472e2b0f47..a15f0891d008f 100644 --- a/Alignment/OfflineValidation/plugins/PrimaryVertexValidation.h +++ b/Alignment/OfflineValidation/plugins/PrimaryVertexValidation.h @@ -40,7 +40,7 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/EDGetToken.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "RecoVertex/AdaptiveVertexFit/interface/AdaptiveVertexFitter.h" diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc b/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc index 053ca2b50115a..b331df1000c5a 100644 --- a/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc +++ b/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc @@ -63,7 +63,7 @@ // To access kinks and bows #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonTopologies/interface/SurfaceDeformation.h" #include "CLHEP/Matrix/SymMatrix.h" diff --git a/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc b/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc index 25ecd5deb3b76..559b9c0423457 100644 --- a/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc +++ b/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc @@ -59,7 +59,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DQMServices/Core/interface/DQMStore.h" #include "DQMServices/Core/interface/MonitorElement.h" diff --git a/Alignment/OfflineValidation/src/TrackerValidationVariables.cc b/Alignment/OfflineValidation/src/TrackerValidationVariables.cc index 27ae022bfa1bb..21339964944c3 100644 --- a/Alignment/OfflineValidation/src/TrackerValidationVariables.cc +++ b/Alignment/OfflineValidation/src/TrackerValidationVariables.cc @@ -10,7 +10,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/CommonTopologies/interface/RadialStripTopology.h" diff --git a/Alignment/TrackerAlignment/plugins/TrackerTreeGenerator.cc b/Alignment/TrackerAlignment/plugins/TrackerTreeGenerator.cc index 4a74b49c431c7..37207e9d617e4 100644 --- a/Alignment/TrackerAlignment/plugins/TrackerTreeGenerator.cc +++ b/Alignment/TrackerAlignment/plugins/TrackerTreeGenerator.cc @@ -51,7 +51,7 @@ #include "Geometry/Records/interface/PTrackerParametersRcd.h" #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" diff --git a/Alignment/TrackerAlignment/src/AlignableTrackerBuilder.cc b/Alignment/TrackerAlignment/src/AlignableTrackerBuilder.cc index a695a5ec71686..cdf9d8cb7c87d 100644 --- a/Alignment/TrackerAlignment/src/AlignableTrackerBuilder.cc +++ b/Alignment/TrackerAlignment/src/AlignableTrackerBuilder.cc @@ -5,7 +5,7 @@ // geometry #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" // alignment diff --git a/AnalysisAlgos/TrackInfoProducer/src/TrackInfoProducerAlgorithm.cc b/AnalysisAlgos/TrackInfoProducer/src/TrackInfoProducerAlgorithm.cc index b1c38da161017..df79584ebfa5e 100644 --- a/AnalysisAlgos/TrackInfoProducer/src/TrackInfoProducerAlgorithm.cc +++ b/AnalysisAlgos/TrackInfoProducer/src/TrackInfoProducerAlgorithm.cc @@ -8,7 +8,7 @@ #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h" #include "TrackingTools/TrackFitters/interface/TrajectoryStateCombiner.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" using namespace reco; diff --git a/CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.cc b/CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.cc index 010bbcedf00cf..7fc338ae1347e 100644 --- a/CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.cc +++ b/CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.cc @@ -7,7 +7,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" diff --git a/CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc b/CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc index 8022885b4b73f..42cc210aafd31 100644 --- a/CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc +++ b/CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc @@ -11,7 +11,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" diff --git a/CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h b/CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h index e06e3ccc4918e..761ab2741e631 100644 --- a/CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h +++ b/CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h @@ -39,7 +39,7 @@ #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc index cb55b307f88e8..3145f5b80552c 100644 --- a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc +++ b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc @@ -14,7 +14,7 @@ #include "DataFormats/GeometryVector/interface/LocalVector.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h" #include "DataFormats/TrackReco/interface/TrackExtra.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" diff --git a/CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h b/CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h index 5433d543afcc4..78ff52ab0e111 100644 --- a/CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h +++ b/CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h @@ -50,7 +50,7 @@ #include "FWCore/Utilities/interface/EDGetToken.h" #include "FWCore/Utilities/interface/Exception.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc index f4211bc7d4a44..625eaaef05d98 100644 --- a/CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc +++ b/CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc @@ -9,7 +9,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc index 824a4bb6fd174..9662e215dff4e 100644 --- a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc +++ b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc @@ -16,7 +16,7 @@ #include "CondFormats/RunInfo/interface/RunInfo.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "DataFormats/GeometrySurface/interface/TrapezoidalPlaneBounds.h" diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc index 9bbd3d0339de3..bbcd867cfe02c 100644 --- a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc +++ b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc @@ -12,7 +12,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Utilities/interface/Exception.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "DataFormats/GeometrySurface/interface/TrapezoidalPlaneBounds.h" diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainRandomCalculator.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainRandomCalculator.cc index b5bb6be54016c..caeed01da3a05 100644 --- a/CalibTracker/SiStripChannelGain/plugins/SiStripGainRandomCalculator.cc +++ b/CalibTracker/SiStripChannelGain/plugins/SiStripGainRandomCalculator.cc @@ -11,7 +11,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" diff --git a/CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h b/CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h index 0bb126c4d04b8..ab63451ea523c 100644 --- a/CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h +++ b/CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h @@ -27,7 +27,7 @@ #include "DataFormats/GeometrySurface/interface/TrapezoidalPlaneBounds.h" #include "DataFormats/GeometrySurface/interface/RectangularPlaneBounds.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" diff --git a/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc b/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc index 5c9c9676e29bd..39ba898423268 100644 --- a/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc +++ b/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc @@ -11,7 +11,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" diff --git a/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc b/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc index e46992c08a1cb..c0cce03455d87 100755 --- a/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc +++ b/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc @@ -28,7 +28,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "TrackingTools/Records/interface/TransientRecHitRecord.h" #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" #include "CalibTracker/SiStripHitEfficiency/interface/TrajectoryAtInvalidHit.h" diff --git a/CalibTracker/SiStripHitEfficiency/src/HitEff.cc b/CalibTracker/SiStripHitEfficiency/src/HitEff.cc index 046678e9437d1..1383051f8dccc 100644 --- a/CalibTracker/SiStripHitEfficiency/src/HitEff.cc +++ b/CalibTracker/SiStripHitEfficiency/src/HitEff.cc @@ -29,7 +29,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/TrackReco/interface/TrackExtra.h" diff --git a/CalibTracker/SiStripHitEfficiency/src/TrajectoryAtInvalidHit.cc b/CalibTracker/SiStripHitEfficiency/src/TrajectoryAtInvalidHit.cc index 2f046ab3960d8..679dfd5ee7318 100644 --- a/CalibTracker/SiStripHitEfficiency/src/TrajectoryAtInvalidHit.cc +++ b/CalibTracker/SiStripHitEfficiency/src/TrajectoryAtInvalidHit.cc @@ -2,7 +2,7 @@ #include "TrackingTools/TrackFitters/interface/TrajectoryStateCombiner.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "DataFormats/GeometryCommonDetAlgo/interface/MeasurementError.h" diff --git a/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc b/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc index 1cfd813323296..675aeff936bc2 100644 --- a/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc +++ b/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc @@ -19,7 +19,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" diff --git a/CalibTracker/SiStripQuality/plugins/SiStripBadStripFromASCIIFile.cc b/CalibTracker/SiStripQuality/plugins/SiStripBadStripFromASCIIFile.cc index 5d79523f5f2cd..79ecf0fce2239 100644 --- a/CalibTracker/SiStripQuality/plugins/SiStripBadStripFromASCIIFile.cc +++ b/CalibTracker/SiStripQuality/plugins/SiStripBadStripFromASCIIFile.cc @@ -11,7 +11,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" diff --git a/Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc b/Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc index 3cbb581210c5b..b8ef07b18169f 100644 --- a/Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc +++ b/Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc @@ -44,7 +44,7 @@ See the twiki page for details: #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "CondFormats/HcalObjects/interface/HcalRespCorrs.h" #include "CondFormats/DataRecord/interface/HcalRespCorrsRcd.h" diff --git a/CondTools/SiPixel/test/SiPixelPerformanceSummaryBuilder.cc b/CondTools/SiPixel/test/SiPixelPerformanceSummaryBuilder.cc index 2b0b9bb92d743..18d093d2ede71 100644 --- a/CondTools/SiPixel/test/SiPixelPerformanceSummaryBuilder.cc +++ b/CondTools/SiPixel/test/SiPixelPerformanceSummaryBuilder.cc @@ -6,7 +6,7 @@ #include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/Framework/interface/ESHandle.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" diff --git a/CondTools/SiStrip/plugins/SiStripDetVOffFakeBuilder.cc b/CondTools/SiStrip/plugins/SiStripDetVOffFakeBuilder.cc index 197f51ba6cd94..d9446d02df947 100644 --- a/CondTools/SiStrip/plugins/SiStripDetVOffFakeBuilder.cc +++ b/CondTools/SiStrip/plugins/SiStripDetVOffFakeBuilder.cc @@ -10,7 +10,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" diff --git a/DPGAnalysis/SiStripTools/plugins/TrackerDpgAnalysis.cc b/DPGAnalysis/SiStripTools/plugins/TrackerDpgAnalysis.cc index 20aae86f7fd12..52046a1160c3b 100644 --- a/DPGAnalysis/SiStripTools/plugins/TrackerDpgAnalysis.cc +++ b/DPGAnalysis/SiStripTools/plugins/TrackerDpgAnalysis.cc @@ -55,7 +55,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include #include #include diff --git a/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h b/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h index 6618e15f40b16..fc390c6779373 100644 --- a/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h +++ b/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h @@ -30,7 +30,7 @@ #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/DQM/SiPixelMonitorCluster/interface/SiPixelClusterSource.h b/DQM/SiPixelMonitorCluster/interface/SiPixelClusterSource.h index 1261542faef2a..313b19d6e7e93 100644 --- a/DQM/SiPixelMonitorCluster/interface/SiPixelClusterSource.h +++ b/DQM/SiPixelMonitorCluster/interface/SiPixelClusterSource.h @@ -50,7 +50,7 @@ #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/DQM/SiPixelMonitorDigi/interface/SiPixelDigiModule.h b/DQM/SiPixelMonitorDigi/interface/SiPixelDigiModule.h index 98e2d1fbb45a6..5e1232cb1bd08 100644 --- a/DQM/SiPixelMonitorDigi/interface/SiPixelDigiModule.h +++ b/DQM/SiPixelMonitorDigi/interface/SiPixelDigiModule.h @@ -35,7 +35,7 @@ #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/DQM/SiStripCommissioningDbClients/src/FineDelayHistosUsingDb.cc b/DQM/SiStripCommissioningDbClients/src/FineDelayHistosUsingDb.cc index b1896cb234a71..c4d58a4bdd379 100644 --- a/DQM/SiStripCommissioningDbClients/src/FineDelayHistosUsingDb.cc +++ b/DQM/SiStripCommissioningDbClients/src/FineDelayHistosUsingDb.cc @@ -8,7 +8,7 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include #include #include diff --git a/DQM/SiStripCommissioningSources/plugins/tracking/SiStripFineDelayHit.cc b/DQM/SiStripCommissioningSources/plugins/tracking/SiStripFineDelayHit.cc index 0128e81b2c5b6..a60e4b8492a81 100644 --- a/DQM/SiStripCommissioningSources/plugins/tracking/SiStripFineDelayHit.cc +++ b/DQM/SiStripCommissioningSources/plugins/tracking/SiStripFineDelayHit.cc @@ -63,7 +63,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include #include diff --git a/DQM/SiStripCommissioningSources/plugins/tracking/SiStripFineDelayTLA.cc b/DQM/SiStripCommissioningSources/plugins/tracking/SiStripFineDelayTLA.cc index 36eec382049a1..a9279abbc4747 100644 --- a/DQM/SiStripCommissioningSources/plugins/tracking/SiStripFineDelayTLA.cc +++ b/DQM/SiStripCommissioningSources/plugins/tracking/SiStripFineDelayTLA.cc @@ -9,7 +9,7 @@ #include "DataFormats/GeometryVector/interface/GlobalVector.h" #include "DataFormats/GeometryVector/interface/LocalVector.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "Geometry/CommonTopologies/interface/Topology.h" diff --git a/DataFormats/TrackerRecHit2D/interface/TrackerSingleRecHit.h b/DataFormats/TrackerRecHit2D/interface/TrackerSingleRecHit.h index a74864230e62c..2421722631338 100644 --- a/DataFormats/TrackerRecHit2D/interface/TrackerSingleRecHit.h +++ b/DataFormats/TrackerRecHit2D/interface/TrackerSingleRecHit.h @@ -4,7 +4,7 @@ #include "DataFormats/TrackerRecHit2D/interface/BaseTrackerRecHit.h" #include "DataFormats/TrackerRecHit2D/interface/OmniClusterRef.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" /* a Hit composed by a "single" measurement diff --git a/DataFormats/TrackingRecHit/src/TrackingRecHit.cc b/DataFormats/TrackingRecHit/src/TrackingRecHit.cc index c33fa509b96de..2e57baecc2100 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/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "FWCore/Utilities/interface/Exception.h" #include diff --git a/FastSimulation/Muons/plugins/FastTSGFromPropagation.cc b/FastSimulation/Muons/plugins/FastTSGFromPropagation.cc index c153fc55d8cb9..df6a916fa1e7b 100644 --- a/FastSimulation/Muons/plugins/FastTSGFromPropagation.cc +++ b/FastSimulation/Muons/plugins/FastTSGFromPropagation.cc @@ -34,7 +34,7 @@ #include "FastSimulation/Tracking/interface/TrajectorySeedHitCandidate.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "TrackingTools/TransientTrackingRecHit/interface/GenericTransientTrackingRecHit.h" #include "TrackingTools/Records/interface/TransientRecHitRecord.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" diff --git a/FastSimulation/Tracking/interface/TrajectorySeedHitCandidate.h b/FastSimulation/Tracking/interface/TrajectorySeedHitCandidate.h index ed79f2495428f..78856a0cedc87 100644 --- a/FastSimulation/Tracking/interface/TrajectorySeedHitCandidate.h +++ b/FastSimulation/Tracking/interface/TrajectorySeedHitCandidate.h @@ -2,7 +2,7 @@ #define FastSimulation_Tracking_TrajectorySeedHitCandidate_H_ -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h" diff --git a/FastSimulation/Tracking/test/testGeneralTracks.cc b/FastSimulation/Tracking/test/testGeneralTracks.cc index 1515f9eebb422..055ee729d171c 100644 --- a/FastSimulation/Tracking/test/testGeneralTracks.cc +++ b/FastSimulation/Tracking/test/testGeneralTracks.cc @@ -6,7 +6,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" diff --git a/FastSimulation/TrackingRecHitProducer/plugins/FastTrackerRecHitMatcher.cc b/FastSimulation/TrackingRecHitProducer/plugins/FastTrackerRecHitMatcher.cc index 47abe1901e0a9..14b174d6b0ea5 100644 --- a/FastSimulation/TrackingRecHitProducer/plugins/FastTrackerRecHitMatcher.cc +++ b/FastSimulation/TrackingRecHitProducer/plugins/FastTrackerRecHitMatcher.cc @@ -18,7 +18,7 @@ // geometry stuff #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" diff --git a/FastSimulation/TrackingRecHitProducer/plugins/PixelBarrelTemplateSmearerPlugin.cc b/FastSimulation/TrackingRecHitProducer/plugins/PixelBarrelTemplateSmearerPlugin.cc index b97860fbc6e08..000a76d2c0da0 100644 --- a/FastSimulation/TrackingRecHitProducer/plugins/PixelBarrelTemplateSmearerPlugin.cc +++ b/FastSimulation/TrackingRecHitProducer/plugins/PixelBarrelTemplateSmearerPlugin.cc @@ -6,7 +6,7 @@ // Geometry //#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" //#include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" diff --git a/FastSimulation/TrackingRecHitProducer/plugins/PixelForwardTemplateSmearerPlugin.cc b/FastSimulation/TrackingRecHitProducer/plugins/PixelForwardTemplateSmearerPlugin.cc index cb9115197dc90..f26e31b0fb4c1 100644 --- a/FastSimulation/TrackingRecHitProducer/plugins/PixelForwardTemplateSmearerPlugin.cc +++ b/FastSimulation/TrackingRecHitProducer/plugins/PixelForwardTemplateSmearerPlugin.cc @@ -18,7 +18,7 @@ // Geometry //#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" //#include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" diff --git a/FastSimulation/TrackingRecHitProducer/src/PixelTemplateSmearerBase.cc b/FastSimulation/TrackingRecHitProducer/src/PixelTemplateSmearerBase.cc index 84641ab83532e..3e73befcc3cd6 100644 --- a/FastSimulation/TrackingRecHitProducer/src/PixelTemplateSmearerBase.cc +++ b/FastSimulation/TrackingRecHitProducer/src/PixelTemplateSmearerBase.cc @@ -15,7 +15,7 @@ #include "FastSimulation/TrackingRecHitProducer/interface/TrackingRecHitProduct.h" // Geometry -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" #include "DataFormats/GeometryCommonDetAlgo/interface/MeasurementPoint.h" diff --git a/FastSimulation/TrajectoryManager/src/TrajectoryManager.cc b/FastSimulation/TrajectoryManager/src/TrajectoryManager.cc index d5f47a62a3797..e0deba2d45137 100755 --- a/FastSimulation/TrajectoryManager/src/TrajectoryManager.cc +++ b/FastSimulation/TrajectoryManager/src/TrajectoryManager.cc @@ -13,7 +13,7 @@ #include "TrackingTools/DetLayers/interface/ForwardDetLayer.h" #include "TrackingTools/GeomPropagators/interface/AnalyticalPropagator.h" #include "FastSimulation/TrajectoryManager/interface/InsideBoundsMeasurementEstimator.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "TrackingTools/GeomPropagators/interface/HelixArbitraryPlaneCrossing.h" #include "RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h" //#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" diff --git a/Geometry/CSCGeometry/interface/CSCLayer.h b/Geometry/CSCGeometry/interface/CSCLayer.h index bbc18fa44788a..76876733fc507 100644 --- a/Geometry/CSCGeometry/interface/CSCLayer.h +++ b/Geometry/CSCGeometry/interface/CSCLayer.h @@ -11,7 +11,7 @@ #include -#include +#include #include #include #include diff --git a/Geometry/CSCGeometry/src/CSCGeometry.cc b/Geometry/CSCGeometry/src/CSCGeometry.cc index f8a9888013232..5ce3e0d1d55fc 100644 --- a/Geometry/CSCGeometry/src/CSCGeometry.cc +++ b/Geometry/CSCGeometry/src/CSCGeometry.cc @@ -1,7 +1,7 @@ #include "Geometry/CSCGeometry/interface/CSCGeometry.h" #include "Geometry/CSCGeometry/interface/CSCChamber.h" #include "Geometry/CSCGeometry/interface/CSCChamberSpecs.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "DataFormats/GeometrySurface/interface/TrapezoidalPlaneBounds.h" diff --git a/Geometry/CommonDetUnit/interface/DetPositioner.h b/Geometry/CommonDetUnit/interface/DetPositioner.h index 31f301de6e60c..7940675bc2b84 100644 --- a/Geometry/CommonDetUnit/interface/DetPositioner.h +++ b/Geometry/CommonDetUnit/interface/DetPositioner.h @@ -2,7 +2,7 @@ #define DetPositioner_H #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" /* A base class for classes which modify the positions/orientations of GeomDets. * The derived classes can call the methods moveGeomDet, rotateGeomDet, setGeomDetPosition, diff --git a/Geometry/CommonDetUnit/interface/GeomDetUnit.h b/Geometry/CommonDetUnit/interface/GeomDetUnit.h deleted file mode 100644 index 63792164addff..0000000000000 --- a/Geometry/CommonDetUnit/interface/GeomDetUnit.h +++ /dev/null @@ -1 +0,0 @@ -#include "Geometry/CommonDetUnit/interface/GeomDet.h" diff --git a/Geometry/CommonDetUnit/src/GeomDet.cc b/Geometry/CommonDetUnit/src/GeomDet.cc index d48a9545639fe..926bd21b5cb22 100644 --- a/Geometry/CommonDetUnit/src/GeomDet.cc +++ b/Geometry/CommonDetUnit/src/GeomDet.cc @@ -37,7 +37,7 @@ bool GeomDet::setAlignmentPositionError (const AlignmentPositionError& ape) return ape.valid(); } -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "FWCore/Utilities/interface/Exception.h" diff --git a/Geometry/DTGeometry/interface/DTLayer.h b/Geometry/DTGeometry/interface/DTLayer.h index 2d094da77330e..d366493cbb62f 100644 --- a/Geometry/DTGeometry/interface/DTLayer.h +++ b/Geometry/DTGeometry/interface/DTLayer.h @@ -13,7 +13,7 @@ */ /* Base Class Headers */ -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" /* Collaborating Class Declarations */ #include "DataFormats/MuonDetId/interface/DTLayerId.h" diff --git a/Geometry/DTGeometry/src/DTGeometry.cc b/Geometry/DTGeometry/src/DTGeometry.cc index 01f912748ef20..972e550441f40 100644 --- a/Geometry/DTGeometry/src/DTGeometry.cc +++ b/Geometry/DTGeometry/src/DTGeometry.cc @@ -4,7 +4,7 @@ */ #include -#include +#include #include #include diff --git a/Geometry/DTGeometry/test/DTGeometryAnalyzer.cc b/Geometry/DTGeometry/test/DTGeometryAnalyzer.cc index 8256d0c49e007..718366863a2fa 100644 --- a/Geometry/DTGeometry/test/DTGeometryAnalyzer.cc +++ b/Geometry/DTGeometry/test/DTGeometryAnalyzer.cc @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/Geometry/GEMGeometry/interface/GEMEtaPartition.h b/Geometry/GEMGeometry/interface/GEMEtaPartition.h index 79fd2acf81a95..ccd8b650f4683 100644 --- a/Geometry/GEMGeometry/interface/GEMEtaPartition.h +++ b/Geometry/GEMGeometry/interface/GEMEtaPartition.h @@ -1,7 +1,7 @@ #ifndef Geometry_GEMGeometry_GEMEtaPartition_H #define Geometry_GEMGeometry_GEMEtaPartition_H -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "DataFormats/MuonDetId/interface/GEMDetId.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" diff --git a/Geometry/GEMGeometry/interface/ME0EtaPartition.h b/Geometry/GEMGeometry/interface/ME0EtaPartition.h index ba56847d9cef4..56c65c52c4471 100644 --- a/Geometry/GEMGeometry/interface/ME0EtaPartition.h +++ b/Geometry/GEMGeometry/interface/ME0EtaPartition.h @@ -1,7 +1,7 @@ #ifndef Geometry_GEMGeometry_ME0EtaPartition_H #define Geometry_GEMGeometry_ME0EtaPartition_H -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "DataFormats/MuonDetId/interface/ME0DetId.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" diff --git a/Geometry/GEMGeometry/src/GEMGeometry.cc b/Geometry/GEMGeometry/src/GEMGeometry.cc index cb73b445d6686..7c9f55a9453b0 100644 --- a/Geometry/GEMGeometry/src/GEMGeometry.cc +++ b/Geometry/GEMGeometry/src/GEMGeometry.cc @@ -4,7 +4,7 @@ */ #include "Geometry/GEMGeometry/interface/GEMGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" GEMGeometry::GEMGeometry(){} diff --git a/Geometry/GEMGeometry/src/ME0Geometry.cc b/Geometry/GEMGeometry/src/ME0Geometry.cc index f9091ef81a0ce..5237d7c55e283 100644 --- a/Geometry/GEMGeometry/src/ME0Geometry.cc +++ b/Geometry/GEMGeometry/src/ME0Geometry.cc @@ -4,7 +4,7 @@ */ #include "Geometry/GEMGeometry/interface/ME0Geometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" ME0Geometry::ME0Geometry(){} ME0Geometry::~ME0Geometry(){} diff --git a/Geometry/RPCGeometry/interface/RPCRoll.h b/Geometry/RPCGeometry/interface/RPCRoll.h index 579d49ed52742..21d06aef6d659 100644 --- a/Geometry/RPCGeometry/interface/RPCRoll.h +++ b/Geometry/RPCGeometry/interface/RPCRoll.h @@ -1,7 +1,7 @@ #ifndef Geometry_RPCSimAlgo_RPCRoll_H #define Geometry_RPCSimAlgo_RPCRoll_H -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "DataFormats/MuonDetId/interface/RPCDetId.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" diff --git a/Geometry/RPCGeometry/src/RPCGeometry.cc b/Geometry/RPCGeometry/src/RPCGeometry.cc index a3c75e196f4f5..5518868c86227 100644 --- a/Geometry/RPCGeometry/src/RPCGeometry.cc +++ b/Geometry/RPCGeometry/src/RPCGeometry.cc @@ -4,7 +4,7 @@ */ #include -#include +#include #include "FWCore/MessageLogger/interface/MessageLogger.h" RPCGeometry::RPCGeometry(){} diff --git a/Geometry/TrackerGeometryBuilder/interface/GeomDetLess.h b/Geometry/TrackerGeometryBuilder/interface/GeomDetLess.h deleted file mode 100644 index 38ea8f26823b6..0000000000000 --- a/Geometry/TrackerGeometryBuilder/interface/GeomDetLess.h +++ /dev/null @@ -1 +0,0 @@ -#error "Include has been moved to Geometry/CommonDetUnit package!" diff --git a/Geometry/TrackerGeometryBuilder/interface/GluedGeomDet.h b/Geometry/TrackerGeometryBuilder/interface/GluedGeomDet.h deleted file mode 100644 index 38ea8f26823b6..0000000000000 --- a/Geometry/TrackerGeometryBuilder/interface/GluedGeomDet.h +++ /dev/null @@ -1 +0,0 @@ -#error "Include has been moved to Geometry/CommonDetUnit package!" diff --git a/Geometry/TrackerGeometryBuilder/interface/PlaneBuilderForGluedDet.h b/Geometry/TrackerGeometryBuilder/interface/PlaneBuilderForGluedDet.h index f2c50639609f5..7df8c606c3266 100644 --- a/Geometry/TrackerGeometryBuilder/interface/PlaneBuilderForGluedDet.h +++ b/Geometry/TrackerGeometryBuilder/interface/PlaneBuilderForGluedDet.h @@ -5,7 +5,7 @@ #include "DataFormats/GeometrySurface/interface/ReferenceCounted.h" #include "DataFormats/GeometrySurface/interface/RectangularPlaneBounds.h" #include "DataFormats/GeometrySurface/interface/TrapezoidalPlaneBounds.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include #include diff --git a/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc b/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc index dcc58734c67c5..26f84fc3e54ac 100644 --- a/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc +++ b/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc @@ -1,7 +1,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/PlaneBuilderForGluedDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/StackGeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" diff --git a/Geometry/TrackerGeometryBuilder/src/TrackerGeometry.cc b/Geometry/TrackerGeometryBuilder/src/TrackerGeometry.cc index 4f6f9268d4e7e..0d411a556a1c9 100644 --- a/Geometry/TrackerGeometryBuilder/src/TrackerGeometry.cc +++ b/Geometry/TrackerGeometryBuilder/src/TrackerGeometry.cc @@ -2,7 +2,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/Geometry/TrackingGeometryAligner/interface/GeometryAligner.h b/Geometry/TrackingGeometryAligner/interface/GeometryAligner.h index 413253b8ad66b..f2e9ef3a84bc3 100644 --- a/Geometry/TrackingGeometryAligner/interface/GeometryAligner.h +++ b/Geometry/TrackingGeometryAligner/interface/GeometryAligner.h @@ -19,7 +19,6 @@ #include "CondFormats/Alignment/interface/AlignmentSurfaceDeformations.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" #include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h" #include "DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h" #include "DataFormats/GeometrySurface/interface/Surface.h" diff --git a/JetMETCorrections/IsolatedParticles/test/TestIsoSimTracks.cc b/JetMETCorrections/IsolatedParticles/test/TestIsoSimTracks.cc index ed9ddea2ed2f3..9549a91c095cc 100644 --- a/JetMETCorrections/IsolatedParticles/test/TestIsoSimTracks.cc +++ b/JetMETCorrections/IsolatedParticles/test/TestIsoSimTracks.cc @@ -65,7 +65,7 @@ #include "DataFormats/GeometrySurface/interface/Cylinder.h" #include "DataFormats/GeometrySurface/interface/Plane.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/JetMETCorrections/IsolatedParticles/test/TestIsoTracks.cc b/JetMETCorrections/IsolatedParticles/test/TestIsoTracks.cc index 2eaf2cf83df45..d943316f65400 100644 --- a/JetMETCorrections/IsolatedParticles/test/TestIsoTracks.cc +++ b/JetMETCorrections/IsolatedParticles/test/TestIsoTracks.cc @@ -65,7 +65,7 @@ #include "DataFormats/GeometrySurface/interface/Cylinder.h" #include "DataFormats/GeometrySurface/interface/Plane.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/RecoEgamma/EgammaElectronAlgos/interface/SiStripElectronAlgo.h b/RecoEgamma/EgammaElectronAlgos/interface/SiStripElectronAlgo.h index be51f71b15b59..1a636e0c5cfea 100644 --- a/RecoEgamma/EgammaElectronAlgos/interface/SiStripElectronAlgo.h +++ b/RecoEgamma/EgammaElectronAlgos/interface/SiStripElectronAlgo.h @@ -36,7 +36,7 @@ #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2DCollection.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2D.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "DataFormats/Common/interface/Handle.h" #include "FWCore/Framework/interface/ESHandle.h" diff --git a/RecoEgamma/EgammaElectronAlgos/interface/SiStripElectronSeedGenerator.h b/RecoEgamma/EgammaElectronAlgos/interface/SiStripElectronSeedGenerator.h index 61c10e03d4c05..876ee28848c3e 100644 --- a/RecoEgamma/EgammaElectronAlgos/interface/SiStripElectronSeedGenerator.h +++ b/RecoEgamma/EgammaElectronAlgos/interface/SiStripElectronSeedGenerator.h @@ -22,7 +22,7 @@ #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2DCollection.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2D.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/CommonDetUnit/interface/GeomDetEnumerators.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/RecoEgamma/EgammaPhotonProducers/interface/ConversionProducer.h b/RecoEgamma/EgammaPhotonProducers/interface/ConversionProducer.h index c839ad0ac78c9..2a1d87827ba3f 100644 --- a/RecoEgamma/EgammaPhotonProducers/interface/ConversionProducer.h +++ b/RecoEgamma/EgammaPhotonProducers/interface/ConversionProducer.h @@ -27,7 +27,7 @@ #include "DataFormats/CaloRecHit/interface/CaloCluster.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/GeometrySurface/interface/BoundCylinder.h" #include "DataFormats/GeometrySurface/interface/BoundDisk.h" #include "DataFormats/GeometrySurface/interface/SimpleCylinderBounds.h" diff --git a/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackMerger.cc b/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackMerger.cc index ab5f15e345b6b..b63f9ef8d5e6b 100644 --- a/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackMerger.cc +++ b/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackMerger.cc @@ -26,7 +26,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.cc b/RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.cc index 233c3e85cb660..1dda090375e2a 100644 --- a/RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.cc +++ b/RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.cc @@ -41,7 +41,7 @@ #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2DCollection.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2D.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/CommonDetUnit/interface/GeomDetEnumerators.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" diff --git a/RecoLocalTracker/ClusterParameterEstimator/interface/ClusterParameterEstimator.h b/RecoLocalTracker/ClusterParameterEstimator/interface/ClusterParameterEstimator.h index d7505521d882e..610721822dffb 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/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/TrajectoryState/interface/LocalTrajectoryParameters.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" diff --git a/RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h b/RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h index bc6b2ecce93f7..3fb9f1833f2c0 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/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/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 645e690ef0f7c..d49cc9e866a4a 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/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/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 26091b2179c6d..e5226e8dda6dc 100644 --- a/RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPE.h +++ b/RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPE.h @@ -4,7 +4,7 @@ #include "RecoLocalTracker/ClusterParameterEstimator/interface/ClusterParameterEstimator.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h" diff --git a/RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPEGeometric.h b/RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPEGeometric.h index ee7d581ae013e..1f468b1a90b8a 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/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/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 0c624c0bd4734..b2187b5139830 100644 --- a/RecoLocalTracker/Phase2TrackerRecHits/plugins/Phase2TrackerRecHits.cc +++ b/RecoLocalTracker/Phase2TrackerRecHits/plugins/Phase2TrackerRecHits.cc @@ -10,7 +10,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Framework/interface/ESHandle.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" diff --git a/RecoLocalTracker/Phase2TrackerRecHits/test/RecHitsValidation.cc b/RecoLocalTracker/Phase2TrackerRecHits/test/RecHitsValidation.cc index 63f9096b59a11..567b3cfcf9d84 100644 --- a/RecoLocalTracker/Phase2TrackerRecHits/test/RecHitsValidation.cc +++ b/RecoLocalTracker/Phase2TrackerRecHits/test/RecHitsValidation.cc @@ -15,7 +15,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" diff --git a/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizer.cc b/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizer.cc index 1ab91334b9818..85c8a5e9a351f 100644 --- a/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizer.cc +++ b/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizer.cc @@ -14,7 +14,7 @@ #endif #include "Phase2TrackerClusterizerSequentialAlgorithm.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" diff --git a/RecoLocalTracker/SiPhase2Clusterizer/test/ClustersValidation.cc b/RecoLocalTracker/SiPhase2Clusterizer/test/ClustersValidation.cc index c479f5cf60dfa..c7a28f4c1cd6f 100644 --- a/RecoLocalTracker/SiPhase2Clusterizer/test/ClustersValidation.cc +++ b/RecoLocalTracker/SiPhase2Clusterizer/test/ClustersValidation.cc @@ -15,7 +15,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" diff --git a/RecoLocalTracker/SiPixelClusterizer/test/ReadPixClusters.cc b/RecoLocalTracker/SiPixelClusterizer/test/ReadPixClusters.cc index ac685f0bd4ef3..07342f5f01397 100644 --- a/RecoLocalTracker/SiPixelClusterizer/test/ReadPixClusters.cc +++ b/RecoLocalTracker/SiPixelClusterizer/test/ReadPixClusters.cc @@ -38,7 +38,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/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 54d44f682afd9..a8b145bf36c33 100644 --- a/RecoLocalTracker/SiPixelClusterizer/test/TestClusters.cc +++ b/RecoLocalTracker/SiPixelClusterizer/test/TestClusters.cc @@ -38,7 +38,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" //#include "Geometry/TrackerTopology/interface/RectangularPixelTopology.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" diff --git a/RecoLocalTracker/SiPixelClusterizer/test/TestPixTracks.cc b/RecoLocalTracker/SiPixelClusterizer/test/TestPixTracks.cc index 1cc606b69b073..08d7259afbc0f 100644 --- a/RecoLocalTracker/SiPixelClusterizer/test/TestPixTracks.cc +++ b/RecoLocalTracker/SiPixelClusterizer/test/TestPixTracks.cc @@ -39,7 +39,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" //#include "Geometry/CommonTopologies/interface/PixelTopology.h" // For L1 diff --git a/RecoLocalTracker/SiPixelClusterizer/test/TestWithTracks.cc b/RecoLocalTracker/SiPixelClusterizer/test/TestWithTracks.cc index d1349bd00d95d..cae19781c985d 100644 --- a/RecoLocalTracker/SiPixelClusterizer/test/TestWithTracks.cc +++ b/RecoLocalTracker/SiPixelClusterizer/test/TestWithTracks.cc @@ -42,7 +42,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/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 0f308a9a8315c..60625da024344 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/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/RecoLocalTracker/SiPixelRecHits/test/ReadPixelRecHit.cc b/RecoLocalTracker/SiPixelRecHits/test/ReadPixelRecHit.cc index fc95810ff147a..1ed5799f2f3e7 100644 --- a/RecoLocalTracker/SiPixelRecHits/test/ReadPixelRecHit.cc +++ b/RecoLocalTracker/SiPixelRecHits/test/ReadPixelRecHit.cc @@ -19,7 +19,7 @@ //#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" diff --git a/RecoLocalTracker/SiStripRecHitConverter/interface/SiStripRecHitMatcher.h b/RecoLocalTracker/SiStripRecHitConverter/interface/SiStripRecHitMatcher.h index e3f949110e926..65d02513f599e 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/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "DataFormats/CLHEP/interface/AlgebraicObjects.h" diff --git a/RecoLocalTracker/SubCollectionProducers/src/HITrackClusterRemover.cc b/RecoLocalTracker/SubCollectionProducers/src/HITrackClusterRemover.cc index 524e80e3639fe..7df3bdc881410 100644 --- a/RecoLocalTracker/SubCollectionProducers/src/HITrackClusterRemover.cc +++ b/RecoLocalTracker/SubCollectionProducers/src/HITrackClusterRemover.cc @@ -31,7 +31,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "RecoTracker/TransientTrackingRecHit/interface/Traj2TrackHits.h" diff --git a/RecoLocalTracker/SubCollectionProducers/src/HLTTrackClusterRemoverNew.cc b/RecoLocalTracker/SubCollectionProducers/src/HLTTrackClusterRemoverNew.cc index 0a41761a47b25..196654460f806 100644 --- a/RecoLocalTracker/SubCollectionProducers/src/HLTTrackClusterRemoverNew.cc +++ b/RecoLocalTracker/SubCollectionProducers/src/HLTTrackClusterRemoverNew.cc @@ -29,7 +29,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" // diff --git a/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemover.cc b/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemover.cc index dc151d87ca588..84ae7a52f4070 100644 --- a/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemover.cc +++ b/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemover.cc @@ -31,7 +31,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" // diff --git a/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemoverPhase2.cc b/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemoverPhase2.cc index 30208c7c54612..22f4688cd6971 100644 --- a/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemoverPhase2.cc +++ b/RecoLocalTracker/SubCollectionProducers/src/SeedClusterRemoverPhase2.cc @@ -29,7 +29,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" // diff --git a/RecoMET/METAlgorithms/interface/EcalHaloAlgo.h b/RecoMET/METAlgorithms/interface/EcalHaloAlgo.h index a86d453c44dd9..d391c7acddfdc 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/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/GeometrySurface/interface/BoundPlane.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" diff --git a/RecoMuon/GlobalTrackingTools/src/GlobalMuonTrackMatcher.cc b/RecoMuon/GlobalTrackingTools/src/GlobalMuonTrackMatcher.cc index 20f80f53bfb5a..da7d5b7cbab70 100644 --- a/RecoMuon/GlobalTrackingTools/src/GlobalMuonTrackMatcher.cc +++ b/RecoMuon/GlobalTrackingTools/src/GlobalMuonTrackMatcher.cc @@ -39,7 +39,7 @@ #include "DataFormats/GeometrySurface/interface/TangentPlane.h" #include "DataFormats/Math/interface/deltaR.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" using namespace std; using namespace reco; diff --git a/RecoMuon/MuonIdentification/test/RPCMuonAnalyzer.cc b/RecoMuon/MuonIdentification/test/RPCMuonAnalyzer.cc index 48a76e47616f0..3aa410442a7c9 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/GeomDetUnit.h" +//#include "Geometry/CommonDetUnit/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/src/RPCSeedOverlapper.cc b/RecoMuon/MuonSeedGenerator/src/RPCSeedOverlapper.cc index 46a54b0685d13..a05cae9b89734 100644 --- a/RecoMuon/MuonSeedGenerator/src/RPCSeedOverlapper.cc +++ b/RecoMuon/MuonSeedGenerator/src/RPCSeedOverlapper.cc @@ -6,7 +6,7 @@ #include "RecoMuon/MuonSeedGenerator/src/RPCSeedOverlapper.h" #include -#include +#include using namespace std; using namespace edm; diff --git a/RecoMuon/TransientTrackingRecHit/src/MuonTransientTrackingRecHit.cc b/RecoMuon/TransientTrackingRecHit/src/MuonTransientTrackingRecHit.cc index e72ce664d55fe..529b050c6dbca 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/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/GeometryCommonDetAlgo/interface/ErrorFrameTransformer.h" #include "DataFormats/MuonDetId/interface/MuonSubdetId.h" diff --git a/RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeHitFilter.h b/RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeHitFilter.h index 1219ac5bab2c4..2609cf2e85aab 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeHitFilter.h +++ b/RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeHitFilter.h @@ -10,7 +10,7 @@ #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h" #include "DataFormats/SiPixelCluster/interface/SiPixelClusterShapeCache.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterData.h" diff --git a/RecoPixelVertexing/PixelLowPtUtilities/src/ClusterShapeHitFilter.cc b/RecoPixelVertexing/PixelLowPtUtilities/src/ClusterShapeHitFilter.cc index b5802a939e61d..581989dc0a325 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/src/ClusterShapeHitFilter.cc +++ b/RecoPixelVertexing/PixelLowPtUtilities/src/ClusterShapeHitFilter.cc @@ -8,7 +8,7 @@ #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" diff --git a/RecoPixelVertexing/PixelLowPtUtilities/src/TrackFitter.cc b/RecoPixelVertexing/PixelLowPtUtilities/src/TrackFitter.cc index 4919b462416c6..18ed92c18574c 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/src/TrackFitter.cc +++ b/RecoPixelVertexing/PixelLowPtUtilities/src/TrackFitter.cc @@ -18,7 +18,7 @@ #include "CommonTools/Statistics/interface/LinearFit.h" #include "DataFormats/GeometryCommonDetAlgo/interface/Measurement1D.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/RecoPixelVertexing/PixelLowPtUtilities/test/ClusterShapeExtractor.cc b/RecoPixelVertexing/PixelLowPtUtilities/test/ClusterShapeExtractor.cc index 9c794d17fd3f5..64efeafa45760 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/test/ClusterShapeExtractor.cc +++ b/RecoPixelVertexing/PixelLowPtUtilities/test/ClusterShapeExtractor.cc @@ -20,7 +20,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeHitFilter.h" diff --git a/RecoPixelVertexing/PixelTrackFitting/src/PixelFitterByConformalMappingAndLine.cc b/RecoPixelVertexing/PixelTrackFitting/src/PixelFitterByConformalMappingAndLine.cc index fdbee7a177a76..73671e733ee2d 100644 --- a/RecoPixelVertexing/PixelTrackFitting/src/PixelFitterByConformalMappingAndLine.cc +++ b/RecoPixelVertexing/PixelTrackFitting/src/PixelFitterByConformalMappingAndLine.cc @@ -18,7 +18,7 @@ #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "ConformalMappingFit.h" diff --git a/RecoPixelVertexing/PixelTrackFitting/src/PixelFitterByHelixProjections.cc b/RecoPixelVertexing/PixelTrackFitting/src/PixelFitterByHelixProjections.cc index d735b9717bba3..09268e0f1080a 100644 --- a/RecoPixelVertexing/PixelTrackFitting/src/PixelFitterByHelixProjections.cc +++ b/RecoPixelVertexing/PixelTrackFitting/src/PixelFitterByHelixProjections.cc @@ -17,7 +17,7 @@ #include "CommonTools/Statistics/interface/LinearFit.h" #include "DataFormats/GeometryCommonDetAlgo/interface/Measurement1D.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/RecoTracker/DeDx/interface/DeDxTools.h b/RecoTracker/DeDx/interface/DeDxTools.h index 4220982ad1c8c..3f991381a7aad 100644 --- a/RecoTracker/DeDx/interface/DeDxTools.h +++ b/RecoTracker/DeDx/interface/DeDxTools.h @@ -27,7 +27,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "CondFormats/PhysicsToolsObjects/interface/Histogram3D.h" diff --git a/RecoTracker/DebugTools/interface/CkfDebugger.h b/RecoTracker/DebugTools/interface/CkfDebugger.h index fbb62ff0014dd..b4e7498dac65a 100644 --- a/RecoTracker/DebugTools/interface/CkfDebugger.h +++ b/RecoTracker/DebugTools/interface/CkfDebugger.h @@ -8,7 +8,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "SimDataFormats/TrackingHit/interface/PSimHit.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/RecoTracker/DebugTools/interface/TSOSFromSimHitFactory.h b/RecoTracker/DebugTools/interface/TSOSFromSimHitFactory.h index ec8a522a9663f..0ddfdf1cd5eff 100644 --- a/RecoTracker/DebugTools/interface/TSOSFromSimHitFactory.h +++ b/RecoTracker/DebugTools/interface/TSOSFromSimHitFactory.h @@ -4,7 +4,7 @@ #include "RecoTracker/DebugTools/interface/FTSFromSimHitFactory.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" #include "SimDataFormats/TrackingHit/interface/PSimHit.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" class SimHit; class MagneticField; diff --git a/RecoTracker/DebugTools/src/FTSFromSimHitFactory.cc b/RecoTracker/DebugTools/src/FTSFromSimHitFactory.cc index acbf295fa15f4..f740b1e095779 100644 --- a/RecoTracker/DebugTools/src/FTSFromSimHitFactory.cc +++ b/RecoTracker/DebugTools/src/FTSFromSimHitFactory.cc @@ -1,6 +1,6 @@ #include "RecoTracker/DebugTools/interface/FTSFromSimHitFactory.h" #include "SimDataFormats/TrackingHit/interface/PSimHit.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "TrackingTools/TrajectoryParametrization/interface/GlobalTrajectoryParameters.h" #include diff --git a/RecoTracker/FinalTrackSelectors/plugins/CosmicTrackSplitter.cc b/RecoTracker/FinalTrackSelectors/plugins/CosmicTrackSplitter.cc index fb475b5379c84..f3de98c4efce3 100644 --- a/RecoTracker/FinalTrackSelectors/plugins/CosmicTrackSplitter.cc +++ b/RecoTracker/FinalTrackSelectors/plugins/CosmicTrackSplitter.cc @@ -22,7 +22,7 @@ // added by me #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/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/SimpleTrackListMerger.cc b/RecoTracker/FinalTrackSelectors/plugins/SimpleTrackListMerger.cc index 87f410d430db0..87eba78e33de0 100644 --- a/RecoTracker/FinalTrackSelectors/plugins/SimpleTrackListMerger.cc +++ b/RecoTracker/FinalTrackSelectors/plugins/SimpleTrackListMerger.cc @@ -89,7 +89,7 @@ class SimpleTrackListMerger : public edm::stream::EDProducer<> { #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/RecoTracker/FinalTrackSelectors/plugins/TrackListMerger.cc b/RecoTracker/FinalTrackSelectors/plugins/TrackListMerger.cc index 16cfa8dad804d..ef8182e8c33f5 100644 --- a/RecoTracker/FinalTrackSelectors/plugins/TrackListMerger.cc +++ b/RecoTracker/FinalTrackSelectors/plugins/TrackListMerger.cc @@ -127,7 +127,7 @@ class dso_hidden TrackListMerger : public edm::stream::EDProducer<> #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/RecoTracker/MeasurementDet/plugins/MeasurementTrackerImpl.cc b/RecoTracker/MeasurementDet/plugins/MeasurementTrackerImpl.cc index f5e6e0f6691a9..edff81ed1b9f7 100644 --- a/RecoTracker/MeasurementDet/plugins/MeasurementTrackerImpl.cc +++ b/RecoTracker/MeasurementDet/plugins/MeasurementTrackerImpl.cc @@ -5,7 +5,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/StackGeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/RecoTracker/SpecialSeedGenerators/interface/CosmicRegionalSeedGenerator.h b/RecoTracker/SpecialSeedGenerators/interface/CosmicRegionalSeedGenerator.h index 922ca9b38250a..04092ae7f6540 100644 --- a/RecoTracker/SpecialSeedGenerators/interface/CosmicRegionalSeedGenerator.h +++ b/RecoTracker/SpecialSeedGenerators/interface/CosmicRegionalSeedGenerator.h @@ -35,7 +35,7 @@ //Geometry #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" diff --git a/RecoTracker/TkDetLayers/src/BladeShapeBuilderFromDet.h b/RecoTracker/TkDetLayers/src/BladeShapeBuilderFromDet.h index 7a5b453371b3b..bdacf13062ff6 100644 --- a/RecoTracker/TkDetLayers/src/BladeShapeBuilderFromDet.h +++ b/RecoTracker/TkDetLayers/src/BladeShapeBuilderFromDet.h @@ -4,7 +4,7 @@ #include "BoundDiskSector.h" #include "DiskSectorBounds.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/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 71e2db5528fd0..4c33bfe6446f1 100644 --- a/RecoTracker/TkDetLayers/src/ForwardDiskSectorBuilderFromDet.h +++ b/RecoTracker/TkDetLayers/src/ForwardDiskSectorBuilderFromDet.h @@ -4,7 +4,7 @@ #include "BoundDiskSector.h" #include "DiskSectorBounds.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/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 877c6cd30368a..8930fa33be124 100644 --- a/RecoTracker/TkDetLayers/src/GeometricSearchTrackerBuilder.cc +++ b/RecoTracker/TkDetLayers/src/GeometricSearchTrackerBuilder.cc @@ -12,7 +12,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/trackerHierarchy.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "DataFormats/Common/interface/Trie.h" diff --git a/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.cc b/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.cc index a2a53570cde08..0c0e841dd680c 100644 --- a/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.cc +++ b/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.cc @@ -28,7 +28,7 @@ // for trie #include "Geometry/TrackerGeometryBuilder/interface/trackerHierarchy.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/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 dfb10b1114402..fc0e88a755be1 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/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include diff --git a/RecoTracker/TransientTrackingRecHit/interface/TSiPixelRecHit.h b/RecoTracker/TransientTrackingRecHit/interface/TSiPixelRecHit.h index 517fd2a97d934..e96dbc235e6c2 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/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/RecoTracker/TransientTrackingRecHit/interface/TSiStripRecHit2DLocalPos.h b/RecoTracker/TransientTrackingRecHit/interface/TSiStripRecHit2DLocalPos.h index baad42e87d856..3aae1e4ad60d2 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/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #endif diff --git a/RecoTracker/TransientTrackingRecHit/src/TkClonerImpl.cc b/RecoTracker/TransientTrackingRecHit/src/TkClonerImpl.cc index c17cc984b574c..36cdb30e01dea 100644 --- a/RecoTracker/TransientTrackingRecHit/src/TkClonerImpl.cc +++ b/RecoTracker/TransientTrackingRecHit/src/TkClonerImpl.cc @@ -7,7 +7,7 @@ #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit1D.h" #include "DataFormats/TrackerRecHit2D/interface/Phase2TrackerRecHit1D.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" diff --git a/RecoVertex/V0Producer/test/V0Analyzer.cc b/RecoVertex/V0Producer/test/V0Analyzer.cc index fd03a06889661..26b706e79fe55 100644 --- a/RecoVertex/V0Producer/test/V0Analyzer.cc +++ b/RecoVertex/V0Producer/test/V0Analyzer.cc @@ -55,7 +55,7 @@ #include "SimDataFormats/Vertex/interface/SimVertexContainer.h" #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" diff --git a/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.cc b/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.cc index 2ed13b6e258ec..1398fcf3b1f5d 100644 --- a/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.cc +++ b/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.cc @@ -45,7 +45,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" // For ROOT #include diff --git a/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.h b/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.h index fb47f039b67c7..4f98ff7592d3e 100644 --- a/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.h +++ b/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.h @@ -20,7 +20,7 @@ #include "DataFormats/Common/interface/Ref.h" #include "DataFormats/TrackReco/interface/Track.h" -//#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +//#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" diff --git a/SUSYBSMAnalysis/HSCP/plugins/HSCPTreeBuilder.cc b/SUSYBSMAnalysis/HSCP/plugins/HSCPTreeBuilder.cc index 46a0a6b5be0c4..f94c2efc67759 100644 --- a/SUSYBSMAnalysis/HSCP/plugins/HSCPTreeBuilder.cc +++ b/SUSYBSMAnalysis/HSCP/plugins/HSCPTreeBuilder.cc @@ -33,7 +33,7 @@ #include #include -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "DataFormats/GeometrySurface/interface/TrapezoidalPlaneBounds.h" diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingSiPixelMCDigiWorker.h b/SimGeneral/DataMixingModule/plugins/DataMixingSiPixelMCDigiWorker.h index ad23004ae2912..94971d8949f8d 100644 --- a/SimGeneral/DataMixingModule/plugins/DataMixingSiPixelMCDigiWorker.h +++ b/SimGeneral/DataMixingModule/plugins/DataMixingSiPixelMCDigiWorker.h @@ -30,7 +30,7 @@ #include "SimDataFormats/PileupSummaryInfo/interface/PileupSummaryInfo.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "SimDataFormats/PileupSummaryInfo/interface/PileupSummaryInfo.h" #include "CondFormats/DataRecord/interface/SiPixelDynamicInefficiencyRcd.h" diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingSiStripMCDigiWorker.h b/SimGeneral/DataMixingModule/plugins/DataMixingSiStripMCDigiWorker.h index 4632cf936e8a0..6fe2c2577ecd5 100644 --- a/SimGeneral/DataMixingModule/plugins/DataMixingSiStripMCDigiWorker.h +++ b/SimGeneral/DataMixingModule/plugins/DataMixingSiStripMCDigiWorker.h @@ -36,7 +36,7 @@ #include "RecoLocalTracker/SiStripZeroSuppression/interface/SiStripFedZeroSuppression.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" diff --git a/SimMuon/MCTruth/src/MuonAssociatorByHits.cc b/SimMuon/MCTruth/src/MuonAssociatorByHits.cc index 59a26215fb4d3..7b9425eb595f9 100644 --- a/SimMuon/MCTruth/src/MuonAssociatorByHits.cc +++ b/SimMuon/MCTruth/src/MuonAssociatorByHits.cc @@ -1,6 +1,6 @@ #include "SimMuon/MCTruth/interface/MuonAssociatorByHits.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/MuonDetId/interface/MuonSubdetId.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" diff --git a/SimMuon/MCTruth/src/MuonAssociatorByHitsHelper.cc b/SimMuon/MCTruth/src/MuonAssociatorByHitsHelper.cc index 5260348096a41..87311ba288f84 100644 --- a/SimMuon/MCTruth/src/MuonAssociatorByHitsHelper.cc +++ b/SimMuon/MCTruth/src/MuonAssociatorByHitsHelper.cc @@ -1,6 +1,6 @@ #include "SimMuon/MCTruth/interface/MuonAssociatorByHitsHelper.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/MuonDetId/interface/MuonSubdetId.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" diff --git a/SimMuon/MCTruth/src/MuonToSimAssociatorByHits.cc b/SimMuon/MCTruth/src/MuonToSimAssociatorByHits.cc index 35c945cbcd881..26dc274a4acb2 100644 --- a/SimMuon/MCTruth/src/MuonToSimAssociatorByHits.cc +++ b/SimMuon/MCTruth/src/MuonToSimAssociatorByHits.cc @@ -1,6 +1,6 @@ #include "SimMuon/MCTruth/interface/MuonToSimAssociatorByHits.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/MuonDetId/interface/MuonSubdetId.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" diff --git a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc index 2b90e4d91a985..6ae60a9392f85 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc +++ b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc @@ -47,7 +47,7 @@ #include "SimDataFormats/TrackerDigiSimLink/interface/PixelDigiSimLink.h" #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" diff --git a/SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.cc b/SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.cc index b1e5af6329889..ecd568966b4b9 100644 --- a/SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.cc +++ b/SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.cc @@ -27,7 +27,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" diff --git a/SimTracker/SiPhase2Digitizer/test/Phase2TrackerValidateDigi.cc b/SimTracker/SiPhase2Digitizer/test/Phase2TrackerValidateDigi.cc index 8b9fc34a1bb10..38e41556b181f 100644 --- a/SimTracker/SiPhase2Digitizer/test/Phase2TrackerValidateDigi.cc +++ b/SimTracker/SiPhase2Digitizer/test/Phase2TrackerValidateDigi.cc @@ -25,7 +25,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/TrackerGeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" diff --git a/SimTracker/SiPhase2Digitizer/test/TBeamTest.cc b/SimTracker/SiPhase2Digitizer/test/TBeamTest.cc index b2d49a80bf72d..6746f75d51b23 100644 --- a/SimTracker/SiPhase2Digitizer/test/TBeamTest.cc +++ b/SimTracker/SiPhase2Digitizer/test/TBeamTest.cc @@ -38,7 +38,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" diff --git a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc index 1c2946182d4a0..e2014804f4eed 100644 --- a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc +++ b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc @@ -42,7 +42,7 @@ #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" #include "DataFormats/GeometryVector/interface/LocalVector.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" diff --git a/SimTracker/SiPixelDigitizer/test/PixelDigisTest.cc b/SimTracker/SiPixelDigitizer/test/PixelDigisTest.cc index e46cf8d929193..fcd0415461672 100644 --- a/SimTracker/SiPixelDigitizer/test/PixelDigisTest.cc +++ b/SimTracker/SiPixelDigitizer/test/PixelDigisTest.cc @@ -36,7 +36,7 @@ #include "FWCore/Utilities/interface/InputTag.h" // my includes -//#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +//#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/SimTracker/SiPixelDigitizer/test/PixelMixedSimHitsTest.cc b/SimTracker/SiPixelDigitizer/test/PixelMixedSimHitsTest.cc index 24363296a6d40..0608b2664e69c 100644 --- a/SimTracker/SiPixelDigitizer/test/PixelMixedSimHitsTest.cc +++ b/SimTracker/SiPixelDigitizer/test/PixelMixedSimHitsTest.cc @@ -33,7 +33,7 @@ #include "FWCore/Framework/interface/ESHandle.h" // my includes -//#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +//#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" diff --git a/SimTracker/SiPixelDigitizer/test/PixelSimHitsTest.cc b/SimTracker/SiPixelDigitizer/test/PixelSimHitsTest.cc index c28b5272f8568..02eac50e04529 100644 --- a/SimTracker/SiPixelDigitizer/test/PixelSimHitsTest.cc +++ b/SimTracker/SiPixelDigitizer/test/PixelSimHitsTest.cc @@ -36,7 +36,7 @@ New det-id. #include "FWCore/Framework/interface/ESHandle.h" // my includes -//#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +//#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" diff --git a/SimTracker/SiPixelDigitizer/test/PixelSimHitsTestForward.cc b/SimTracker/SiPixelDigitizer/test/PixelSimHitsTestForward.cc index 354cedd65ec56..b3c5390bb2141 100644 --- a/SimTracker/SiPixelDigitizer/test/PixelSimHitsTestForward.cc +++ b/SimTracker/SiPixelDigitizer/test/PixelSimHitsTestForward.cc @@ -32,7 +32,7 @@ #include "FWCore/Framework/interface/ESHandle.h" // my includes -//#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +//#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" diff --git a/SimTracker/SiStripDigitizer/plugins/DigiSimLinkAlgorithm.h b/SimTracker/SiStripDigitizer/plugins/DigiSimLinkAlgorithm.h index 5b034ff9eaa70..c8d1766a08cc3 100644 --- a/SimTracker/SiStripDigitizer/plugins/DigiSimLinkAlgorithm.h +++ b/SimTracker/SiStripDigitizer/plugins/DigiSimLinkAlgorithm.h @@ -25,7 +25,7 @@ #include "SimTracker/SiStripDigitizer/interface/SiGaussianTailNoiseAdder.h" #include "SiHitDigitizer.h" #include "DigiSimLinkPileUpSignals.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" diff --git a/SimTracker/SiStripDigitizer/plugins/SiHitDigitizer.h b/SimTracker/SiStripDigitizer/plugins/SiHitDigitizer.h index a20986b847e60..75a334a993a4f 100644 --- a/SimTracker/SiStripDigitizer/plugins/SiHitDigitizer.h +++ b/SimTracker/SiStripDigitizer/plugins/SiHitDigitizer.h @@ -4,7 +4,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "SimDataFormats/TrackingHit/interface/PSimHit.h" #include "SiChargeCollectionDrifter.h" diff --git a/SimTracker/SiStripDigitizer/plugins/SiStripDigitizerAlgorithm.h b/SimTracker/SiStripDigitizer/plugins/SiStripDigitizerAlgorithm.h index 7a00ab6ee0438..c32877e1b3984 100644 --- a/SimTracker/SiStripDigitizer/plugins/SiStripDigitizerAlgorithm.h +++ b/SimTracker/SiStripDigitizer/plugins/SiStripDigitizerAlgorithm.h @@ -27,7 +27,7 @@ #include "SimTracker/SiStripDigitizer/interface/SiGaussianTailNoiseAdder.h" #include "SiHitDigitizer.h" #include "SimTracker/SiStripDigitizer/interface/SiPileUpSignals.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" diff --git a/SimTracker/TrackAssociatorProducers/plugins/TrackAssociatorByHitsImpl.cc b/SimTracker/TrackAssociatorProducers/plugins/TrackAssociatorByHitsImpl.cc index a7f052d471f17..ee97859ef4b7e 100644 --- a/SimTracker/TrackAssociatorProducers/plugins/TrackAssociatorByHitsImpl.cc +++ b/SimTracker/TrackAssociatorProducers/plugins/TrackAssociatorByHitsImpl.cc @@ -18,7 +18,7 @@ #include "SimGeneral/TrackingAnalysis/interface/SimHitTPAssociationProducer.h" #include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h" //##---new stuff -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/DetId/interface/DetId.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" diff --git a/SimTracker/TrackerHitAssociation/test/TestAssociator.cc b/SimTracker/TrackerHitAssociation/test/TestAssociator.cc index b12dc55a661c8..6572173581a04 100644 --- a/SimTracker/TrackerHitAssociation/test/TestAssociator.cc +++ b/SimTracker/TrackerHitAssociation/test/TestAssociator.cc @@ -42,7 +42,7 @@ #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" diff --git a/SimTracker/TrackerHitAssociation/test/TestAssociator.h b/SimTracker/TrackerHitAssociation/test/TestAssociator.h index 2731d139b211f..f5c58e66b8ab3 100644 --- a/SimTracker/TrackerHitAssociation/test/TestAssociator.h +++ b/SimTracker/TrackerHitAssociation/test/TestAssociator.h @@ -21,7 +21,7 @@ //--- for SimHit #include "SimDataFormats/TrackingHit/interface/PSimHit.h" #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" diff --git a/TrackPropagation/SteppingHelixPropagator/test/SteppingHelixPropagatorAnalyzer.cc b/TrackPropagation/SteppingHelixPropagator/test/SteppingHelixPropagatorAnalyzer.cc index 501995c1c8a8f..3b346d45a4829 100644 --- a/TrackPropagation/SteppingHelixPropagator/test/SteppingHelixPropagatorAnalyzer.cc +++ b/TrackPropagation/SteppingHelixPropagator/test/SteppingHelixPropagatorAnalyzer.cc @@ -49,7 +49,7 @@ //#include "Geometry/RPCGeometry/interface/RPCRoll.h" #include "Geometry/Records/interface/MuonGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/TrackingTools/KalmanUpdators/src/Chi2Strip1DEstimator.cc b/TrackingTools/KalmanUpdators/src/Chi2Strip1DEstimator.cc index e95b0e23e38c4..76342710f8e5b 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/StripTopology.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/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 fc207aa8dc6ae..54ff54428c1a7 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/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/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 7c97b2e4b05dc..f5bb66ccbf2f6 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/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" TrajectoryStateOnSurface KFSwitching1DUpdator::update(const TSOS& aTsos, const TrackingRecHit& aHit) const { diff --git a/TrackingTools/KalmanUpdators/src/Strip1DMeasurementTransformator.cc b/TrackingTools/KalmanUpdators/src/Strip1DMeasurementTransformator.cc index c46c65b288d47..db99bbb650a61 100644 --- a/TrackingTools/KalmanUpdators/src/Strip1DMeasurementTransformator.cc +++ b/TrackingTools/KalmanUpdators/src/Strip1DMeasurementTransformator.cc @@ -1,5 +1,5 @@ #include "TrackingTools/KalmanUpdators/interface/Strip1DMeasurementTransformator.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" // #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h" #include "Geometry/CommonTopologies/interface/RadialStripTopology.h" diff --git a/TrackingTools/PatternTools/src/TempTrajectory.cc b/TrackingTools/PatternTools/src/TempTrajectory.cc index 2b508eb295e00..453f73e8bf6d7 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/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "FWCore/Utilities/interface/Exception.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" diff --git a/TrackingTools/TrackAssociator/src/TrackDetectorAssociator.cc b/TrackingTools/TrackAssociator/src/TrackDetectorAssociator.cc index af79cf07e1a0a..971153c691d1d 100644 --- a/TrackingTools/TrackAssociator/src/TrackDetectorAssociator.cc +++ b/TrackingTools/TrackAssociator/src/TrackDetectorAssociator.cc @@ -62,7 +62,7 @@ #include "DataFormats/GeometrySurface/interface/Cylinder.h" #include "DataFormats/GeometrySurface/interface/Plane.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/TrackingTools/TrackAssociator/test/CaloMatchingExample.cc b/TrackingTools/TrackAssociator/test/CaloMatchingExample.cc index 5c7901525ab05..f96ce4f388952 100644 --- a/TrackingTools/TrackAssociator/test/CaloMatchingExample.cc +++ b/TrackingTools/TrackAssociator/test/CaloMatchingExample.cc @@ -63,7 +63,7 @@ #include "DataFormats/GeometrySurface/interface/Cylinder.h" #include "DataFormats/GeometrySurface/interface/Plane.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/TrackingTools/TrackAssociator/test/TestTrackAssociator.cc b/TrackingTools/TrackAssociator/test/TestTrackAssociator.cc index b7bd23e3c6b11..212e06c3e3ebc 100644 --- a/TrackingTools/TrackAssociator/test/TestTrackAssociator.cc +++ b/TrackingTools/TrackAssociator/test/TestTrackAssociator.cc @@ -65,7 +65,7 @@ #include "DataFormats/GeometrySurface/interface/Cylinder.h" #include "DataFormats/GeometrySurface/interface/Plane.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/Validation/GlobalHits/interface/GlobalHitsAnalyzer.h b/Validation/GlobalHits/interface/GlobalHitsAnalyzer.h index 86c35478a3a14..7df785f2e8067 100644 --- a/Validation/GlobalHits/interface/GlobalHitsAnalyzer.h +++ b/Validation/GlobalHits/interface/GlobalHitsAnalyzer.h @@ -20,7 +20,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Utilities/interface/InputTag.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/DetId/interface/DetId.h" //DQM services diff --git a/Validation/GlobalHits/interface/GlobalHitsHistogrammer.h b/Validation/GlobalHits/interface/GlobalHitsHistogrammer.h index 20641b14ecf3d..0064eea6f469a 100644 --- a/Validation/GlobalHits/interface/GlobalHitsHistogrammer.h +++ b/Validation/GlobalHits/interface/GlobalHitsHistogrammer.h @@ -18,7 +18,7 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -//#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +//#include "Geometry/CommonDetUnit/interface/GeomDet.h" //#include "DataFormats/DetId/interface/DetId.h" //DQM services diff --git a/Validation/GlobalHits/interface/GlobalHitsProdHist.h b/Validation/GlobalHits/interface/GlobalHitsProdHist.h index 6ea255e884d73..a931700528515 100644 --- a/Validation/GlobalHits/interface/GlobalHitsProdHist.h +++ b/Validation/GlobalHits/interface/GlobalHitsProdHist.h @@ -21,7 +21,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Utilities/interface/InputTag.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/DetId/interface/DetId.h" //DQM services diff --git a/Validation/GlobalHits/interface/GlobalHitsProducer.h b/Validation/GlobalHits/interface/GlobalHitsProducer.h index f5a6150ac0f4d..7934697697725 100644 --- a/Validation/GlobalHits/interface/GlobalHitsProducer.h +++ b/Validation/GlobalHits/interface/GlobalHitsProducer.h @@ -22,7 +22,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Utilities/interface/InputTag.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/DetId/interface/DetId.h" // tracker info diff --git a/Validation/GlobalHits/interface/GlobalHitsTester.h b/Validation/GlobalHits/interface/GlobalHitsTester.h index b0d2309cd4b80..089acb22bed1a 100644 --- a/Validation/GlobalHits/interface/GlobalHitsTester.h +++ b/Validation/GlobalHits/interface/GlobalHitsTester.h @@ -19,7 +19,7 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -//#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +//#include "Geometry/CommonDetUnit/interface/GeomDet.h" //#include "DataFormats/DetId/interface/DetId.h" #include "TRandom.h" #include "TRandom3.h" diff --git a/Validation/GlobalRecHits/interface/GlobalRecHitsAnalyzer.h b/Validation/GlobalRecHits/interface/GlobalRecHitsAnalyzer.h index 605487b5620c3..eef22ab6e4744 100644 --- a/Validation/GlobalRecHits/interface/GlobalRecHitsAnalyzer.h +++ b/Validation/GlobalRecHits/interface/GlobalRecHitsAnalyzer.h @@ -124,7 +124,7 @@ // general info #include "DataFormats/DetId/interface/DetId.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include #include diff --git a/Validation/GlobalRecHits/interface/GlobalRecHitsProducer.h b/Validation/GlobalRecHits/interface/GlobalRecHitsProducer.h index d44f1f7bb21d3..d0a4bd0cf0c89 100644 --- a/Validation/GlobalRecHits/interface/GlobalRecHitsProducer.h +++ b/Validation/GlobalRecHits/interface/GlobalRecHitsProducer.h @@ -129,7 +129,7 @@ // general info #include "DataFormats/DetId/interface/DetId.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" // helper files //#include diff --git a/Validation/MuonHits/src/MuonSimHitsValidAnalyzer.h b/Validation/MuonHits/src/MuonSimHitsValidAnalyzer.h index e294cb92e16b3..0268f5ff843c3 100644 --- a/Validation/MuonHits/src/MuonSimHitsValidAnalyzer.h +++ b/Validation/MuonHits/src/MuonSimHitsValidAnalyzer.h @@ -12,7 +12,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ServiceRegistry/interface/Service.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "DataFormats/GeometrySurface/interface/BoundPlane.h" #include "DataFormats/DetId/interface/DetId.h" diff --git a/Validation/RecoEgamma/plugins/PhotonValidator.cc b/Validation/RecoEgamma/plugins/PhotonValidator.cc index c19bf6d294b64..7f616c25fb69b 100755 --- a/Validation/RecoEgamma/plugins/PhotonValidator.cc +++ b/Validation/RecoEgamma/plugins/PhotonValidator.cc @@ -20,7 +20,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" // #include "DataFormats/Math/interface/deltaR.h" #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h" diff --git a/Validation/RecoEgamma/plugins/TkConvValidator.cc b/Validation/RecoEgamma/plugins/TkConvValidator.cc index 4bb7a08c1106e..cf97c29134d18 100644 --- a/Validation/RecoEgamma/plugins/TkConvValidator.cc +++ b/Validation/RecoEgamma/plugins/TkConvValidator.cc @@ -25,7 +25,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" // #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h" #include "TrackingTools/PatternTools/interface/TwoTrackMinimumDistance.h" diff --git a/Validation/RecoTrack/interface/SiPixelTrackingRecHitsValid.h b/Validation/RecoTrack/interface/SiPixelTrackingRecHitsValid.h index 66de119e30695..d1b2d5fa6974a 100644 --- a/Validation/RecoTrack/interface/SiPixelTrackingRecHitsValid.h +++ b/Validation/RecoTrack/interface/SiPixelTrackingRecHitsValid.h @@ -54,7 +54,7 @@ #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/Validation/RecoTrack/interface/SiStripTrackingRecHitsValid.h b/Validation/RecoTrack/interface/SiStripTrackingRecHitsValid.h index 17c6e386f6621..fdc94c027f7a3 100644 --- a/Validation/RecoTrack/interface/SiStripTrackingRecHitsValid.h +++ b/Validation/RecoTrack/interface/SiStripTrackingRecHitsValid.h @@ -55,7 +55,7 @@ #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/Validation/RecoTrack/plugins/SiPixelTrackingRecHitsValid.cc b/Validation/RecoTrack/plugins/SiPixelTrackingRecHitsValid.cc index d9c28d6269525..2c65a9552445e 100644 --- a/Validation/RecoTrack/plugins/SiPixelTrackingRecHitsValid.cc +++ b/Validation/RecoTrack/plugins/SiPixelTrackingRecHitsValid.cc @@ -38,7 +38,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include diff --git a/Validation/RecoVertex/interface/V0Validator.h b/Validation/RecoVertex/interface/V0Validator.h index e0c6c4a071900..2262aa0c62737 100644 --- a/Validation/RecoVertex/interface/V0Validator.h +++ b/Validation/RecoVertex/interface/V0Validator.h @@ -57,7 +57,7 @@ #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticleFwd.h" #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" diff --git a/Validation/TrackerHits/src/TrackerHitAnalyzer.cc b/Validation/TrackerHits/src/TrackerHitAnalyzer.cc index 2ad4d88cbd10e..ca772b91617c8 100644 --- a/Validation/TrackerHits/src/TrackerHitAnalyzer.cc +++ b/Validation/TrackerHits/src/TrackerHitAnalyzer.cc @@ -15,11 +15,11 @@ // tracker info #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" // data in edm::event diff --git a/Validation/TrackerHits/src/TrackerHitProducer.cc b/Validation/TrackerHits/src/TrackerHitProducer.cc index 8e6d23650f98f..7d57c3ae4e884 100644 --- a/Validation/TrackerHits/src/TrackerHitProducer.cc +++ b/Validation/TrackerHits/src/TrackerHitProducer.cc @@ -13,7 +13,7 @@ #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" // tracker info -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/Validation/TrackerRecHits/interface/SiStripRecHitsValid.h b/Validation/TrackerRecHits/interface/SiStripRecHitsValid.h index ae7ee630fc3c9..f547afad54d4a 100644 --- a/Validation/TrackerRecHits/interface/SiStripRecHitsValid.h +++ b/Validation/TrackerRecHits/interface/SiStripRecHitsValid.h @@ -26,7 +26,7 @@ #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/Validation/TrackerRecHits/src/SiPixelRecHitsValid.cc b/Validation/TrackerRecHits/src/SiPixelRecHitsValid.cc index 8229753c647f2..beca6a6d4fe0a 100644 --- a/Validation/TrackerRecHits/src/SiPixelRecHitsValid.cc +++ b/Validation/TrackerRecHits/src/SiPixelRecHitsValid.cc @@ -32,7 +32,7 @@ #include "FWCore/ServiceRegistry/interface/Service.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"