Skip to content

Commit

Permalink
Merge pull request #28127 from ianna/data-formats-geom-cleanup-v1
Browse files Browse the repository at this point in the history 
DataFormats dependency on Geometry Cleanup
  • Loading branch information
@cmsbuild
cmsbuild authored Oct 12, 2019
2 parents 81e12a9 + 4d4b4d1 commit e7ec703
Show file tree
Hide file tree
Showing 191 changed files with 1,790 additions and 2,036 deletions.
1 change: 0 additions & 1 deletion Alignment/APEEstimation/BuildFile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<use name="TrackingTools/TrajectoryState"/>
<use name="Geometry/CommonDetUnit"/>
<use name="Geometry/CommonTopologies"/>
<use name="Geometry/TrackerGeometryBuilder"/>
<use name="CondFormats/Alignment"/>
<use name="RecoLocalTracker/SiStripClusterizer"/>
<use name="RecoLocalTracker/SiStripRecHitConverter"/>
Expand Down
2 changes: 1 addition & 1 deletion Alignment/APEEstimation/plugins/ApeEstimator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
//added by Ajay 6Nov 2014
//.......................
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"

#include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h"

Expand Down
2 changes: 0 additions & 2 deletions Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@
<use name="DataFormats/CSCRecHit"/>
<use name="DataFormats/DTRecHit"/>
<use name="DataFormats/TrackingRecHit"/>
<use name="Geometry/TrackerGeometryBuilder"/>
<use name="Geometry/DTGeometry"/>
<use name="Geometry/CSCGeometry"/>
<use name="Geometry/CommonDetUnit"/>
Expand All @@ -104,7 +103,6 @@

<library name="AlignmentStats" file="AlignmentStats.cc">
<use name="FWCore/Utilities"/>
<use name="Geometry/TrackerGeometryBuilder"/>
<use name="Geometry/Records"/>
<use name="Alignment/CommonAlignment"/>
<use name="Alignment/TrackerAlignment"/>
Expand Down
1 change: 0 additions & 1 deletion Alignment/CommonAlignmentProducer/BuildFile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<use name="FWCore/ServiceRegistry"/>
<use name="DataFormats/Alignment"/>
<use name="Geometry/Records"/>
<use name="Geometry/TrackerGeometryBuilder"/>
<use name="rootcore"/>
<use name="root"/>
<export>
Expand Down
4 changes: 2 additions & 2 deletions Alignment/OfflineValidation/plugins/OverlapValidation.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
#include "FWCore/ParameterSet/interface/FileInPath.h"
#include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"

#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
#include "Geometry/CommonDetUnit/interface/GeomDet.h"
#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiPixelConnectivity/src/SiPixelFedCablingMapBuilder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "CalibTracker/SiPixelConnectivity/interface/SiPixelFedCablingMapBuilder.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
#include "FWCore/Framework/interface/ESHandle.h"

Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonDetUnit/interface/GeomDet.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"

using namespace cms;
using namespace std;
Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.h"

#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
namespace cms {
Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.h"

#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
namespace cms {
Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.h"

#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
namespace cms {
Expand Down
4 changes: 2 additions & 2 deletions CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"

#include "Geometry/CommonTopologies/interface/PixelTopology.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/GeomDetType.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"
#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"

#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
#include "SimDataFormats/Track/interface/SimTrackContainer.h"
Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
#include <Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h>
#include <Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h>
#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
#include <TROOT.h>
Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// Pixel geometry and cabling map
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "CondFormats/SiPixelObjects/interface/SiPixelFedCabling.h"
#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
#include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
#include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h"
#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
// EDProducer related dataformat
#include "DQM/SiPixelPhase1Common/interface/SiPixelCoordinates.h"
Expand Down
4 changes: 2 additions & 2 deletions CalibTracker/SiPixelTools/plugins/SiPixelErrorsDigisToCalibDigis.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ Description: Create monitorElements for the Errors in created in the reduction o
#include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h"

#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"

#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
Expand Down
4 changes: 2 additions & 2 deletions CalibTracker/SiPixelTools/src/SiPixelOfflineCalibAnalysisBase.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

#include "CalibTracker/SiPixelTools/interface/SiPixelOfflineCalibAnalysisBase.h"

#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"

#include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h"
Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
#include "Geometry/CommonTopologies/interface/StripTopology.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
Expand Down
4 changes: 2 additions & 2 deletions CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include "CLHEP/Random/RandGauss.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "DataFormats/TrackReco/interface/Track.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"
Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
#include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"

Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"

Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"

Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"

Expand Down
2 changes: 1 addition & 1 deletion CondFormats/SiPixelObjects/src/SiPixelFrameReverter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// Geometry
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"

#include "FWCore/MessageLogger/interface/MessageLogger.h"
Expand Down
2 changes: 1 addition & 1 deletion CondFormats/SiPixelObjects/src/SiPixelQuality.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingTree.h"
#include "CondFormats/SiPixelObjects/interface/PixelROC.h"
#include "CondFormats/SiPixelObjects/interface/LocalPixel.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"

Expand Down
2 changes: 1 addition & 1 deletion CondFormats/SiPixelObjects/test/SiPixelTestSummary.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include "CondFormats/SiPixelObjects/interface/SiPixelDetSummary.h"

#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"

Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"

#include "DataFormats/DetId/interface/DetId.h"
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelBadModuleReader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "CondFormats/SiPixelObjects/interface/SiPixelFedCabling.h"
#include "CondFormats/SiPixelObjects/interface/PixelROC.h"
#include "CondFormats/SiPixelObjects/interface/PixelFEDCabling.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "CommonTools/UtilAlgos/interface/TFileService.h"
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelCondObjAllPayloadsReader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "CondTools/SiPixel/test/SiPixelCondObjAllPayloadsReader.h"

#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelCondObjBuilder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"

Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelCondObjForHLTBuilder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelCondObjForHLTReader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "CondTools/SiPixel/test/SiPixelCondObjForHLTReader.h"

#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelCondObjOfflineBuilder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelCondObjOfflineReader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineService.h"
#include "CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineSimService.h"

#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelCondObjReader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "CondTools/SiPixel/test/SiPixelCondObjReader.h"

#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelDynamicInefficiencyDB.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <limits>
#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
#include "CondTools/SiPixel/test/SiPixelDynamicInefficiencyDB.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "CondFormats/SiPixelObjects/interface/SiPixelDynamicInefficiency.h"
#include "FWCore/Framework/interface/ESHandle.h"

Expand Down
4 changes: 2 additions & 2 deletions CondTools/SiPixel/test/SiPixelDynamicInefficiencyReader.cc
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#include "CondFormats/SiPixelObjects/interface/SiPixelDynamicInefficiency.h"
#include "CondFormats/DataRecord/interface/SiPixelDynamicInefficiencyRcd.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "CondTools/SiPixel/test/SiPixelDynamicInefficiencyReader.h"
#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
#include "DataFormats/DetId/interface/DetId.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
#include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelGainCalibrationReadDQMFile.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"

#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"

Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelGainCalibrationRejectNoisyAndDead.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "SiPixelGainCalibrationRejectNoisyAndDead.h"

#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"

Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"

#include <fstream>
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelLorentzAngleDB.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <fstream>
#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
#include "CondTools/SiPixel/test/SiPixelLorentzAngleDB.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
#include "CondFormats/SiPixelObjects/interface/SiPixelLorentzAngle.h"
#include "FWCore/Framework/interface/ESHandle.h"

Expand Down
Loading

0 comments on commit e7ec703

Please sign in to comment.