Merge pull request #31359 from cms-sw/revert-31240-CTPPS_final

Revert "Port CTPPS to DD4hep"
cms-sw · Sep 7, 2020 · 2c7b8d6 · 2c7b8d6
2 parents 3173c7f + bf9b9ec
commit 2c7b8d6
Show file tree

Hide file tree

Showing 44 changed files with 1,914 additions and 1,495 deletions.
diff --git a/CondFormats/GeometryObjects/BuildFile.xml b/CondFormats/GeometryObjects/BuildFile.xml
@@ -1,7 +1,6 @@
 <use name="DataFormats/DetId"/>
 <use name="CondFormats/Serialization"/>
 <use name="boost_serialization"/>
-<use name="dd4hep"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/CondFormats/GeometryObjects/interface/PDetGeomDesc.h b/CondFormats/GeometryObjects/interface/PDetGeomDesc.h
@@ -2,41 +2,25 @@
 #define CondFormats_PDetGeomDesc_h
 
 #include "CondFormats/Serialization/interface/Serializable.h"
-#include "Geometry/VeryForwardGeometryBuilder/interface/DetGeomDesc.h"
-#include "DetectorDescription/DDCMS/interface/DDTranslation.h"
-#include "DetectorDescription/DDCMS/interface/DDRotationMatrix.h"
 
 #include <vector>
 #include <string>
 
 class PDetGeomDesc {
 public:
-  struct Item {
-    Item() = default;
-    Item(const DetGeomDesc* const geoInfo) {
-      dx_ = geoInfo->translation().X();
-      dy_ = geoInfo->translation().Y();
-      dz_ = geoInfo->translation().Z();
-
-      const DDRotationMatrix& rot = geoInfo->rotation();
-      rot.GetComponents(axx_, axy_, axz_, ayx_, ayy_, ayz_, azx_, azy_, azz_);
-      name_ = geoInfo->name();
-      params_ = geoInfo->params();
-      copy_ = geoInfo->copyno();
-      z_ = geoInfo->parentZPosition();
-      sensorType_ = geoInfo->sensorType();
-      geographicalID_ = geoInfo->geographicalID();
-    }
+  PDetGeomDesc(){};
+  ~PDetGeomDesc(){};
 
+  struct Item {
     // Translation matrix elements
-    double dx_, dy_, dz_;  // in mm
+    double dx_, dy_, dz_;
     // Rotation matrix elements
     double axx_, axy_, axz_, ayx_, ayy_, ayz_, azx_, azy_, azz_;
     std::string name_;
-    std::vector<double> params_;  // default unit from DD4hep (cm)
-    uint32_t geographicalID_;     // to be converted to DetId
+    std::vector<double> params_;
+    uint32_t geographicalID_;  // to be converted to DetId
     int copy_;
-    float z_;  // in mm
+    float z_;
     std::string sensorType_;
 
     COND_SERIALIZABLE;

diff --git a/CondTools/Geometry/plugins/BuildFile.xml b/CondTools/Geometry/plugins/BuildFile.xml
@@ -1,31 +1,30 @@
+<use name="root"/>
+<use name="CondCore/DBOutputService"/>
+<use name="CondFormats/Common"/>
+<use name="CondFormats/GeometryObjects"/>
+<use name="DataFormats/CTPPSDetId"/>
+<use name="DetectorDescription/Core"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="Geometry/TrackerNumberingBuilder"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="Geometry/EcalAlgo"/>
+<use name="Geometry/HcalCommonData"/>
+<use name="Geometry/HcalTowerAlgo"/>
+<use name="Geometry/ForwardGeometry"/>
+<use name="Geometry/CSCGeometryBuilder"/>
+<use name="Geometry/DTGeometry"/>
+<use name="Geometry/DTGeometryBuilder"/>
+<use name="Geometry/RPCGeometry"/>
+<use name="Geometry/RPCGeometryBuilder"/>
+<use name="Geometry/GEMGeometry"/>
+<use name="Geometry/GEMGeometryBuilder"/>
+<use name="Geometry/MuonNumbering"/>
+<use name="Geometry/HGCalGeometry"/>
+<use name="Geometry/VeryForwardGeometryBuilder"/>
 <library file="*.cc" name="CondToolsGeometryPlugins">
-  <use name="root"/>
-  <use name="dd4hep"/>
-  <use name="CondCore/DBOutputService"/>
-  <use name="CondFormats/Common"/>
-  <use name="CondFormats/GeometryObjects"/>
-  <use name="DataFormats/CTPPSDetId"/>
-  <use name="DetectorDescription/DDCMS"/>
-  <use name="FWCore/Framework"/>
-  <use name="FWCore/ParameterSet"/>
-  <use name="FWCore/ServiceRegistry"/>
-  <use name="Geometry/Records"/>
-  <use name="Geometry/TrackerGeometryBuilder"/>
-  <use name="Geometry/TrackerNumberingBuilder"/>
-  <use name="Geometry/CaloGeometry"/>
-  <use name="Geometry/EcalAlgo"/>
-  <use name="Geometry/HcalCommonData"/>
-  <use name="Geometry/HcalTowerAlgo"/>
-  <use name="Geometry/ForwardGeometry"/>
-  <use name="Geometry/CSCGeometryBuilder"/>
-  <use name="Geometry/DTGeometry"/>
-  <use name="Geometry/DTGeometryBuilder"/>
-  <use name="Geometry/RPCGeometry"/>
-  <use name="Geometry/RPCGeometryBuilder"/>
-  <use name="Geometry/GEMGeometry"/>
-  <use name="Geometry/GEMGeometryBuilder"/>
-  <use name="Geometry/MuonNumbering"/>
-  <use name="Geometry/HGCalGeometry"/>
-  <use name="Geometry/VeryForwardGeometryBuilder"/>
   <flags EDM_PLUGIN="1"/>
 </library>