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-hgx359B Update the cfg files in Validation/Geometry in view of recent updates of the scenarios #45444

Merged
merged 1 commit into from
Jul 17, 2024
Merged

Phase2-hgx359B Update the cfg files in Validation/Geometry in view of recent updates of the scenarios #45444

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
10 changes: 5 additions & 5 deletions Validation/Geometry/test/runMaterialBudgetHFNose_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
###############################################################################
# Way to use this:
# cmsRun runMaterialBudgetHFNose_cfg.py geometry=D94 type=DD4hep pos=Start
# cmsRun runMaterialBudgetHFNose_cfg.py geometry=D115 type=DD4hep pos=Start
#
# Options for geometry D92, D94
# Options for geometry D100, D115
# Options for type DD4hep, DDD
# Options for pos Start, End
#
Expand All @@ -15,10 +15,10 @@
### SETUP OPTIONS
options = VarParsing.VarParsing('standard')
options.register('geometry',
"D94",
"D100",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: D92, D94")
"geometry of operations: D100, D115")
options.register('type',
"DDD",
VarParsing.VarParsing.multiplicity.singleton,
Expand All @@ -37,7 +37,7 @@
####################################################################
# Use the options

if (options.geometry == "D94"):
if (options.geometry == "D115"):
nose = 1
else:
nose = 0
Expand Down
11 changes: 5 additions & 6 deletions Validation/Geometry/test/runMaterialBudgetVolume2026DD4hep_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
# Way to use this:
# cmsRun runMaterialBudgetVolume2026DD4hep_cfg.py geometry=D92
#
# Options for geometry D86, D88, D91, D92, D93, D94, D95, D96, D97, D98,
# D99, D100, D101, D102, D103, D104, D105, D106, D107,
# D108, D109, D110
# Options for geometry D98, D99, D103, D104, D105, D106, D107, D108, D109
# D110, D111, D112, D113, D114, D115
#
###############################################################################
import FWCore.ParameterSet.Config as cms
Expand All @@ -15,10 +14,10 @@
### SETUP OPTIONS
options = VarParsing.VarParsing('standard')
options.register('geometry',
"D88",
"D110",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: D86, D88, D91, D92, D93, D94, D95, D96, D97, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110")
"geometry of operations: D98, D99, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115")
### get and parse the command line arguments
options.parseArguments()

Expand All @@ -28,7 +27,7 @@
# Use the options

from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
if (options.geometry == "D94"):
if (options.geometry == "D115"):
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
process = cms.Process('MaterialBudgetVolume',Phase2C20I13M9,dd4hep)
else:
Expand Down
11 changes: 5 additions & 6 deletions Validation/Geometry/test/runMaterialBudgetVolume2026DDD_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
# Way to use this:
# cmsRun runMaterialBudgetVolume2026DDD_cfg.py geometry=D92
#
# Options for geometry D86, D88, D91, D92, D93, D94, D95, D96, D97, D98,
# D99, D100, D101, D102, D103, D104, D105, D106, D107,
# D108, D109, D110
# Options for geometry D98, D99, D103, D104, D105, D106, D107, D108, D109
# D110, D111, D112, D113, D114, D115
#
###############################################################################
import FWCore.ParameterSet.Config as cms
Expand All @@ -15,10 +14,10 @@
### SETUP OPTIONS
options = VarParsing.VarParsing('standard')
options.register('geometry',
"D88",
"D110",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: D86, D88, D91, D92, D93, D94, D95, D96, D97, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110")
"geometry of operations: D98, D99, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115")
### get and parse the command line arguments
options.parseArguments()

Expand All @@ -27,7 +26,7 @@
####################################################################
# Use the options

if (options.geometry == "D94"):
if (options.geometry == "D115"):
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
process = cms.Process('MaterialBudgetVolume',Phase2C20I13M9)
else:
Expand Down
14 changes: 10 additions & 4 deletions Validation/Geometry/test/runMaterialBudgetVolumeXML_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# cmsRun runMaterialBudgetVolumeXML_cfg.py type=DDD
#
# Options for type DDD, DD4hep
# Options for geometry 2021, 2023, 2024
#
###############################################################################
import FWCore.ParameterSet.Config as cms
Expand All @@ -12,6 +13,11 @@
####################################################################
### SETUP OPTIONS
options = VarParsing.VarParsing('standard')
options.register('geometry',
"2021",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: 2021, 2023, 2024")
options.register('type',
"DDD",
VarParsing.VarParsing.multiplicity.singleton,
Expand All @@ -30,13 +36,13 @@
if (options.type == "DDD"):
from Configuration.Eras.Era_Run3_DDD_cff import Run3_DDD
process = cms.Process('PROD',Run3_DDD)
geomFile = "Configuration.Geometry.GeometryExtended2021Reco_cff"
fileName = "matbdgRun3dddXML.root"
geomFile = "Configuration.Geometry.GeometryExtended" + options.geometry + "Reco_cff"
fileName = "matbdg" + options.geometry + "dddXML.root"
else:
from Configuration.Eras.Era_Run3_dd4hep_cff import Run3_dd4hep
process = cms.Process('PROD',Run3_dd4hep)
geomFile = "Configuration.Geometry.GeometryDD4hepExtended2021Reco_cff"
fileName = "matbdgRun3ddhepXML.root"
geomFile = "Configuration.Geometry.GeometryDD4hepExtended" + options.geometry + "Reco_cff"
fileName = "matbdg" + options.geometry + "ddhepXML.root"

print("Geometry file Name: ", geomFile)
print("Root file Name: ", fileName)
Expand Down
4 changes: 2 additions & 2 deletions Validation/Geometry/test/runP_HGCal_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")

# The default geometry is Extended2026D92Reco. If a different geoemtry
# The default geometry is Extended2026D110Reco. If a different geoemtry
# is needed, the appropriate flag has to be passed at command line,
# e.g.: cmsRun runP_HGCal_cfg.py geom="XYZ"

Expand All @@ -30,7 +30,7 @@

options = VarParsing('analysis')
options.register('geom', #name
'Extended2026D92', #default value
'Extended2026D110', #default value
VarParsing.multiplicity.singleton, # kind of options
VarParsing.varType.string, # type of option
"Select the geometry to be studied" # help message
Expand Down