From 6d468df9024a6c54bc5933390d3b51305574f023 Mon Sep 17 00:00:00 2001 From: Fabio Cossutti Date: Wed, 28 Oct 2020 22:47:58 +0100 Subject: [PATCH] Fix the xml path --- .../python/GeometryDD4hepExtended2021ZeroMaterial_cff.py | 2 +- Configuration/Geometry/python/GeometryDD4hepExtended2021_cff.py | 2 +- .../Geometry/python/GeometryDD4hepExtended2026D49_cff.py | 2 +- .../Geometry/python/GeometryDD4hepExtended2026D50_cff.py | 2 +- .../Geometry/python/GeometryDD4hepExtended2026D60_cff.py | 2 +- .../Geometry/python/GeometryDD4hepExtended2026D64_cff.py | 2 +- .../Geometry/python/GeometryDD4hepExtended2026D65_cff.py | 2 +- .../Geometry/python/GeometryDD4hepExtended2026D66_cff.py | 2 +- .../Geometry/python/GeometryDD4hepExtended2026D67_cff.py | 2 +- .../Geometry/python/GeometryDD4hepExtended2026D68_cff.py | 2 +- .../Geometry/python/GeometryDD4hepExtended2026D69_cff.py | 2 +- .../Geometry/python/GeometryDD4hepExtended2026D70_cff.py | 2 +- .../Geometry/python/GeometryDD4hepExtended2026D71_cff.py | 2 +- .../Geometry/python/GeometryDD4hepExtended2026D72_cff.py | 2 +- .../Geometry/python/GeometryDD4hepExtended2026D73_cff.py | 2 +- .../Geometry/python/GeometryDD4hepExtended2026D74_cff.py | 2 +- Configuration/Geometry/python/generateGeometry.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterial_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterial_cff.py index 4b9bbaa0e914b..b8d15296c85c0 100644 --- 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 index 1cdc026314ca3..9946653ac914a 100644 --- 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 index e9a655e9ef8a9..4ac51a0cf7673 100644 --- 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 index 379e9f3ec2fe9..3b2e84f716ad6 100644 --- 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 index 9828cacb71b39..7237ebae282db 100644 --- 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 index 600f4f1359e92..8deb2242f40e7 100644 --- 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 index c4c79f80e39d6..b6d75569eed62 100644 --- 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 index 62ddfa0f9b14c..75292a34fa2e9 100644 --- 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 index 496ec31c12392..ca12955cebbd6 100644 --- 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 index ab8b4d6d174cd..5f7edd9ff7d6c 100644 --- 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 index f36671ae3c8e4..ead9fd7cd8154 100644 --- 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 index 5b7eb4b8ac7f1..571ed7ce6c2ce 100644 --- 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 index 56bb5d86c799f..348528ee1888e 100644 --- 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 index 9b2bbe0a0d7cb..1f8f45f2837de 100644 --- 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 index 29654a6ae52d9..a456c0d65dea2 100644 --- 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 index deef49040225b..b23db60fffa0e 100644 --- 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 index 94f0f66392a30..af5ef6c4d33bf 100644 --- 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")