Merge pull request #31257 from davidlange6/dl200827

Move AlignmentPositionError to DataFormats/GeometryCommonDetAlgo
cms-sw · Aug 29, 2020 · d093311 · d093311
2 parents 3199564 + 6b8ba04
commit d093311
Show file tree

Hide file tree

Showing 31 changed files with 32 additions and 23 deletions.
diff --git a/Alignment/CommonAlignment/BuildFile.xml b/Alignment/CommonAlignment/BuildFile.xml
@@ -2,13 +2,14 @@
   <lib name="1"/>
 </export>
 <use name="CondCore/CondDB"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
 <use name="DataFormats/GeometrySurface"/>
-<use name="DataFormats/TrackingRecHit"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
 <use name="Geometry/CommonDetUnit"/>
 <use name="Geometry/CommonTopologies"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
-<use name="clhep"/>
+<use name="TrackingTools/TransientTrackingRecHit"/>
+<use name="clhep"/>
diff --git a/Alignment/CommonAlignment/src/AlignableBeamSpot.cc b/Alignment/CommonAlignment/src/AlignableBeamSpot.cc
@@ -11,7 +11,7 @@
 #include "CondFormats/Alignment/interface/Alignments.h"
 #include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
 #include "CLHEP/Vector/RotationInterfaces.h"
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
 #include "Alignment/CommonAlignment/interface/AlignableBeamSpot.h"
 
 #include "FWCore/Utilities/interface/Exception.h"

diff --git a/Alignment/CommonAlignment/src/AlignableComposite.cc b/Alignment/CommonAlignment/src/AlignableComposite.cc
@@ -6,7 +6,7 @@
 
 #include "CondFormats/Alignment/interface/Alignments.h"
 #include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
 
 #include "Alignment/CommonAlignment/interface/AlignableComposite.h"

diff --git a/Alignment/CommonAlignment/src/AlignableDet.cc b/Alignment/CommonAlignment/src/AlignableDet.cc
@@ -2,7 +2,7 @@
 #include "CondFormats/Alignment/interface/Alignments.h"
 #include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
 #include "CLHEP/Vector/RotationInterfaces.h"
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.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
@@ -5,7 +5,7 @@
 #include "CondFormats/Alignment/interface/Alignments.h"
 #include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
 #include "CLHEP/Vector/RotationInterfaces.h"
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
 #include "Geometry/CommonTopologies/interface/SurfaceDeformation.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"

diff --git a/Alignment/CommonAlignment/src/AlignableModifier.cc b/Alignment/CommonAlignment/src/AlignableModifier.cc
@@ -5,7 +5,7 @@
 #include "CLHEP/Random/RandGauss.h"
 #include "CLHEP/Random/Randomize.h"
 
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"

diff --git a/Alignment/CommonAlignmentAlgorithm/BuildFile.xml b/Alignment/CommonAlignmentAlgorithm/BuildFile.xml
@@ -3,6 +3,7 @@
 <use name="Alignment/MuonAlignment"/>
 <use name="Alignment/TrackerAlignment"/>
 <use name="DataFormats/CLHEP"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
 <use name="DataFormats/TrackingRecHit"/>
 <use name="CondFormats/Alignment"/>
 <use name="DataFormats/SiStripDetId"/>

diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/ApeSettingAlgorithm.cc b/Alignment/CommonAlignmentAlgorithm/plugins/ApeSettingAlgorithm.cc
@@ -41,7 +41,7 @@
 #include <string>
 #include <set>
 
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterStore.h"
 
 #include "Alignment/CommonAlignment/interface/AlignableNavigator.h"

diff --git a/Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterStore.cc b/Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterStore.cc
@@ -20,7 +20,7 @@
 #include "Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters.h"
 #include "Alignment/CommonAlignmentParametrization/interface/ParametersToParametersDerivatives.h"
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentExtendedCorrelationsStore.h"
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
 
 #include "Geometry/CommonTopologies/interface/SurfaceDeformation.h"
 #include "Geometry/CommonTopologies/interface/SurfaceDeformationFactory.h"

diff --git a/Alignment/CommonAlignmentAlgorithm/src/IntegratedCalibrationBase.cc b/Alignment/CommonAlignmentAlgorithm/src/IntegratedCalibrationBase.cc
@@ -10,6 +10,7 @@
 
 #include "Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationBase.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
 
 // Already included in header:
 //#include <vector>

diff --git a/Alignment/MuonAlignment/BuildFile.xml b/Alignment/MuonAlignment/BuildFile.xml
@@ -2,6 +2,7 @@
   <lib name="1"/>
 </export>
 <use name="Alignment/CommonAlignment"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
 <use name="Geometry/DTGeometry"/>
 <use name="Geometry/CSCGeometry"/>
 <use name="Geometry/CommonTopologies"/>
@@ -11,5 +12,4 @@
 <use name="CondCore/DBOutputService"/>
 <use name="CondFormats/Alignment"/>
 <use name="DataFormats/MuonDetId"/>
-<use name="DataFormats/TrackingRecHit"/>
 <use name="xerces-c"/>
diff --git a/Alignment/MuonAlignment/src/MuonAlignment.cc b/Alignment/MuonAlignment/src/MuonAlignment.cc
@@ -23,7 +23,7 @@
 
 #include "Alignment/CommonAlignment/interface/Alignable.h"
 #include "Alignment/CommonAlignment/interface/SurveyDet.h"
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h"
 
 //____________________________________________________________________________________

diff --git a/Alignment/MuonAlignment/src/MuonAlignmentInputXML.cc b/Alignment/MuonAlignment/src/MuonAlignmentInputXML.cc
@@ -31,7 +31,7 @@ XERCES_CPP_NAMESPACE_USE
 #include "DataFormats/MuonDetId/interface/CSCDetId.h"
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
 #include "Alignment/CommonAlignment/interface/SurveyDet.h"
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 //

diff --git a/Alignment/TrackerAlignment/BuildFile.xml b/Alignment/TrackerAlignment/BuildFile.xml
@@ -1,6 +1,7 @@
 <use name="Alignment/CommonAlignment"/>
 <use name="CondCore/DBOutputService"/>
 <use name="CondFormats/Alignment"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
 <use name="DataFormats/GeometrySurface"/>
 <use name="DataFormats/SiPixelDetId"/>
 <use name="DataFormats/SiStripDetId"/>

diff --git a/Alignment/TrackerAlignment/src/AlignableSiStripDet.cc b/Alignment/TrackerAlignment/src/AlignableSiStripDet.cc
@@ -11,7 +11,7 @@
 #include "CondFormats/Alignment/interface/AlignTransformErrorExtended.h"
 
 #include "DataFormats/GeometrySurface/interface/Bounds.h"
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h"
 #include "DataFormats/GeometrySurface/interface/BoundPlane.h"
 #include "Geometry/TrackerGeometryBuilder/interface/PlaneBuilderForGluedDet.h"

diff --git a/Alignment/TrackerAlignment/test/ApeAdder.cpp b/Alignment/TrackerAlignment/test/ApeAdder.cpp
@@ -28,7 +28,7 @@
 #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h"
 #include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
 #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h"
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
 
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 

diff --git a/...RecHit/interface/AlignmentPositionError.h → ...etAlgo/interface/AlignmentPositionError.h b/...RecHit/interface/AlignmentPositionError.h → ...etAlgo/interface/AlignmentPositionError.h
diff --git a/...ckingRecHit/src/AlignmentPositionError.cc → ...mmonDetAlgo/src/AlignmentPositionError.cc b/...ckingRecHit/src/AlignmentPositionError.cc → ...mmonDetAlgo/src/AlignmentPositionError.cc
@@ -1,4 +1,4 @@
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
 
 AlignmentPositionError::AlignmentPositionError(
     float xx, float yy, float zz, float phixphix, float phiyphiy, float phizphiz) {

diff --git a/Geometry/CommonTopologies/interface/GeometryAligner.h b/Geometry/CommonTopologies/interface/GeometryAligner.h
@@ -19,7 +19,7 @@
 #include "CondFormats/Alignment/interface/AlignmentSurfaceDeformations.h"
 
 #include "Geometry/CommonTopologies/interface/GeomDet.h"
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h"
 #include "DataFormats/GeometrySurface/interface/Surface.h"
 #include "Geometry/CommonTopologies/interface/SurfaceDeformationFactory.h"

diff --git a/Geometry/CommonTopologies/src/GeomDet.cc b/Geometry/CommonTopologies/src/GeomDet.cc
@@ -1,6 +1,6 @@
 #include "Geometry/CommonTopologies/interface/GeomDet.h"
 #include "Geometry/CommonTopologies/interface/ModifiedSurfaceGenerator.h"
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
 
 GeomDet::~GeomDet() { delete theAlignmentPositionError; }
 

diff --git a/Geometry/CommonTopologies/src/TrackerGeomDet.cc b/Geometry/CommonTopologies/src/TrackerGeomDet.cc
@@ -1,5 +1,5 @@
 #include "Geometry/CommonTopologies/interface/TrackerGeomDet.h"
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/ErrorFrameTransformer.h"
 
 bool TrackerGeomDet::setAlignmentPositionError(const AlignmentPositionError& ape) {

diff --git a/RecoLocalTracker/SiStripRecHitConverter/BuildFile.xml b/RecoLocalTracker/SiStripRecHitConverter/BuildFile.xml
@@ -1,6 +1,7 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/Common"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
 <use name="DataFormats/TrackerRecHit2D"/>
 <use name="DataFormats/SiStripCluster"/>
 <use name="DataFormats/SiStripDetId"/>

diff --git a/RecoLocalTracker/SiStripRecHitConverter/src/SiStripRecHitMatcher.cc b/RecoLocalTracker/SiStripRecHitConverter/src/SiStripRecHitMatcher.cc
@@ -10,7 +10,7 @@
 #include "TrackingTools/TransientTrackingRecHit/interface/HelpertRecHit2DLocalPos.h"
 #include <functional>
 
-#include <DataFormats/TrackingRecHit/interface/AlignmentPositionError.h>
+#include <DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h>
 
 SiStripRecHitMatcher::SiStripRecHitMatcher(const edm::ParameterSet& conf)
     : scale_(conf.getParameter<double>("NSigmaInside")),

diff --git a/RecoMTD/TransientTrackingRecHit/BuildFile.xml b/RecoMTD/TransientTrackingRecHit/BuildFile.xml
@@ -1,3 +1,4 @@
+<use name="DataFormats/GeometryCommonDetAlgo"/>
 <use name="DataFormats/TrackingRecHit"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>

diff --git a/RecoMTD/TransientTrackingRecHit/src/MTDTransientTrackingRecHit.cc b/RecoMTD/TransientTrackingRecHit/src/MTDTransientTrackingRecHit.cc
@@ -7,7 +7,7 @@
 
 #include "DataFormats/GeometryCommonDetAlgo/interface/ErrorFrameTransformer.h"
 #include "DataFormats/ForwardDetId/interface/MTDDetId.h"
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "FWCore/Utilities/interface/Exception.h"

diff --git a/RecoMuon/GlobalTrackingTools/BuildFile.xml b/RecoMuon/GlobalTrackingTools/BuildFile.xml
@@ -2,6 +2,7 @@
 <use name="DataFormats/BeamSpot"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/DetId"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
 <use name="DataFormats/GeometrySurface"/>
 <use name="DataFormats/GeometryVector"/>
 <use name="DataFormats/Math"/>

diff --git a/RecoMuon/GlobalTrackingTools/interface/ThrParameters.h b/RecoMuon/GlobalTrackingTools/interface/ThrParameters.h
@@ -7,7 +7,7 @@
 #include "DataFormats/MuonDetId/interface/DTChamberId.h"
 #include "DataFormats/MuonDetId/interface/CSCDetId.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h"
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/ErrorFrameTransformer.h"
 #include "CondFormats/Alignment/interface/Alignments.h"
 #include "CondFormats/Alignment/interface/AlignTransform.h"

diff --git a/RecoMuon/TransientTrackingRecHit/BuildFile.xml b/RecoMuon/TransientTrackingRecHit/BuildFile.xml
@@ -1,4 +1,5 @@
 <use name="DataFormats/TrackingRecHit"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/Utilities"/>

diff --git a/RecoMuon/TransientTrackingRecHit/src/MuonTransientTrackingRecHit.cc b/RecoMuon/TransientTrackingRecHit/src/MuonTransientTrackingRecHit.cc
@@ -7,7 +7,7 @@
 
 #include "DataFormats/GeometryCommonDetAlgo/interface/ErrorFrameTransformer.h"
 #include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "FWCore/Utilities/interface/Exception.h"

diff --git a/RecoTracker/FinalTrackSelectors/BuildFile.xml b/RecoTracker/FinalTrackSelectors/BuildFile.xml
@@ -1,4 +1,5 @@
 <use name="ofast-flag"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
 <use name="DataFormats/TrackReco"/>
 <use name="DataFormats/VertexReco"/>
 <use name="FWCore/Framework"/>

diff --git a/RecoTracker/FinalTrackSelectors/plugins/CosmicTrackSplitter.cc b/RecoTracker/FinalTrackSelectors/plugins/CosmicTrackSplitter.cc
@@ -37,7 +37,7 @@
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
 
 #include "DataFormats/GeometryCommonDetAlgo/interface/ErrorFrameTransformer.h"
-#include "DataFormats/TrackingRecHit/interface/AlignmentPositionError.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
 
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"