Add DT geometry validation

cms-sw · Mar 22, 2019 · 1847306 · 1847306
1 parent 37db9fb
commit 1847306
Show file tree

Hide file tree

Showing 13 changed files with 453 additions and 44 deletions.
diff --git a/DetectorDescription/DDCMS/interface/DDDetector.h b/DetectorDescription/DDCMS/interface/DDDetector.h
@@ -6,13 +6,15 @@
 
 namespace dd4hep {
   class Detector;
+  class Volume;
 }
 
 namespace cms  {
   class DDDetector {
   public:
     using Detector = dd4hep::Detector;
-
+    using Volume = dd4hep::Volume;
+
     explicit DDDetector(const std::string&, const std::string&);
     DDDetector() = delete;
 
@@ -34,6 +36,8 @@ namespace cms  {
     DDSpecParRegistry const& specpars() const {
       return m_specpars;
     }
+
+    Volume worldVolume() const;
 
   private:
 

diff --git a/DetectorDescription/DDCMS/src/DDDetector.cc b/DetectorDescription/DDCMS/src/DDDetector.cc
@@ -1,5 +1,6 @@
 #include "DetectorDescription/DDCMS/interface/DDDetector.h"
-#include "DD4hep/Detector.h"
+#include <DD4hep/Detector.h>
+#include <DD4hep/Volumes.h>
 
 #include <iostream>
 
@@ -28,3 +29,9 @@ DDDetector::process(const string& fileName)
   const char* files[] = { fileName.c_str(), nullptr };
   m_description->apply( name.c_str(), 2, (char**)files );
 }
+
+dd4hep::Volume
+DDDetector::worldVolume() const {
+  assert(m_description);
+  return m_description->worldVolume();
+}
diff --git a/DetectorDescription/RecoGeometry/BuildFile.xml b/DetectorDescription/RecoGeometry/BuildFile.xml
diff --git a/DetectorDescription/RecoGeometry/plugins/BuildFile.xml b/DetectorDescription/RecoGeometry/plugins/BuildFile.xml
diff --git a/Geometry/DTGeometryBuilder/plugins/BuildFile.xml b/Geometry/DTGeometryBuilder/plugins/BuildFile.xml
@@ -2,15 +2,29 @@
  <use name="CondFormats/Alignment"/>
  <use name="CondFormats/DataRecord"/>
  <use name="CondFormats/GeometryObjects"/>
- <use name="DetectorDescription/Core"/>
  <use name="FWCore/Framework"/>
  <use name="FWCore/ParameterSet"/>
  <use name="Geometry/MuonNumbering"/>
  <use name="Geometry/Records"/>
- <use name="Geometry/DTGeometryBuilder"/>
 
-<library file="DTGeometryESModule.cc">
+<library name="DTGeometryPlugins" file="DTGeometryESModule.cc">
+ <use name="DetectorDescription/Core"/>
+ <use name="Geometry/DTGeometryBuilder"/>
  <flags EDM_PLUGIN="1"/>
 </library>
 
+<library name="DD4hep_DTGeometryValidationPlugins" file="dd4hep/DTGeometryValidate.cc">
+  <use name="Fireworks/Core"/>
+  <use name="Geometry/DTGeometry"/>
+  <flags EDM_PLUGIN="1"/>
+</library>
+
+<library name="DD4hep_DTGeometryPlugins" file="dd4hep/*.cc">
+  <flags SKIP_FILES="dd4hep/DTGeometryValidate.cc"/>
+  <use name="DetectorDescription/DDCMS"/>
+  <use name="Geometry/DTGeometry"/>
+  <use name="dd4hep"/>
+  <lib name="Geom"/>
+  <flags EDM_PLUGIN="1"/>
+</library>
 
diff --git a/...ion/RecoGeometry/src/DTGeometryBuilder.cc → ...ilder/plugins/dd4hep/DTGeometryBuilder.cc b/...ion/RecoGeometry/src/DTGeometryBuilder.cc → ...ilder/plugins/dd4hep/DTGeometryBuilder.cc
@@ -37,7 +37,7 @@
 #include "DetectorDescription/DDCMS/interface/DDFilteredView.h"
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
 #include "Geometry/MuonNumbering/interface/DD4hep_DTNumberingScheme.h"
-#include "DetectorDescription/RecoGeometry/interface/DTGeometryBuilder.h"
+#include "DTGeometryBuilder.h"
 #include "DD4hep/Detector.h"
 
 #include <memory>
@@ -182,7 +182,7 @@ DTGeometryBuilder::build(DTGeometry& geom,
 			 const DDDetector* det,
 			 const MuonNumbering& num,
 			 const DDSpecParRefs& refs) {
-  DDFilteredView fview(det, det->description()->worldVolume());
+  DDFilteredView fview(det, det->worldVolume());
   fview.mergedSpecifics(refs);
   dtnum_ = make_unique<DTNumberingScheme>(num.values());
   buildGeometry(fview, geom, num);

diff --git a/...ecoGeometry/interface/DTGeometryBuilder.h → ...uilder/plugins/dd4hep/DTGeometryBuilder.h b/...ecoGeometry/interface/DTGeometryBuilder.h → ...uilder/plugins/dd4hep/DTGeometryBuilder.h
diff --git a/...oGeometry/plugins/DTGeometryESProducer.cc → ...er/plugins/dd4hep/DTGeometryESProducer.cc b/...oGeometry/plugins/DTGeometryESProducer.cc → ...er/plugins/dd4hep/DTGeometryESProducer.cc
@@ -46,7 +46,7 @@
 #include "DetectorDescription/DDCMS/interface/DDFilteredView.h"
 #include "DetectorDescription/DDCMS/interface/BenchmarkGrd.h"
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
-#include "DetectorDescription/RecoGeometry/interface/DTGeometryBuilder.h"
+#include "DTGeometryBuilder.h"
 
 #include <memory>
 #include <iostream>

diff --git a/...on/RecoGeometry/plugins/DTGeometryTest.cc → ...yBuilder/plugins/dd4hep/DTGeometryTest.cc b/...on/RecoGeometry/plugins/DTGeometryTest.cc → ...yBuilder/plugins/dd4hep/DTGeometryTest.cc
@@ -4,7 +4,7 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
-#include "DetectorDescription/DDCMS/interface/MuonGeometryRcd.h"
+#include "Geometry/Records/interface/MuonGeometryRcd.h"
 
 #include <iostream>
 #include <string>