Merge pull request #30276 from fabiocos/fc-geometricdet

Tracker/MTD geometry: clean Geometric(Timing)Det dependence on DDD
cms-sw · Jun 22, 2020 · 2fe8c7a · 2fe8c7a
2 parents c0bb587 + edfa24c
commit 2fe8c7a
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 641 deletions.
diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc
@@ -53,6 +53,8 @@
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
+#include "DetectorDescription/Core/interface/DDCompactView.h"
+
 #include <iostream>
 #include <fstream>
 #include <sstream>

diff --git a/DetectorDescription/DDCMS/interface/DDRotationMatrix.h b/DetectorDescription/DDCMS/interface/DDRotationMatrix.h
@@ -0,0 +1,11 @@
+#ifndef DetectorDescription_DDCMS_DDRotationMatrix_h
+#define DetectorDescription_DDCMS_DDRotationMatrix_h
+
+#include <Math/Rotation3D.h>
+#include <Math/AxisAngle.h>
+
+//! A DDRotationMatrix is currently implemented with a ROOT Rotation3D
+using DDRotationMatrix = ROOT::Math::Rotation3D;
+using DDAxisAngle = ROOT::Math::AxisAngle;
+
+#endif
diff --git a/DetectorDescription/DDCMS/interface/DDTranslation.h b/DetectorDescription/DDCMS/interface/DDTranslation.h
@@ -0,0 +1,9 @@
+#ifndef DetectorDescription_DDCMS_DDTranslation_h
+#define DetectorDescription_DDCMS_DDTranslation_h
+#include <Math/Vector3D.h>
+
+//! A DD Translation is currently implemented with Root Vector3D
+typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<double> > DD3Vector;
+typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<double> > DDTranslation;
+
+#endif
diff --git a/Geometry/MTDNumberingBuilder/bin/BuildFile.xml b/Geometry/MTDNumberingBuilder/bin/BuildFile.xml
diff --git a/Geometry/MTDNumberingBuilder/bin/stubs/GeometricTimingDetLoader.cc b/Geometry/MTDNumberingBuilder/bin/stubs/GeometricTimingDetLoader.cc
diff --git a/Geometry/MTDNumberingBuilder/bin/stubs/GeometricTimingDetLoader.h b/Geometry/MTDNumberingBuilder/bin/stubs/GeometricTimingDetLoader.h
diff --git a/Geometry/MTDNumberingBuilder/doc/GeometricDetBuilder.png b/Geometry/MTDNumberingBuilder/doc/GeometricDetBuilder.png
diff --git a/Geometry/MTDNumberingBuilder/interface/CmsMTDDebugNavigator.h b/Geometry/MTDNumberingBuilder/interface/CmsMTDDebugNavigator.h
diff --git a/Geometry/MTDNumberingBuilder/interface/GeometricTimingDet.h b/Geometry/MTDNumberingBuilder/interface/GeometricTimingDet.h
@@ -2,11 +2,12 @@
 #define Geometry_MTDNumberingBuilder_GeometricTimingDet_H
 
 #include "CondFormats/GeometryObjects/interface/PGeometricTimingDet.h"
-#include "DetectorDescription/Core/interface/DDExpandedView.h"
 #include "DetectorDescription/Core/interface/DDSolidShapes.h"
 #include "DataFormats/GeometrySurface/interface/Surface.h"
 #include "DataFormats/GeometrySurface/interface/Bounds.h"
 #include "DataFormats/DetId/interface/DetId.h"
+#include <Math/Rotation3D.h>
+#include <Math/Vector3D.h>
 
 #include <vector>
 #include <memory>
@@ -27,18 +28,16 @@ namespace cms {
 
 class GeometricTimingDet {
 public:
-  using NavRange = DDExpandedView::NavRange;
+  using NavRange = std::pair<int const*, size_t>;
   using ConstGeometricTimingDetContainer = std::vector<GeometricTimingDet const*>;
   using GeometricTimingDetContainer = std::vector<GeometricTimingDet*>;
   using RotationMatrix = ROOT::Math::Rotation3D;
   using Translation = ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<double> >;
 
 #ifdef PoolAlloc
-  using GeoHistory = std::vector<DDExpandedNode, PoolAlloc<DDExpandedNode> >;
   using nav_type = std::vector<int, PoolAlloc<int> >;
 #else
-  using GeoHistory = std::vector<DDExpandedNode>;
-  using nav_type = DDExpandedView::nav_type;
+  using nav_type = std::vector<int>;
 #endif
 
   using Position = Surface::PositionType;