Merge pull request #45796 from mmusich/mm_dev_better2026Default_handling

better automatic handling of default 2026 geometry
cms-sw · Aug 28, 2024 · ab08a21 · ab08a21
2 parents 1d62fbc + 5d6cf34
commit ab08a21
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026DefaultReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026DefaultReco_cff.py
@@ -1,3 +1,5 @@
 import FWCore.ParameterSet.Config as cms
+from Configuration.Geometry.defaultPhase2ConditionsEra_cff import DEFAULT_VERSION
 
-from Configuration.Geometry.GeometryDD4hepExtended2026D110Reco_cff import *
+reco_dd4hep_geometry_import_stmt = f"from Configuration.Geometry.GeometryDD4hepExtended{DEFAULT_VERSION}Reco_cff import *"
+exec(reco_dd4hep_geometry_import_stmt)
diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026Default_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026Default_cff.py
@@ -1,3 +1,5 @@
 import FWCore.ParameterSet.Config as cms
+from Configuration.Geometry.defaultPhase2ConditionsEra_cff import DEFAULT_VERSION
 
-from Configuration.Geometry.GeometryDD4hepExtended2026D110_cff import *
+dd4hep_geometry_import_stmt = f"from Configuration.Geometry.GeometryDD4hepExtended{DEFAULT_VERSION}_cff import *"
+exec(dd4hep_geometry_import_stmt)
diff --git a/Configuration/Geometry/python/GeometryExtended2026DefaultReco_cff.py b/Configuration/Geometry/python/GeometryExtended2026DefaultReco_cff.py
@@ -1,3 +1,5 @@
 import FWCore.ParameterSet.Config as cms
+from Configuration.Geometry.defaultPhase2ConditionsEra_cff import DEFAULT_VERSION
 
-from Configuration.Geometry.GeometryExtended2026D110Reco_cff import *
+reco_geometry_import_stmt = f"from Configuration.Geometry.GeometryExtended{DEFAULT_VERSION}Reco_cff import *"
+exec(reco_geometry_import_stmt)
diff --git a/Configuration/Geometry/python/GeometryExtended2026Default_cff.py b/Configuration/Geometry/python/GeometryExtended2026Default_cff.py
@@ -1,3 +1,5 @@
 import FWCore.ParameterSet.Config as cms
+from Configuration.Geometry.defaultPhase2ConditionsEra_cff import DEFAULT_VERSION
 
-from Configuration.Geometry.GeometryExtended2026D110_cff import *
+geometry_import_stmt = f"from Configuration.Geometry.GeometryExtended{DEFAULT_VERSION}_cff import *"
+exec(geometry_import_stmt)