Merge pull request #28348 from ianna/display-gdml-file-v1

Add a possibility to display a GDML file
cms-sw · Nov 8, 2019 · d39c3b7 · d39c3b7
2 parents 1663c37 + c4cb8fc
commit d39c3b7
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/Fireworks/Core/src/FWGeometryTableViewManager.cc b/Fireworks/Core/src/FWGeometryTableViewManager.cc
@@ -94,12 +94,13 @@ void FWGeometryTableViewManager::setGeoManagerFromFile() {
   TFile* file = FWGeometry::findFile(m_fileName.c_str());
   fwLog(fwlog::kInfo) << "Geometry table file: " << m_fileName.c_str() << std::endl;
   try {
-    if (!file)
-      throw std::runtime_error("No root file.");
-
-    file->ls();
-
-    s_geoManager = (TGeoManager*)file->Get(m_TGeoName.c_str());
+    if (!file) {
+      // Try it as a GDML file
+      s_geoManager = TGeoManager::Import(m_fileName.c_str(), m_TGeoName.c_str());
+    } else {
+      file->ls();
+      s_geoManager = (TGeoManager*)file->Get(m_TGeoName.c_str());
+    }
     if (!s_geoManager)
       throw std::runtime_error("Can't find TGeoManager object in selected file.");