Fix the xml path

cms-sw · Oct 28, 2020 · 6d468df · 6d468df
1 parent d986eb5
commit 6d468df
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 17 deletions.
diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterial_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterial_cff.py
@@ -4,7 +4,7 @@
 # If you notice a mistake, please update the generating script, not just this config
 
 from Configuration.Geometry.GeometryDD4hep_cff import *
-DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/python/cmsExtendedGeometry2021ZeroMaterial.xml")
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml")
 
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021_cff.py
@@ -4,7 +4,7 @@
 # If you notice a mistake, please update the generating script, not just this config
 
 from Configuration.Geometry.GeometryDD4hep_cff import *
-DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/python/cmsExtendedGeometry2021.xml")
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml")
 
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D49_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D49_cff.py
@@ -4,7 +4,7 @@
 # If you notice a mistake, please update the generating script, not just this config
 
 from Configuration.Geometry.GeometryDD4hep_cff import *
-DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/python/cmsExtendedGeometry2026D49.xml")
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D49.xml")
 
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D50_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D50_cff.py
@@ -4,7 +4,7 @@
 # If you notice a mistake, please update the generating script, not just this config
 
 from Configuration.Geometry.GeometryDD4hep_cff import *
-DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/python/cmsExtendedGeometry2026D50.xml")
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D50.xml")
 
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D60_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D60_cff.py
@@ -4,7 +4,7 @@
 # If you notice a mistake, please update the generating script, not just this config
 
 from Configuration.Geometry.GeometryDD4hep_cff import *
-DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/python/cmsExtendedGeometry2026D60.xml")
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D60.xml")
 
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D64_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D64_cff.py
@@ -4,7 +4,7 @@
 # If you notice a mistake, please update the generating script, not just this config
 
 from Configuration.Geometry.GeometryDD4hep_cff import *
-DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/python/cmsExtendedGeometry2026D64.xml")
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D64.xml")
 
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D65_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D65_cff.py
@@ -4,7 +4,7 @@
 # If you notice a mistake, please update the generating script, not just this config
 
 from Configuration.Geometry.GeometryDD4hep_cff import *
-DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/python/cmsExtendedGeometry2026D65.xml")
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D65.xml")
 
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D66_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D66_cff.py
@@ -4,7 +4,7 @@
 # If you notice a mistake, please update the generating script, not just this config
 
 from Configuration.Geometry.GeometryDD4hep_cff import *
-DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/python/cmsExtendedGeometry2026D66.xml")
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D66.xml")
 
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D67_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D67_cff.py
@@ -4,7 +4,7 @@
 # If you notice a mistake, please update the generating script, not just this config
 
 from Configuration.Geometry.GeometryDD4hep_cff import *
-DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/python/cmsExtendedGeometry2026D67.xml")
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D67.xml")
 
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D68_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D68_cff.py
@@ -4,7 +4,7 @@
 # If you notice a mistake, please update the generating script, not just this config
 
 from Configuration.Geometry.GeometryDD4hep_cff import *
-DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/python/cmsExtendedGeometry2026D68.xml")
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D68.xml")
 
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D69_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D69_cff.py
@@ -4,7 +4,7 @@
 # If you notice a mistake, please update the generating script, not just this config
 
 from Configuration.Geometry.GeometryDD4hep_cff import *
-DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/python/cmsExtendedGeometry2026D69.xml")
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D69.xml")
 
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D70_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D70_cff.py
@@ -4,7 +4,7 @@
 # If you notice a mistake, please update the generating script, not just this config
 
 from Configuration.Geometry.GeometryDD4hep_cff import *
-DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/python/cmsExtendedGeometry2026D70.xml")
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D70.xml")
 
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D71_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D71_cff.py
@@ -4,7 +4,7 @@
 # If you notice a mistake, please update the generating script, not just this config
 
 from Configuration.Geometry.GeometryDD4hep_cff import *
-DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/python/cmsExtendedGeometry2026D71.xml")
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D71.xml")
 
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D72_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D72_cff.py
@@ -4,7 +4,7 @@
 # If you notice a mistake, please update the generating script, not just this config
 
 from Configuration.Geometry.GeometryDD4hep_cff import *
-DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/python/cmsExtendedGeometry2026D72.xml")
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D72.xml")
 
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D73_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D73_cff.py
@@ -4,7 +4,7 @@
 # If you notice a mistake, please update the generating script, not just this config
 
 from Configuration.Geometry.GeometryDD4hep_cff import *
-DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/python/cmsExtendedGeometry2026D73.xml")
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D73.xml")
 
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D74_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D74_cff.py
@@ -4,7 +4,7 @@
 # If you notice a mistake, please update the generating script, not just this config
 
 from Configuration.Geometry.GeometryDD4hep_cff import *
-DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/python/cmsExtendedGeometry2026D74.xml")
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D74.xml")
 
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

diff --git a/Configuration/Geometry/python/generateGeometry.py b/Configuration/Geometry/python/generateGeometry.py
@@ -155,7 +155,7 @@ def generateGeom(self, detectorTuple, args):
         simDD4hepFile.write(preamble)
         # always need XML
         simDD4hepFile.write("from Configuration.Geometry.GeometryDD4hep_cff"+" import *"+"\n")
-        simDD4hepFile.write("DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath(\"Geometry/CMSCommonData/data/python/"+os.path.basename(xmlDD4hepName)+"\")\n\n")
+        simDD4hepFile.write("DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath(\"Geometry/CMSCommonData/data/dd4hep/"+os.path.basename(xmlDD4hepName)+"\")\n\n")
         for iDict,aDict in enumerate(self.allDicts):
             if "sim" in aDict[detectorTuple[iDict]].keys():
                 simDD4hepFile.write('\n'.join([ aLine for aLine in aDict[detectorTuple[iDict]]["sim"] ])+"\n")