Skip to content

Commit b1d9c44

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47598 from bsunanda/Phase2e2-gex187R
Phase2e2-gex187R Provide the geometry checking for some of the new scenarios
2 parents a41e9dc + 385c419 commit b1d9c44

15 files changed

+97
-33
lines changed

‎SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckCalo_cfg.py‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
# cmsRun g4OverlapCheckCalo_cfg.py geometry=2021 tol=0.1
44
#
55
# Options for geometry 2016, 2017, 2021, Run4D102, Run4D103, Run4D104,
6-
# 2Run4D108, 026D109, Run4D110, Run4D111, Run4D112,
7-
# Run4D113, Run4D114, Run4D115
6+
# Run4D108, Run4D109, Run4D110, Run4D111, Run4D112,
7+
# Run4D113, Run4D114, Run4D115, Run4D116, Run4D117,
8+
# Run4D118, Run4D119
89
#
910
###############################################################################
1011
import FWCore.ParameterSet.Config as cms
@@ -18,7 +19,7 @@
1819
"2021",
1920
VarParsing.VarParsing.multiplicity.singleton,
2021
VarParsing.VarParsing.varType.string,
21-
"geometry of operations: 2016, 2017, 2021, Run4D102, Run4D103, Run4D104, Run4D108, Run4D109, Run4D110, Run4D111, Run4D112, Run4D113, Run4D114, Run4D115, Run4D116")
22+
"geometry of operations: 2016, 2017, 2021, Run4D102, Run4D103, Run4D104, Run4D108, Run4D109, Run4D110, Run4D111, Run4D112, Run4D113, Run4D114, Run4D115, Run4D116, Run4D117, Run4D118, Run4D119")
2223
options.register('tol',
2324
0.01,
2425
VarParsing.VarParsing.multiplicity.singleton,
@@ -93,7 +94,22 @@
9394
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
9495
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
9596
process.load('Configuration.Geometry.GeometryExtendedRun4D116Reco_cff')
96-
baseName = 'CaloRun4D110'
97+
baseName = 'CaloRun4D116'
98+
elif (options.geometry == "Run4D117"):
99+
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
100+
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
101+
process.load('Configuration.Geometry.GeometryExtendedRun4D117Reco_cff')
102+
baseName = 'CaloRun4D117'
103+
elif (options.geometry == "Run4D118"):
104+
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
105+
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
106+
process.load('Configuration.Geometry.GeometryExtendedRun4D118Reco_cff')
107+
baseName = 'CaloRun4D118'
108+
elif (options.geometry == "Run4D119"):
109+
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
110+
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
111+
process.load('Configuration.Geometry.GeometryExtendedRun4D119Reco_cff')
112+
baseName = 'CaloRun4D119'
97113
elif (options.geometry == "2016"):
98114
from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
99115
process = cms.Process('G4PrintGeometry',Run2_2016)

‎SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckEcal_cfg.py‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
#
55
# Options for geometry 2016, 2017, 2021, Run4D102, Run4D103, Run4D104,
66
# Run4D108, Run4D109, Run4D110, Run4D111, Run4D112,
7-
# Run4D113, Run4D114, Run4D115
7+
# Run4D113, Run4D114, Run4D115, Run4D116, Run4D117,
8+
# Run4D118, Run4D119
89
#
910
###############################################################################
1011
import FWCore.ParameterSet.Config as cms
@@ -18,7 +19,7 @@
1819
"2021",
1920
VarParsing.VarParsing.multiplicity.singleton,
2021
VarParsing.VarParsing.varType.string,
21-
"geometry of operations: 2016, 2017, 2021, Run4D102, Run4D103, Run4D104, Run4D108, Run4D109, Run4D110, Run4D111, Run4D112, Run4D113, Run4D114, Run4D115")
22+
"geometry of operations: 2016, 2017, 2021, Run4D102, Run4D103, Run4D104, Run4D108, Run4D109, Run4D110, Run4D111, Run4D112, Run4D113, Run4D114, Run4D115, Run4D116, Run4D117, Run4D118m Run4D119")
2223
options.register('tol',
2324
0.01,
2425
VarParsing.VarParsing.multiplicity.singleton,
@@ -93,7 +94,22 @@
9394
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
9495
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
9596
process.load('Configuration.Geometry.GeometryExtendedRun4D116Reco_cff')
96-
baseName = 'EcalRun4D110'
97+
baseName = 'EcalRun4D116'
98+
elif (options.geometry == "Run4D117"):
99+
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
100+
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
101+
process.load('Configuration.Geometry.GeometryExtendedRun4D117Reco_cff')
102+
baseName = 'EcalRun4D117'
103+
elif (options.geometry == "Run4D118"):
104+
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
105+
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
106+
process.load('Configuration.Geometry.GeometryExtendedRun4D118Reco_cff')
107+
baseName = 'EcalRun4D118'
108+
elif (options.geometry == "Run4D119"):
109+
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
110+
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
111+
process.load('Configuration.Geometry.GeometryExtendedRun4D119Reco_cff')
112+
baseName = 'EcalRun4D119'
97113
elif (options.geometry == "2016"):
98114
from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
99115
process = cms.Process('G4PrintGeometry',Run2_2016)

‎SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckMuon_cfg.py‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
#
55
# Options for geometry 2016, 2017, 2021, Run4D102, Run4D103, Run4D104,
66
# Run4D108, Run4D109, Run4D110, Run4D111, Run4D112,
7-
# Run4D113, Run4D114, Run4D115, Run4D116
7+
# Run4D113, Run4D114, Run4D115, Run4D116, Run4D117,
8+
# Run4D118, Run4D119
89
#
910
###############################################################################
1011
import FWCore.ParameterSet.Config as cms
@@ -18,7 +19,7 @@
1819
"2021",
1920
VarParsing.VarParsing.multiplicity.singleton,
2021
VarParsing.VarParsing.varType.string,
21-
"geometry of operations: 2016, 2017, 2021, Run4D102, Run4D103, Run4D104, Run4D108, Run4D109, Run4D110, Run4D111, Run4D112, Run4D113, Run4D114, Run4D115, Run4D116")
22+
"geometry of operations: 2016, 2017, 2021, Run4D102, Run4D103, Run4D104, Run4D108, Run4D109, Run4D110, Run4D111, Run4D112, Run4D113, Run4D114, Run4D115, Run4D116, Run4D117, Run4D118, Run4D119")
2223
options.register('tol',
2324
0.01,
2425
VarParsing.VarParsing.multiplicity.singleton,
@@ -94,6 +95,21 @@
9495
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
9596
process.load('Configuration.Geometry.GeometryExtendedRun4D116Reco_cff')
9697
baseName = 'MuonRun4D116'
98+
elif (options.geometry == "Run4D117"):
99+
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
100+
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
101+
process.load('Configuration.Geometry.GeometryExtendedRun4D117Reco_cff')
102+
baseName = 'MuonRun4D117'
103+
elif (options.geometry == "Run4D118"):
104+
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
105+
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
106+
process.load('Configuration.Geometry.GeometryExtendedRun4D118Reco_cff')
107+
baseName = 'MuonRun4D118'
108+
elif (options.geometry == "Run4D119"):
109+
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
110+
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
111+
process.load('Configuration.Geometry.GeometryExtendedRun4D119Reco_cff')
112+
baseName = 'MuonRun4D119'
97113
elif (options.geometry == "2016"):
98114
from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
99115
process = cms.Process('G4PrintGeometry',Run2_2016)

‎SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckRun4DD4hep_cfg.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104,
66
# D105, D106, D107, D108, D109, D110, D111, D112, D113,
7-
# D114, D115
7+
# D114, D115, D116, D117, D118, D119
88
#
99
###############################################################################
1010
import FWCore.ParameterSet.Config as cms
@@ -18,7 +18,7 @@
1818
"D110",
1919
VarParsing.VarParsing.multiplicity.singleton,
2020
VarParsing.VarParsing.varType.string,
21-
"geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115")
21+
"geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116, D117, D118, D119")
2222
options.register('tol',
2323
0.01,
2424
VarParsing.VarParsing.multiplicity.singleton,

‎SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckRun4DDD_cfg.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104,
66
# D105, D106, D107, D108, D109, D110, D111, D112, D113,
7-
# D114, D115
7+
# D114, D115, D116, D117, D118, D119
88
#
99
###############################################################################
1010
import FWCore.ParameterSet.Config as cms
@@ -18,7 +18,7 @@
1818
"D110",
1919
VarParsing.VarParsing.multiplicity.singleton,
2020
VarParsing.VarParsing.varType.string,
21-
"geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115")
21+
"geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116, D117, D118, D119")
2222
options.register('tol',
2323
0.01,
2424
VarParsing.VarParsing.multiplicity.singleton,

‎SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckTracker_cfg.py‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
#
55
# Options for geometry 2016, 2017, 2021, Run4D102, Run4D103, Run4D104,
66
# Run4D108, Run4D109, Run4D110, Run4D111, Run4D112,
7-
# Run4D113, Run4D114, Run4D115, Run4D115
7+
# Run4D113, Run4D114, Run4D115, Run4D115, Run4D116,
8+
# Run4D117, Run8D118, Run4D119
89
#
910
###############################################################################
1011
import FWCore.ParameterSet.Config as cms
@@ -18,7 +19,7 @@
1819
"2021",
1920
VarParsing.VarParsing.multiplicity.singleton,
2021
VarParsing.VarParsing.varType.string,
21-
"geometry of operations: 2016, 2017, 2021, Run4D102, Run4D103, Run4D104, Run4D108, Run4D109, Run4D110, Run4D111, Run4D112, Run4D113, Run4D114, Run4D115, Run4D116")
22+
"geometry of operations: 2016, 2017, 2021, Run4D102, Run4D103, Run4D104, Run4D108, Run4D109, Run4D110, Run4D111, Run4D112, Run4D113, Run4D114, Run4D115, Run4D116, Run4D117, Run4D118, Run4D119")
2223
options.register('tol',
2324
0.01,
2425
VarParsing.VarParsing.multiplicity.singleton,
@@ -94,6 +95,21 @@
9495
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
9596
process.load('Configuration.Geometry.GeometryExtendedRun4D116Reco_cff')
9697
baseName = 'TrackerRun4D116'
98+
elif (options.geometry == "Run4D117"):
99+
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
100+
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
101+
process.load('Configuration.Geometry.GeometryExtendedRun4D117Reco_cff')
102+
baseName = 'TrackerRun4D117'
103+
elif (options.geometry == "Run4D118"):
104+
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
105+
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
106+
process.load('Configuration.Geometry.GeometryExtendedRun4D118Reco_cff')
107+
baseName = 'TrackerRun4D118'
108+
elif (options.geometry == "Run4D119"):
109+
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
110+
process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
111+
process.load('Configuration.Geometry.GeometryExtendedRun4D119Reco_cff')
112+
baseName = 'TrackerRun4D119'
97113
elif (options.geometry == "2016"):
98114
from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
99115
process = cms.Process('G4PrintGeometry',Run2_2016)

‎SimG4Core/PrintGeomInfo/test/python/runDD4hepRun4_cfg.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104,
66
# D105, D106, D107, D108, D109, D110, D111, D112, D113,
7-
# D114, D115
7+
# D114, D115, D116, D117, D118, D119
88
#
99
###############################################################################
1010
import FWCore.ParameterSet.Config as cms
@@ -18,7 +18,7 @@
1818
"D110",
1919
VarParsing.VarParsing.multiplicity.singleton,
2020
VarParsing.VarParsing.varType.string,
21-
"geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115")
21+
"geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116, D117, D118, D119")
2222

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

‎SimG4Core/PrintGeomInfo/test/python/runDDDRun4_cfg.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104,
66
# D105, D106, D107, D108, D109, D110, D111, D112, D113,
7-
# D114, D115
7+
# D114, D115, D116, D117, D118, D119
88
#
99
###############################################################################
1010
import FWCore.ParameterSet.Config as cms
@@ -18,7 +18,7 @@
1818
"D110",
1919
VarParsing.VarParsing.multiplicity.singleton,
2020
VarParsing.VarParsing.varType.string,
21-
"geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115")
21+
"geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116, D117, D118, D119")
2222

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

‎SimG4Core/PrintGeomInfo/test/python/runMaterialBudgeInfoRun4_cfg.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Options for type DDD, DD4hep
66
# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104,
77
# D105, D106, D107, D108, D109, D110, D111, D112, D113,
8-
# D114, D115
8+
# D114, D115, D116, D117, D118, D119
99
#
1010
################################################################################
1111
import FWCore.ParameterSet.Config as cms
@@ -24,7 +24,7 @@
2424
"D110",
2525
VarParsing.VarParsing.multiplicity.singleton,
2626
VarParsing.VarParsing.varType.string,
27-
"geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115")
27+
"geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116, D117, D118, D119")
2828
options.register('detector',
2929
"Tracker",
3030
VarParsing.VarParsing.multiplicity.singleton,

‎SimG4Core/PrintGeomInfo/test/python/runPrintG4Solids2_cfg.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104,
66
# D105, D106, D107, D108, D109, D110, D111, D112, D113,
7-
# D114, D115
7+
# D114, D115, D116, D117, D118, D119
88
# Options for type DDD, DD4hep
99
#
1010
###############################################################################
@@ -19,7 +19,7 @@
1919
"D110",
2020
VarParsing.VarParsing.multiplicity.singleton,
2121
VarParsing.VarParsing.varType.string,
22-
"geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115")
22+
"geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116, D117, D118, D119")
2323
options.register('type',
2424
"DDD",
2525
VarParsing.VarParsing.multiplicity.singleton,

0 commit comments

Comments
 (0)