Skip to content

Commit

Permalink
Merge pull request #19416 from ianna/geometry-aligner-dependency-fix
Browse files Browse the repository at this point in the history 
Move Geometry Aligner Header
  • Loading branch information
@cmsbuild
cmsbuild authored Jun 26, 2017
2 parents e1556d0 + 945a7b3 commit 4fd75fa
Show file tree
Hide file tree
Showing 17 changed files with 14 additions and 64 deletions.
2 changes: 1 addition & 1 deletion Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#include "Geometry/MuonNumbering/interface/MuonDDDConstants.h"
#include "Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDDD.h"
#include "Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.h"
#include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h"
#include "Geometry/CommonTopologies/interface/GeometryAligner.h"
#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
#include "Geometry/Records/interface/PTrackerParametersRcd.h"
#include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h"
Expand Down
2 changes: 1 addition & 1 deletion Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

#include "Geometry/DTGeometry/interface/DTGeometry.h"
#include "Geometry/CSCGeometry/interface/CSCGeometry.h"
#include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h"
#include "Geometry/CommonTopologies/interface/GeometryAligner.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/Records/interface/IdealGeometryRecord.h"

Expand Down
2 changes: 1 addition & 1 deletion Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
#include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
#include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h"
#include "Geometry/CommonTopologies/interface/GeometryAligner.h"
#include "MagneticField/Engine/interface/MagneticField.h"
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"

Expand Down
2 changes: 1 addition & 1 deletion Alignment/LaserAlignment/plugins/LaserAlignment.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/CommonTopologies/interface/StripTopology.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h"
#include "Geometry/CommonTopologies/interface/GeometryAligner.h"

#include "Alignment/TrackerAlignment/interface/AlignableTracker.h"

Expand Down
2 changes: 1 addition & 1 deletion Alignment/MuonAlignment/plugins/MisalignedMuonESProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "Geometry/CSCGeometry/interface/CSCGeometry.h"
#include "Alignment/MuonAlignment/interface/MuonScenarioBuilder.h"
#include "Alignment/CommonAlignment/interface/Alignable.h"
#include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h"
#include "Geometry/CommonTopologies/interface/GeometryAligner.h"
#include "Geometry/Records/interface/MuonGeometryRecord.h"
#include "Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDDD.h"
#include "Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.h"
Expand Down
2 changes: 1 addition & 1 deletion Alignment/MuonAlignment/src/MuonAlignmentInputDB.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "CondFormats/AlignmentRecord/interface/DTAlignmentErrorExtendedRcd.h"
#include "CondFormats/AlignmentRecord/interface/CSCAlignmentRcd.h"
#include "CondFormats/AlignmentRecord/interface/CSCAlignmentErrorExtendedRcd.h"
#include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h"
#include "Geometry/CommonTopologies/interface/GeometryAligner.h"
#include "CondFormats/Alignment/interface/DetectorGlobalPosition.h"
#include "Geometry/Records/interface/MuonGeometryRecord.h"

Expand Down
2 changes: 1 addition & 1 deletion Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h"
#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
#include "Geometry/Records/interface/IdealGeometryRecord.h"
#include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h"
#include "Geometry/CommonTopologies/interface/GeometryAligner.h"
#include "Alignment/CommonAlignment/interface/Utilities.h"
#include "Alignment/CommonAlignment/interface/SurveyDet.h"
#include "Alignment/CommonAlignment/interface/Alignable.h"
Expand Down
2 changes: 1 addition & 1 deletion Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
#include "Geometry/Records/interface/TrackerTopologyRcd.h"

#include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h"
#include "Geometry/CommonTopologies/interface/GeometryAligner.h"

#include "Alignment/CommonAlignment/interface/Alignable.h"

Expand Down
2 changes: 1 addition & 1 deletion Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "DataFormats/DetId/interface/DetId.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.h"
#include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h"
#include "Geometry/CommonTopologies/interface/GeometryAligner.h"
#include "CLHEP/Random/RandGauss.h"

// Database
Expand Down
2 changes: 1 addition & 1 deletion Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

// Geometry
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h"
#include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h"
#include "Geometry/CommonTopologies/interface/GeometryAligner.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/Records/interface/TrackerTopologyRcd.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
Expand Down
2 changes: 1 addition & 1 deletion Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "DataFormats/DetId/interface/DetId.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h"
#include "Geometry/CommonTopologies/interface/GeometryAligner.h"
#include "CLHEP/Random/RandGauss.h"

#include "Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.h"
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h"
#include "CondFormats/AlignmentRecord/interface/CSCAlignmentRcd.h"
#include "CondFormats/AlignmentRecord/interface/CSCAlignmentErrorExtendedRcd.h"
#include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h"
#include "Geometry/CommonTopologies/interface/GeometryAligner.h"

#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/ESTransientHandle.h"
Expand Down
0 ...ometryAligner/interface/GeometryAligner.h → ...monTopologies/interface/GeometryAligner.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion Geometry/DTGeometryBuilder/plugins/DTGeometryESModule.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "CondFormats/AlignmentRecord/interface/DTAlignmentRcd.h"
#include "CondFormats/AlignmentRecord/interface/DTAlignmentErrorRcd.h"
#include "CondFormats/AlignmentRecord/interface/DTAlignmentErrorExtendedRcd.h"
#include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h"
#include "Geometry/CommonTopologies/interface/GeometryAligner.h"

#include <FWCore/Framework/interface/ESHandle.h>
#include <FWCore/Framework/interface/ESTransientHandle.h>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h"
#include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h"
#include "CondFormats/AlignmentRecord/interface/TrackerSurfaceDeformationRcd.h"
#include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h"
#include "Geometry/CommonTopologies/interface/GeometryAligner.h"

#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/ESHandle.h"
Expand Down
2 changes: 0 additions & 2 deletions Geometry/TrackingGeometryAligner/BuildFile.xml
View file

This file was deleted.

48 changes: 0 additions & 48 deletions Geometry/TrackingGeometryAligner/doc/TrackingGeometryAligner.doc
View file

This file was deleted.

0 comments on commit 4fd75fa

Please sign in to comment.