From 5f59a078d348ab354b4706c7806f11a65fc4c354 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Sun, 1 Sep 2024 05:02:40 +0200 Subject: [PATCH] Update the scripts in Alignment/OfflineValidation and Geometry/HcalCommonData|MTDCommonData for the changes in Configuration/Geometry --- .../test/test_all_Phase2_cfg.py | 2 +- ...runHcalParametersFromDD4hepAnalyzer_cfg.py | 20 +++++++++---------- .../runHcalParametersFromDDDAnalyzer_cfg.py | 20 +++++++++---------- .../runHcalSimNumberingDDDTester_cfg.py | 2 +- .../MTDCommonData/test/testMTDGeometry.py | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Alignment/OfflineValidation/test/test_all_Phase2_cfg.py b/Alignment/OfflineValidation/test/test_all_Phase2_cfg.py index 1c9a437574dc1..3de1193b30170 100644 --- a/Alignment/OfflineValidation/test/test_all_Phase2_cfg.py +++ b/Alignment/OfflineValidation/test/test_all_Phase2_cfg.py @@ -81,7 +81,7 @@ class RefitType(Enum): # Standard loads ################################################################### #process.load("Configuration.Geometry.GeometryRecoDB_cff") -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') +process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') #################################################################### # Get the BeamSpot diff --git a/Geometry/HcalCommonData/test/python/runHcalParametersFromDD4hepAnalyzer_cfg.py b/Geometry/HcalCommonData/test/python/runHcalParametersFromDD4hepAnalyzer_cfg.py index c2eceacf30142..3ac2012d5bd55 100644 --- a/Geometry/HcalCommonData/test/python/runHcalParametersFromDD4hepAnalyzer_cfg.py +++ b/Geometry/HcalCommonData/test/python/runHcalParametersFromDD4hepAnalyzer_cfg.py @@ -2,7 +2,7 @@ # Way to use this: # cmsRun runHcalParametersFromDD4HepAnalyzer_cfg.py geometry=Run3 # -# Options for geometry Run3, D86, D88 +# Options for geometry Run3, D105, D110 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -16,7 +16,7 @@ "Run3", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: Run3, D86, D88") + "geometry of operations: Run3, D105, D110") ### get and parse the command line arguments options.parseArguments() @@ -26,16 +26,16 @@ #################################################################### # Use the options -if (options.geometry == "D86"): - from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9 +if (options.geometry == "D105"): + from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep - process = cms.Process("HcalParametersTest",Phase2C11M9,dd4hep) - process.load('Configuration.Geometry.GeometryDD4hepExtended2026D86Reco_cff') -elif (options.geometry == "D88"): - from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9 + process = cms.Process("HcalParametersTest",Phase2C17I13M9,dd4hep) + process.load('Configuration.Geometry.GeometryDD4hepExtended2026D105Reco_cff') +elif (options.geometry == "D110"): + from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep - process = cms.Process("HcalParametersTest",Phase2C11M9,dd4hep) - process.load('Configuration.Geometry.GeometryDD4hepExtended2026D88Reco_cff') + process = cms.Process("HcalParametersTest",Phase2C17I13M9,dd4hep) + process.load('Configuration.Geometry.GeometryDD4hepExtended2026D110Reco_cff') else: from Configuration.Eras.Era_Run3_dd4hep_cff import Run3_dd4hep process = cms.Process("HcalParametersTest",Run3_dd4hep) diff --git a/Geometry/HcalCommonData/test/python/runHcalParametersFromDDDAnalyzer_cfg.py b/Geometry/HcalCommonData/test/python/runHcalParametersFromDDDAnalyzer_cfg.py index e4a16dc18808e..f0a616676eba8 100644 --- a/Geometry/HcalCommonData/test/python/runHcalParametersFromDDDAnalyzer_cfg.py +++ b/Geometry/HcalCommonData/test/python/runHcalParametersFromDDDAnalyzer_cfg.py @@ -2,7 +2,7 @@ # Way to use this: # cmsRun runHcalParametersFromDDDAnalyzer_cfg.py geometry=Run3 # -# Options for geometry Run3, D86, D88 +# Options for geometry Run3, D105, D110 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -16,7 +16,7 @@ "Run3", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: Run3, D86, D88") + "geometry of operations: Run3, D105, D110") ### get and parse the command line arguments options.parseArguments() @@ -26,14 +26,14 @@ #################################################################### # Use the options -if (options.geometry == "D86"): - from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9 - process = cms.Process("HcalParametersTest",Phase2C11M9) - process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff') -elif (options.geometry == "D88"): - from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9 - process = cms.Process("HcalParametersTest",Phase2C11M9) - process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') +if (options.geometry == "D105"): + from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 + process = cms.Process("HcalParametersTest",Phase2C17I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D105Reco_cff') +elif (options.geometry == "D110"): + from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 + process = cms.Process("HcalParametersTest",Phase2C17I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') else: from Configuration.Eras.Era_Run3_DDD_cff import Run3_DDD process = cms.Process("HcalParametersTest",Run3_DDD) diff --git a/Geometry/HcalCommonData/test/python/runHcalSimNumberingDDDTester_cfg.py b/Geometry/HcalCommonData/test/python/runHcalSimNumberingDDDTester_cfg.py index 9b00043842b2d..84d627aeb65e0 100644 --- a/Geometry/HcalCommonData/test/python/runHcalSimNumberingDDDTester_cfg.py +++ b/Geometry/HcalCommonData/test/python/runHcalSimNumberingDDDTester_cfg.py @@ -25,7 +25,7 @@ if (options.geometry == "Phase2"): from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process("HcalSimNumberingTest",Phase2C17I13M9) - process.load('Geometry.HcalCommonData.testPhase2GeometryFine_cff') + process.load('Configuration.Geometry.GeometryExtended2026D110_cff') else: from Configuration.Eras.Era_Run3_DDD_cff import Run3_DDD process = cms.Process("HcalSimNumberingTest",Run3_DDD) diff --git a/Geometry/MTDCommonData/test/testMTDGeometry.py b/Geometry/MTDCommonData/test/testMTDGeometry.py index 273faef0f3b30..108f99cd4bc10 100644 --- a/Geometry/MTDCommonData/test/testMTDGeometry.py +++ b/Geometry/MTDCommonData/test/testMTDGeometry.py @@ -48,7 +48,7 @@ ) process.load('Configuration.Geometry.GeometryDD4hep_cff') -process.DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml") +process.DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D110.xml") process.DDSpecParRegistryESProducer = cms.ESProducer("DDSpecParRegistryESProducer", appendToDataLabel = cms.string('')