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-hgx353A Update various cfg files to do the tests for V18 versions of HGCal #43910

Merged
merged 1 commit into from
Feb 9, 2024
Merged

Phase2-hgx353A Update various cfg files to do the tests for V18 versions of HGCal #43910

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
4 changes: 2 additions & 2 deletions Geometry/HGCalCommonData/test/python/dumpHGCalDDD_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 dumpHGCalDDD_cfg.py type=V17
#
# Options for type V16, V17, V17n, V17ng, V18
# Options for type V16, V17, V17n, V17ng, V17Shift, V18, V18n, V18ng
#
###############################################################################
import FWCore.ParameterSet.Config as cms
Expand All @@ -16,7 +16,7 @@
"V17",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"type of operations: V16, V17, V17n, V17ng,V18")
"type of operations: V16, V17, V17n, V17ng, V17Shift, V18, V18n, V18ng")

### get and parse the command line arguments
options.parseArguments()
Expand Down
12 changes: 8 additions & 4 deletions Geometry/HGCalCommonData/test/python/runHGCalTestDD4hep_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 runHGCalTestDD4hep_cfg.py type=V17
#
# Options for type V16, V17, V17n
# Options for type V16, V17, V17n, V18
#
###############################################################################
import FWCore.ParameterSet.Config as cms
Expand All @@ -16,15 +16,19 @@
"V17",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"type of operations: V16, V17, V17n")
"type of operations: V16, V17, V17n, V18")

### get and parse the command line arguments
options.parseArguments()
print(options)

from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
process = cms.Process("HGCalTest",Phase2C17I13M9,dd4hep)
if (options.type == "V18"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process("HGCalTest",Phase2C12213M9,dd4hep)
else:
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
process = cms.Process("HGCalTest",Phase2C17I13M9,dd4hep)

geomFile = "Geometry/HGCalCommonData/data/dd4hep/testHGCal" + options.type + ".xml"
outFile = "file:step1" + options.type + "DD4hep.root"
Expand Down
18 changes: 14 additions & 4 deletions Geometry/HGCalCommonData/test/python/runHGCalTestDDD_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 runHGCalTestDDD_cfg.py type=V17
#
# Options for type V16, V17, V17n
# Options for type V16, V17, V17n, V17ng, V18, V18n, V18ng
#
###############################################################################
import FWCore.ParameterSet.Config as cms
Expand All @@ -16,14 +16,24 @@
"V17",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"type of operations: V16, V17, V17n")
"type of operations: V16, V17, V17n, V17ng, V18, V18n, V18ng")

### get and parse the command line arguments
options.parseArguments()
print(options)

from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
process = cms.Process("HGCalTest",Phase2C17I13M9)
if (options.type === "V18"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process("HGCalTest",Phase2C22I13M9)
elif (options.type === "V18n"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process("HGCalTest",Phase2C22I13M9)
elif (options.type === "V18ng"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process("HGCalTest",Phase2C22I13M9)
else:
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
process = cms.Process("HGCalTest",Phase2C17I13M9)

geomFile = "Geometry.HGCalCommonData.testHGCal" + options.type + "XML_cfi"
outFile = "file:step1" + options.type + "DDD.root"
Expand Down
14 changes: 7 additions & 7 deletions Geometry/HGCalCommonData/test/python/testHGCalPartialIDTester2_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 testHGCalPartialIDTester_cfg.py geometry=D98 type=DDD
# cmsRun testHGCalPartialIDTester2_cfg.py geometry=D104 type=DDD
#
# Options for geometry: D104
# Options for geometry: D104, D106, D109
# type: DDD, DD4hep
#
###############################################################################
Expand All @@ -17,7 +17,7 @@
"D104",
VarParsing.VarParsing.multiplicity.singleton,
VarParsing.VarParsing.varType.string,
"geometry of operations: D104")
"geometry of operations: D104, D106, D109")
options.register('type',
"DDD",
VarParsing.VarParsing.multiplicity.singleton,
Expand All @@ -32,16 +32,16 @@
####################################################################
# Use the options

from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
if (options.type == "DD4hep"):
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
process = cms.Process('Sim2026',Phase2C17I13M9,dd4hep)
process = cms.Process('Sim2026',Phase2C22I13M9,dd4hep)
geomFile = "Configuration.Geometry.Geometry" + options.type +"Extended2026" + options.geometry + "Reco_cff"
else:
process = cms.Process('Sim2026',Phase2C17I13M9)
process = cms.Process('Sim2026',Phase2C22I13M9)
geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"

globalTag = "auto:phase2_realistic_T25"
globalTag = "auto:phase2_realistic_T33"
inFile = "partial" + options.geometry + ".txt"

print("Geometry file: ", geomFile)
Expand Down
17 changes: 11 additions & 6 deletions Geometry/HGCalCommonData/test/python/testHGCalWaferID_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,23 @@
options.parseArguments()
print(options)

from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9

process = cms.Process("HGCalWaferIDTest",Phase2C17I13M9)
if (options.type == "V18"):
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
process = cms.Process("HGCalWaferIDTest",Phase2C22I13M9)
else:
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
process = cms.Process("HGCalWaferIDTest",Phase2C17I13M9)

####################################################################
# Use the options
if (options.type == "V17Shift"):
if (options.type == "V18"):
geomFile = "Configuration.Geometry.GeometryExtended2026D104_cff"
elif (options.type == "V17Shift"):
geomFile = "Geometry.HGCalCommonData.testHGCalV17ShiftReco_cff"
elif (options.type == "V16"):
geomFile = "Configuration.Geometry.GeometryExtended2026D88_cff"
geomFile = "Configuration.Geometry.GeometryExtended2026D98_cff"
else:
geomFile = "Configuration.Geometry.GeometryExtended2026D92_cff"
geomFile = "Configuration.Geometry.GeometryExtended2026D99_cff"

print("Geometry file: ", geomFile)

Expand Down