From 945a7b3fc0dade294544694363deddcceb4803c2 Mon Sep 17 00:00:00 2001
From: Ianna Osborne <ianna.osborne@cern.ch>
Date: Fri, 23 Jun 2017 16:37:24 +0200
Subject: [PATCH] Move single headeer file in a package which can give correct
 dependency

---
 .../plugins/AlignmentMonitorAsAnalyzer.cc     |  2 +-
 .../interface/AlignmentProducerBase.h         |  2 +-
 .../plugins/GlobalTrackerMuonAlignment.cc     |  2 +-
 .../LaserAlignment/plugins/LaserAlignment.h   |  2 +-
 .../plugins/MisalignedMuonESProducer.cc       |  2 +-
 .../MuonAlignment/src/MuonAlignmentInputDB.cc |  2 +-
 .../plugins/TrackerGeometryCompare.cc         |  2 +-
 .../plugins/TrackerGeometryIntoNtuples.cc     |  2 +-
 .../plugins/CreateSurveyRcds.cc               |  2 +-
 .../plugins/MisalignedTrackerESProducer.cc    |  2 +-
 .../plugins/TrackerSystematicMisalignments.cc |  2 +-
 .../plugins/CSCGeometryESModule.cc            |  2 +-
 .../interface/GeometryAligner.h               |  0
 .../plugins/DTGeometryESModule.cc             |  2 +-
 .../plugins/TrackerDigiGeometryESModule.cc    |  2 +-
 .../TrackingGeometryAligner/BuildFile.xml     |  2 -
 .../doc/TrackingGeometryAligner.doc           | 48 -------------------
 17 files changed, 14 insertions(+), 64 deletions(-)
 rename Geometry/{TrackingGeometryAligner => CommonTopologies}/interface/GeometryAligner.h (100%)
 delete mode 100644 Geometry/TrackingGeometryAligner/BuildFile.xml
 delete mode 100644 Geometry/TrackingGeometryAligner/doc/TrackingGeometryAligner.doc

diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc
index ffe63c292dda1..1ed3713e561b7 100644
--- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc
+++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc
@@ -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"
diff --git a/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h b/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h
index 97479812225a8..9758e9fd43393 100644
--- a/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h
+++ b/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h
@@ -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"
 
diff --git a/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc b/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc
index b424758830866..a6bc8cff6aa4d 100644
--- a/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc
+++ b/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc
@@ -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"
 
diff --git a/Alignment/LaserAlignment/plugins/LaserAlignment.h b/Alignment/LaserAlignment/plugins/LaserAlignment.h
index fc6c11803dac2..5ae0d8a403abd 100644
--- a/Alignment/LaserAlignment/plugins/LaserAlignment.h
+++ b/Alignment/LaserAlignment/plugins/LaserAlignment.h
@@ -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"
 
diff --git a/Alignment/MuonAlignment/plugins/MisalignedMuonESProducer.cc b/Alignment/MuonAlignment/plugins/MisalignedMuonESProducer.cc
index c8a0440b24108..421ae7d9792bb 100755
--- a/Alignment/MuonAlignment/plugins/MisalignedMuonESProducer.cc
+++ b/Alignment/MuonAlignment/plugins/MisalignedMuonESProducer.cc
@@ -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"
diff --git a/Alignment/MuonAlignment/src/MuonAlignmentInputDB.cc b/Alignment/MuonAlignment/src/MuonAlignmentInputDB.cc
index 2bfca6c184cd5..ef16562264f4d 100644
--- a/Alignment/MuonAlignment/src/MuonAlignmentInputDB.cc
+++ b/Alignment/MuonAlignment/src/MuonAlignmentInputDB.cc
@@ -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"
 
diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc
index 35a0616fba8dd..8b9542fdd7930 100644
--- a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc
+++ b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc
@@ -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"
diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc b/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc
index 97cbb001d18ef..4909ef1db0e93 100644
--- a/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc
+++ b/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc
@@ -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"
 
diff --git a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc
index 9aa71afc95779..a484eef80037f 100644
--- a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc
+++ b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc
@@ -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
diff --git a/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc b/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc
index 0896768d3710a..2bf97ae2820aa 100644
--- a/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc
+++ b/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc
@@ -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"
diff --git a/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc b/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc
index c9319137275a4..2c8e96d2ed562 100644
--- a/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc
+++ b/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc
@@ -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"
diff --git a/Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.cc b/Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.cc
index c81583d332e57..fb15b12745202 100644
--- a/Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.cc
+++ b/Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.cc
@@ -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"
diff --git a/Geometry/TrackingGeometryAligner/interface/GeometryAligner.h b/Geometry/CommonTopologies/interface/GeometryAligner.h
similarity index 100%
rename from Geometry/TrackingGeometryAligner/interface/GeometryAligner.h
rename to Geometry/CommonTopologies/interface/GeometryAligner.h
diff --git a/Geometry/DTGeometryBuilder/plugins/DTGeometryESModule.cc b/Geometry/DTGeometryBuilder/plugins/DTGeometryESModule.cc
index e397b0912bfc2..5e4e571503c94 100644
--- a/Geometry/DTGeometryBuilder/plugins/DTGeometryESModule.cc
+++ b/Geometry/DTGeometryBuilder/plugins/DTGeometryESModule.cc
@@ -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>
diff --git a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc
index d52eeb4dd02df..8cffff5d0125d 100644
--- a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc
+++ b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc
@@ -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"
diff --git a/Geometry/TrackingGeometryAligner/BuildFile.xml b/Geometry/TrackingGeometryAligner/BuildFile.xml
deleted file mode 100644
index 5657a244828a1..0000000000000
--- a/Geometry/TrackingGeometryAligner/BuildFile.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<export>
-</export>
diff --git a/Geometry/TrackingGeometryAligner/doc/TrackingGeometryAligner.doc b/Geometry/TrackingGeometryAligner/doc/TrackingGeometryAligner.doc
deleted file mode 100644
index 97c665e94a1b6..0000000000000
--- a/Geometry/TrackingGeometryAligner/doc/TrackingGeometryAligner.doc
+++ /dev/null
@@ -1,48 +0,0 @@
-
-/*!
-
-\page Geometry_TrackingGeometryAligner Package Geometry/TrackingGeometryAligner
-
-<center>
-<small>
-
-<!-- @CVS_TAG@ will be substituted at build time, no need to touch -->
-<a href=http://cmssw.cvs.cern.ch/cgi-bin/cmssw.cgi/CMSSW/Geometry/TrackingGeometryAligner/?cvsroot=CMSSW&only_with_tag=@CVS_TAG@>Source code (CVS tag: @CVS_TAG@)</a> - 
-<a href=http://cmssw.cvs.cern.ch/cgi-bin/cmssw.cgi/CMSSW/Geometry/TrackingGeometryAligner/.admin/developers?rev=HEAD&cvsroot=CMSSW&content-type=text/vnd.viewcvs-markup>Administrative privileges</a>
-</small>
-</center>
-
-\section desc Description
-<!-- Short description of what this package is supposed to provide -->
-
-(THE PACKAGE ADMINISTATOR SHOULD REPLACE THIS SENTENCE WITH HAND-WRITTEN DOCUMENTATION SAYING WHAT THE PACKAGE DOES.)
-
-\subsection interface Public interface
-<!-- List the classes that are provided for use in other packages (if any) -->
-
-- GeometryAligner
-
-
-\subsection pluginai Plugins
-<!-- List the plugins that are provided for use in other packages (if any) -->
-
-
-
-
-\subsection modules Modules
-<!-- Describe modules implemented in this package and their parameter set -->
-
-
-\subsection tests Unit tests and examples
-<!-- Describe cppunit tests and example configuration files -->
-Unknown
-
-\section status Status and planned development
-<!-- e.g. completed, stable, missing features -->
-Unknown
-
-<hr>
-Last updated:
-@DATE@  Author: computer-generated.
-*/
-