Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Phase2-hgx359Y Update the scripts in Alignment/OfflineValidation and Geometry/HcalCommonData|MTDCommonData for the changes in Configuration/Geometry #45848

Merged
merged 1 commit into from
Sep 3, 2024
Merged

Phase2-hgx359Y Update the scripts in Alignment/OfflineValidation and Geometry/HcalCommonData|MTDCommonData for the changes in Configuration/Geometry #45848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Alignment/OfflineValidation/test/test_all_Phase2_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
mandrenguyen marked this conversation as resolved.
Show resolved Hide resolved

####################################################################
# Get the BeamSpot
Expand Down
20 changes: 10 additions & 10 deletions Geometry/HcalCommonData/test/python/runHcalParametersFromDD4hepAnalyzer_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand All @@ -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)
Expand Down
20 changes: 10 additions & 10 deletions Geometry/HcalCommonData/test/python/runHcalParametersFromDDDAnalyzer_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/test/python/runHcalSimNumberingDDDTester_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Geometry/MTDCommonData/test/testMTDGeometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('')
Expand Down