Merge pull request #48300 from fabiocos/fc-mtdunittest20250611

cmsbuild · web-flow · commit 43aeef0629c1 · 2025-06-12T10:46:14.000+02:00
MTD geometry: set manually the unit test geometry scenario to avoid conflicts with tests of other scenarios
diff --git a/Geometry/MTDCommonData/python/GeometryDD4hepExtendedRun4MTDDefaultReco_cff.py b/Geometry/MTDCommonData/python/GeometryDD4hepExtendedRun4MTDDefaultReco_cff.py
@@ -0,0 +1,5 @@
+import FWCore.ParameterSet.Config as cms
+from Geometry.MTDCommonData.defaultMTDConditionsEra_cff import MTD_DEFAULT_VERSION
+
+reco_dd4hep_geometry_import_stmt = f"from Configuration.Geometry.GeometryDD4hepExtended{MTD_DEFAULT_VERSION}Reco_cff import *"
+exec(reco_dd4hep_geometry_import_stmt)
diff --git a/Geometry/MTDCommonData/python/GeometryDD4hepExtendedRun4MTDDefault_cff.py b/Geometry/MTDCommonData/python/GeometryDD4hepExtendedRun4MTDDefault_cff.py
@@ -0,0 +1,5 @@
+import FWCore.ParameterSet.Config as cms
+from Geometry.MTDCommonData.defaultMTDConditionsEra_cff import MTD_DEFAULT_VERSION
+
+dd4hep_geometry_import_stmt = f"from Configuration.Geometry.GeometryDD4hepExtended{MTD_DEFAULT_VERSION}_cff import *"
+exec(dd4hep_geometry_import_stmt)
diff --git a/Geometry/MTDCommonData/python/GeometryExtendedRun4MTDDefaultReco_cff.py b/Geometry/MTDCommonData/python/GeometryExtendedRun4MTDDefaultReco_cff.py
@@ -0,0 +1,5 @@
+import FWCore.ParameterSet.Config as cms
+from Geometry.MTDCommonData.defaultMTDConditionsEra_cff import MTD_DEFAULT_VERSION
+
+reco_geometry_import_stmt = f"from Configuration.Geometry.GeometryExtended{MTD_DEFAULT_VERSION}Reco_cff import *"
+exec(reco_geometry_import_stmt)
diff --git a/Geometry/MTDCommonData/python/GeometryExtendedRun4MTDDefault_cff.py b/Geometry/MTDCommonData/python/GeometryExtendedRun4MTDDefault_cff.py
@@ -0,0 +1,5 @@
+import FWCore.ParameterSet.Config as cms
+from Geometry.MTDCommonData.defaultMTDConditionsEra_cff import MTD_DEFAULT_VERSION
+
+geometry_import_stmt = f"from Configuration.Geometry.GeometryExtended{MTD_DEFAULT_VERSION}_cff import *"
+exec(geometry_import_stmt)
diff --git a/Geometry/MTDCommonData/python/defaultMTDConditionsEra_cff.py b/Geometry/MTDCommonData/python/defaultMTDConditionsEra_cff.py
@@ -0,0 +1,7 @@
+import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _centralgeo
+
+MTD_DEFAULT_VERSION = "Run4D110"
+
+def check_mtdgeo():
+    if MTD_DEFAULT_VERSION != _centralgeo.DEFAULT_VERSION:
+        print("MTD test geometry scenario ",MTD_DEFAULT_VERSION," different than CMS default ",_centralgeo.DEFAULT_VERSION)
diff --git a/Geometry/MTDCommonData/test/testMTDinDD4hep.py b/Geometry/MTDCommonData/test/testMTDinDD4hep.py
@@ -1,7 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
 import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
-_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
+import Geometry.MTDCommonData.defaultMTDConditionsEra_cff as _mtdgeo
+_mtdgeo.check_mtdgeo()
+_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_mtdgeo.MTD_DEFAULT_VERSION)
 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
 
 process = cms.Process("CompareGeometryTest",_PH2_ERA,dd4hep)
@@ -58,7 +60,7 @@
 
 process.load("Geometry.MTDNumberingBuilder.mtdTopology_cfi")
 
-process.load('Configuration.Geometry.GeometryDD4hepExtendedRun4DefaultReco_cff')
+process.load('Geometry.MTDCommonData.GeometryDD4hepExtendedRun4MTDDefaultReco_cff')
 
 process.testBTL = cms.EDAnalyzer("DD4hep_TestMTDIdealGeometry",
                                  DDDetector = cms.ESInputTag('',''),
diff --git a/Geometry/MTDCommonData/test/testMTDinDDD.py b/Geometry/MTDCommonData/test/testMTDinDDD.py
@@ -1,7 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
 import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
-_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
+import Geometry.MTDCommonData.defaultMTDConditionsEra_cff as _mtdgeo
+_mtdgeo.check_mtdgeo()
+_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_mtdgeo.MTD_DEFAULT_VERSION)
 
 process = cms.Process("CompareGeometryTest", _PH2_ERA)
 
@@ -54,7 +56,7 @@
     threshold = cms.untracked.string('INFO')
 )
 
-process.load('Configuration.Geometry.GeometryExtendedRun4Default_cff')
+process.load('Geometry.MTDCommonData.GeometryExtendedRun4MTDDefault_cff')
 
 process.testBTL = cms.EDAnalyzer("TestMTDIdealGeometry",
                                ddTopNodeName = cms.untracked.string('BarrelTimingLayer')
diff --git a/Geometry/MTDGeometryBuilder/test/mtd_cfg.py b/Geometry/MTDGeometryBuilder/test/mtd_cfg.py
@@ -1,7 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
 import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
-_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
+import Geometry.MTDCommonData.defaultMTDConditionsEra_cff as _mtdgeo
+_mtdgeo.check_mtdgeo()
+_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_mtdgeo.MTD_DEFAULT_VERSION)
 
 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
 
@@ -55,7 +57,7 @@
     threshold = cms.untracked.string('INFO')
 )
 
-process.load("Configuration.Geometry.GeometryDD4hepExtendedRun4DefaultReco_cff")
+process.load("Geometry.MTDCommonData.GeometryDD4hepExtendedRun4MTDDefaultReco_cff")
 
 process.Timing = cms.Service("Timing")
 
diff --git a/Geometry/MTDNumberingBuilder/test/dd4hep_mtd_cfg.py b/Geometry/MTDNumberingBuilder/test/dd4hep_mtd_cfg.py
@@ -1,7 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
 import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
-_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
+import Geometry.MTDCommonData.defaultMTDConditionsEra_cff as _mtdgeo
+_mtdgeo.check_mtdgeo()
+_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_mtdgeo.MTD_DEFAULT_VERSION)
 
 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
 
@@ -49,7 +51,7 @@
     threshold = cms.untracked.string('INFO')
 )
 
-process.load("Configuration.Geometry.GeometryDD4hepExtendedRun4DefaultReco_cff")
+process.load("Geometry.MTDCommonData.GeometryDD4hepExtendedRun4MTDDefaultReco_cff")
 
 process.prod = cms.EDAnalyzer("GeometricTimingDetAnalyzer")
 
diff --git a/Geometry/MTDNumberingBuilder/test/mtd_cfg.py b/Geometry/MTDNumberingBuilder/test/mtd_cfg.py
@@ -1,7 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
 import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
-_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
+import Geometry.MTDCommonData.defaultMTDConditionsEra_cff as _mtdgeo
+_mtdgeo.check_mtdgeo()
+_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_mtdgeo.MTD_DEFAULT_VERSION)
 
 process = cms.Process("GeometryTest",_PH2_ERA)
 
@@ -47,7 +49,7 @@
     threshold = cms.untracked.string('INFO')
 )
 
-process.load("Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff")
+process.load("Geometry.MTDCommonData.GeometryExtendedRun4MTDDefaultReco_cff")
 
 process.Timing = cms.Service("Timing")
 
diff --git a/RecoMTD/DetLayers/test/mtd_cfg.py b/RecoMTD/DetLayers/test/mtd_cfg.py
@@ -1,7 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
 import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
-_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
+import Geometry.MTDCommonData.defaultMTDConditionsEra_cff as _mtdgeo
+_mtdgeo.check_mtdgeo()
+_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_mtdgeo.MTD_DEFAULT_VERSION)
 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
 
 process = cms.Process("GeometryTest",_PH2_ERA,dd4hep)
@@ -56,7 +58,7 @@
     threshold = cms.untracked.string('INFO'))
 
 # Choose Tracker Geometry
-process.load("Configuration.Geometry.GeometryDD4hepExtendedRun4DefaultReco_cff")
+process.load("Geometry.MTDCommonData.GeometryDD4hepExtendedRun4MTDDefaultReco_cff")
 process.load("MagneticField.Engine.volumeBasedMagneticField_160812_cfi")
 
 process.Timing = cms.Service("Timing")
diff --git a/SimG4CMS/Forward/test/python/runMTDSens_DD4hep_cfg.py b/SimG4CMS/Forward/test/python/runMTDSens_DD4hep_cfg.py
@@ -1,11 +1,13 @@
 import FWCore.ParameterSet.Config as cms
 
 import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
-_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
+import Geometry.MTDCommonData.defaultMTDConditionsEra_cff as _mtdgeo
+_mtdgeo.check_mtdgeo()
+_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_mtdgeo.MTD_DEFAULT_VERSION)
 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
 process = cms.Process('G4PrintGeometry',_PH2_ERA,dd4hep)
 
-process.load('Configuration.Geometry.GeometryDD4hepExtendedRun4DefaultReco_cff')
+process.load('Geometry.MTDCommonData.GeometryDD4hepExtendedRun4MTDDefaultReco_cff')
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
diff --git a/SimG4CMS/Forward/test/python/runMTDSens_cfg.py b/SimG4CMS/Forward/test/python/runMTDSens_cfg.py
@@ -1,12 +1,14 @@
 import FWCore.ParameterSet.Config as cms
 
 import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
-_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION)
+import Geometry.MTDCommonData.defaultMTDConditionsEra_cff as _mtdgeo
+_mtdgeo.check_mtdgeo()
+_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_mtdgeo.MTD_DEFAULT_VERSION)
 
 process = cms.Process('G4PrintGeometry', _PH2_ERA)
 
 process.load('FWCore.MessageService.MessageLogger_cfi')
-process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff')
+process.load('Geometry.MTDCommonData.GeometryExtendedRun4MTDDefaultReco_cff')
 
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
 process.MessageLogger.cerr.threshold = cms.untracked.string('INFO')
