From 2fa2ceb697534588b1d98379102df327116f884a Mon Sep 17 00:00:00 2001 From: Sunanda Date: Fri, 12 Jul 2024 05:45:57 +0200 Subject: [PATCH 1/2] Update the scripts in SimG4Core/PrintGeomInfo to handle the new scenarios --- .../python/g4OverlapCheck2026DD4hep_cfg.py | 8 ++--- .../test/python/g4OverlapCheck2026DDD_cfg.py | 8 ++--- .../test/python/g4OverlapCheckCalo_cfg.py | 30 +++++++++++++++++-- .../test/python/g4OverlapCheckEcal_cfg.py | 30 +++++++++++++++++-- .../test/python/g4OverlapCheckHGCal_cfg.py | 4 +-- .../test/python/g4OverlapCheckMuon_cfg.py | 30 +++++++++++++++++-- .../test/python/g4OverlapCheckNoseDDD_cfg.py | 4 +-- .../test/python/g4OverlapCheckTracker_cfg.py | 30 +++++++++++++++++-- .../test/python/runDD4hep2026_cfg.py | 14 ++++----- .../test/python/runDDD2026_cfg.py | 14 ++++----- .../python/runMaterialBudgeInfo2026_cfg.py | 12 ++++---- .../test/python/runPrintG4Touch2026_cfg.py | 16 +++++----- .../test/python/runPrintSolid2026_cfg.py | 10 +++---- .../test/python/runSens2026_cfg.py | 12 ++++---- .../test/python/runSummary2026_cfg.py | 12 ++++---- 15 files changed, 169 insertions(+), 65 deletions(-) diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DD4hep_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DD4hep_cfg.py index 38ca87f28e5f2..abc69fa2adeed 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DD4hep_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DD4hep_cfg.py @@ -2,9 +2,9 @@ # Way to use this: # cmsRun g4OverlapCheck2026DD4hep_cfg.py geometry=D92 tol=0.1 # -# Options for geometry D86, D88, D91, D92, D93, D94, D95, D96, D98, D99, -# D100, D101, D102, D103, D104, D105, D106, D107, -# D108, D109, D110, D111, D11, D113 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, +# D105, D106, D107, D108, D109, D110, D111, D112, D113, +# D114, D115 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -18,7 +18,7 @@ "D88", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: D86, D88, D91, D92, D93, D94, D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115") options.register('tol', 0.01, VarParsing.VarParsing.multiplicity.singleton, diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DDD_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DDD_cfg.py index 612e6b87041c8..0b98a574c3e50 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DDD_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DDD_cfg.py @@ -2,9 +2,9 @@ # Way to use this: # cmsRun g4OverlapCheck2026DDD_cfg.py geometry=D88 tol=0.1 # -# Options for geometry D86, D88, D91, D92, D93, D94, D95, D96, D98, D99, -# D100, D101, D102, D103, D104, D105, D106, D107, -# D108, D109, D110, D111, D112, D113 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, +# D105, D106, D107, D108, D109, D110, D111, D112, D113, +# D114, D115 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -18,7 +18,7 @@ "D88", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: D86, D88, D91, D92, D93, D94, D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115") options.register('tol', 0.01, VarParsing.VarParsing.multiplicity.singleton, diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckCalo_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckCalo_cfg.py index 72b7882695feb..4f9145ddcbfb0 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckCalo_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckCalo_cfg.py @@ -3,7 +3,8 @@ # cmsRun g4OverlapCheckCalo_cfg.py geometry=2021 tol=0.1 # # Options for geometry 2016, 2017, 2021, 2026D102, 2026D103, 2026D104, -# 22026D108, 026D109, 2026D110 +# 22026D108, 026D109, 2026D110, 2026D111, 2026D112, +# 2026D113, 2026D114, 2026D115 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -17,7 +18,7 @@ "2021", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: 2016, 2017, 2021, 2026D102, 2026D103, 2026D104, 2026D108, 2026D109, 2026D110") + "geometry of operations: 2016, 2017, 2021, 2026D102, 2026D103, 2026D104, 2026D108, 2026D109, 2026D110, 2026D111, 2026D112, 2026D113, 2026D114, 2026D115") options.register('tol', 0.01, VarParsing.VarParsing.multiplicity.singleton, @@ -63,6 +64,31 @@ process = cms.Process('G4PrintGeometry',Phase2C17I13M9) process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') baseName = 'Hcal2026D110' +elif (options.geometry == "2026D111"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('G4PrintGeometry',Phase2C22I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D111' +elif (options.geometry == "2026D112"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('G4PrintGeometry',Phase2C22I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D112' +elif (options.geometry == "2026D113"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('G4PrintGeometry',Phase2C22I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D113' +elif (options.geometry == "2026D114"): + from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 + process = cms.Process('G4PrintGeometry',Phase2C17I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D114' +elif (options.geometry == "2026D115"): + from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 + process = cms.Process('G4PrintGeometry',Phase2C20I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D115' elif (options.geometry == "2016"): from Configuration.Eras.Era_Run2_2016_cff import Run2_2016 process = cms.Process('G4PrintGeometry',Run2_2016) diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckEcal_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckEcal_cfg.py index 2d41223be7feb..1fe664119aa95 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckEcal_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckEcal_cfg.py @@ -3,7 +3,8 @@ # cmsRun g4OverlapCheckEcal_cfg.py geometry=2021 tol=0.1 # # Options for geometry 2016, 2017, 2021, 2026D102, 2026D103, 2026D104, -# 2026D108, 2026D109, 2026D110 +# 2026D108, 2026D109, 2026D110, 2026D111, 2026D112, +# 2026D113, 2026D114, 2026D115 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -17,7 +18,7 @@ "2021", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: 2016, 2017, 2021, 2026D102, 2026D103, 2026D104, 2026D108, 2026D109, 2026D110") + "geometry of operations: 2016, 2017, 2021, 2026D102, 2026D103, 2026D104, 2026D108, 2026D109, 2026D110, 2026D111, 2026D112, 2026D113, 2026D114, 2026D115") options.register('tol', 0.01, VarParsing.VarParsing.multiplicity.singleton, @@ -63,6 +64,31 @@ process = cms.Process('G4PrintGeometry',Phase2C17I13M9) process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') baseName = 'Hcal2026D110' +elif (options.geometry == "2026D111"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('G4PrintGeometry',Phase2C22I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D111' +elif (options.geometry == "2026D112"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('G4PrintGeometry',Phase2C22I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D112' +elif (options.geometry == "2026D113"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('G4PrintGeometry',Phase2C22I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D113' +elif (options.geometry == "2026D114"): + from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 + process = cms.Process('G4PrintGeometry',Phase2C17I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D114' +elif (options.geometry == "2026D115"): + from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 + process = cms.Process('G4PrintGeometry',Phase2C20I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D115' elif (options.geometry == "2016"): from Configuration.Eras.Era_Run2_2016_cff import Run2_2016 process = cms.Process('G4PrintGeometry',Run2_2016) diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckHGCal_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckHGCal_cfg.py index d7f460d0fe025..13d660264f4f8 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckHGCal_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckHGCal_cfg.py @@ -2,7 +2,7 @@ # Way to use this: # cmsRun g4OverlapCheckHGCal_cfg.py geometry=D88 tol=0.1 # -# Options for geometry D102, D103, D104, D108, D109, D110 +# Options for geometry D102, D103, D105, D107, D108, D110, D114 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -16,7 +16,7 @@ "D110", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: D102, D103, D104, D108, D109, D110") + "geometry of operations: D102, D103, D105, D107, D108, D110, D114") options.register('tol', 0.01, VarParsing.VarParsing.multiplicity.singleton, diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckMuon_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckMuon_cfg.py index f3fd7f6471fb0..44f91400ad8c6 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckMuon_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckMuon_cfg.py @@ -3,7 +3,8 @@ # cmsRun g4OverlapCheckMuon_cfg.py geometry=2021 tol=0.1 # # Options for geometry 2016, 2017, 2021, 2026D102, 2026D103, 2026D104, -# 2026D108, 2026D109, 2026D110 +# 2026D108, 2026D109, 2026D110, 2026D111, 2026D112, +# 2026D113, 2026D114, 2026D115 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -17,7 +18,7 @@ "2021", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: 2016, 2017, 2021, 2026D102, 2026D103, 2026D104, 2026D108, 2026D109, 2026D110") + "geometry of operations: 2016, 2017, 2021, 2026D102, 2026D103, 2026D104, 2026D108, 2026D109, 2026D110, 2026D111, 2026D112, 2026D113, 2026D114, 2026D115") options.register('tol', 0.01, VarParsing.VarParsing.multiplicity.singleton, @@ -63,6 +64,31 @@ process = cms.Process('G4PrintGeometry',Phase2C17I13M9) process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') baseName = 'Hcal2026D110' +elif (options.geometry == "2026D111"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('G4PrintGeometry',Phase2C22I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D111' +elif (options.geometry == "2026D112"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('G4PrintGeometry',Phase2C22I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D112' +elif (options.geometry == "2026D113"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('G4PrintGeometry',Phase2C22I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D113' +elif (options.geometry == "2026D114"): + from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 + process = cms.Process('G4PrintGeometry',Phase2C17I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D114' +elif (options.geometry == "2026D115"): + from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 + process = cms.Process('G4PrintGeometry',Phase2C20I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D115' elif (options.geometry == "2016"): from Configuration.Eras.Era_Run2_2016_cff import Run2_2016 process = cms.Process('G4PrintGeometry',Run2_2016) diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckNoseDDD_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckNoseDDD_cfg.py index d419fcb97e8e1..c8eabbbecb088 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckNoseDDD_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckNoseDDD_cfg.py @@ -1,6 +1,6 @@ ############################################################################### # Way to use this: -# cmsRun g4OverlapCheckNoseDDD_cfg.py geometry=D94 tol=0.1 +# cmsRun g4OverlapCheckNoseDDD_cfg.py geometry=D115 tol=0.1 # # Options for geometry D94 # @@ -16,7 +16,7 @@ "D94", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: D94") + "geometry of operations: D115") options.register('tol', 0.01, VarParsing.VarParsing.multiplicity.singleton, diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckTracker_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckTracker_cfg.py index 0d23763005436..67de13530cd6b 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckTracker_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckTracker_cfg.py @@ -3,7 +3,8 @@ # cmsRun g4OverlapCheckTracker_cfg.py geometry=2021 tol=0.1 # # Options for geometry 2016, 2017, 2021, 2026D102, 2026D103, 2026D104, -# 2026D108, 2026D109, 2026D110 +# 2026D108, 2026D109, 2026D110, 2026D111, 2026D112, +# 2026D113, 2026D114, 2026D115 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -17,7 +18,7 @@ "2021", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: 2016, 2017, 2021, 2026D102, 2026D103, 2026D104, 2026D108, 2026D109, 2026D110") + "geometry of operations: 2016, 2017, 2021, 2026D102, 2026D103, 2026D104, 2026D108, 2026D109, 2026D110, 2026D111, 2026D112, 2026D113, 2026D114, 2026D115") options.register('tol', 0.01, VarParsing.VarParsing.multiplicity.singleton, @@ -63,6 +64,31 @@ process = cms.Process('G4PrintGeometry',Phase2C17I13M9) process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') baseName = 'Hcal2026D110' +elif (options.geometry == "2026D111"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('G4PrintGeometry',Phase2C22I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D111' +elif (options.geometry == "2026D112"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('G4PrintGeometry',Phase2C22I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D112' +elif (options.geometry == "2026D113"): + from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 + process = cms.Process('G4PrintGeometry',Phase2C22I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D113' +elif (options.geometry == "2026D114"): + from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 + process = cms.Process('G4PrintGeometry',Phase2C17I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D114' +elif (options.geometry == "2026D115"): + from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 + process = cms.Process('G4PrintGeometry',Phase2C20I13M9) + process.load('Configuration.Geometry.GeometryExtended2026D108Reco_cff') + baseName = 'Hcal2026D115' elif (options.geometry == "2016"): from Configuration.Eras.Era_Run2_2016_cff import Run2_2016 process = cms.Process('G4PrintGeometry',Run2_2016) diff --git a/SimG4Core/PrintGeomInfo/test/python/runDD4hep2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDD4hep2026_cfg.py index 8edf724e831a7..4d35af5cb4195 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runDD4hep2026_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runDD4hep2026_cfg.py @@ -1,10 +1,10 @@ ############################################################################### # Way to use this: -# cmsRun runDD4hep2026_cfg.py geometry=D92 +# cmsRun runDD4hep2026_cfg.py geometry=D110 # -# 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, D111, D112, D113 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, +# D105, D106, D107, D108, D109, D110, D111, D112, D113, +# D114, D115 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -15,10 +15,10 @@ ### SETUP OPTIONS options = VarParsing.VarParsing('standard') options.register('geometry', - "D92", + "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, D111, D112, D113") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115") ### get and parse the command line arguments options.parseArguments() @@ -29,7 +29,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('G4PrintGeometry',Phase2C20I13M9,dd4hep) else: diff --git a/SimG4Core/PrintGeomInfo/test/python/runDDD2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDDD2026_cfg.py index 306c73d70b096..84c00ed270c85 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runDDD2026_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runDDD2026_cfg.py @@ -1,10 +1,10 @@ ############################################################################### # Way to use this: -# cmsRun runDDD2026_cfg.py geometry=D88 +# cmsRun runDDD2026_cfg.py geometry=D110 # -# 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, D111, D112, D113 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, +# D105, D106, D107, D108, D109, D110, D111, D112, D113, +# D114, D115 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -15,10 +15,10 @@ ### SETUP OPTIONS options = VarParsing.VarParsing('standard') options.register('geometry', - "D92", + "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, D111, D112, D113") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115") ### get and parse the command line arguments options.parseArguments() @@ -28,7 +28,7 @@ #################################################################### # Use the options -if (options.geometry == "D94"): +if (options.geometry == "D115"): from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 process = cms.Process('G4PrintGeometry',Phase2C20I13M9) else: diff --git a/SimG4Core/PrintGeomInfo/test/python/runMaterialBudgeInfo2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runMaterialBudgeInfo2026_cfg.py index 3d02ceed784ef..a54ad1e75898d 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runMaterialBudgeInfo2026_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runMaterialBudgeInfo2026_cfg.py @@ -1,11 +1,11 @@ #######################################################9######################## # Way to use this: -# cmsRun runMaterialBudgetInfo2026_cfg.py type=DDD geometry=D98 detector=Tracker +# cmsRun runMaterialBudgetInfo2026_cfg.py type=DDD geometry=D110 detector=Tracker # # Options for type DDD, DD4hep -# Options for geometry D86, D88, D91, D92, D93, D95, D96, D97, D98, D99, -# D100, D101, D102, D103, D104, D105, D106, D107, -# D108, D109, D110, D111, D112, D113 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, +# D105, D106, D107, D108, D109, D110, D111, D112, D113, +# D114, D115 # ################################################################################ import FWCore.ParameterSet.Config as cms @@ -21,10 +21,10 @@ VarParsing.VarParsing.varType.string, "type of operations: DDD, DD4hep") options.register('geometry', - "D92", + "D110", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: D86, D88, D91, D92, D93, D95, D96, D97, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115") options.register('detector', "Tracker", VarParsing.VarParsing.multiplicity.singleton, diff --git a/SimG4Core/PrintGeomInfo/test/python/runPrintG4Touch2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runPrintG4Touch2026_cfg.py index 709f06fc660b0..6cc1c62ec878d 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runPrintG4Touch2026_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runPrintG4Touch2026_cfg.py @@ -1,10 +1,10 @@ ############################################################################### # Way to use this: -# cmsRun grunPrintG4Touch_cfg.py geometry=D98 type=DDD +# cmsRun grunPrintG4Touch_cfg.py geometry=D110 type=DDD # -# Options for geometry D88, D91, D92, D93, D94, D95, D96, D98, D99, D100, -# D101, D102, D103, D104,D105, D106, D107, -# D108, D109, D110, D111, D112, D113 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, +# D105, D106, D107, D108, D109, D110, D111, D112, D113, +# D114, D115 # Options for type DDD, DD4hep # ############################################################################### @@ -16,10 +16,10 @@ ### SETUP OPTIONS options = VarParsing.VarParsing('standard') options.register('geometry', - "D88", + "D110", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: D88, D91, D92, D93, D94, D95, D96, D98, D99, D100, D101, D102, D103, D104,D105, D106, D107, D108, D109, D110, D111, D112, D113") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115") options.register('type', "DDD", VarParsing.VarParsing.multiplicity.singleton, @@ -37,7 +37,7 @@ if (options.type == "DD4hep"): geomFile = "Configuration.Geometry.GeometryDD4hepExtended2026" + options.geometry + "Reco_cff" - if (options.geometry == "D94"): + if (options.geometry == "D115"): from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 process = cms.Process('PrintG4Solids',Phase2C20I13M9,dd4hep) else: @@ -45,7 +45,7 @@ process = cms.Process('PrintG4Solids',Phase2C17I13M9,dd4hep) else: geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff" - if (options.geometry == "D94"): + if (options.geometry == "D115"): from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 process = cms.Process('PrintG4Solids',Phase2C20I13M9) else: diff --git a/SimG4Core/PrintGeomInfo/test/python/runPrintSolid2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runPrintSolid2026_cfg.py index 06dd5f968fdfa..33a2e7d3d004e 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runPrintSolid2026_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runPrintSolid2026_cfg.py @@ -1,11 +1,11 @@ #######################################################9######################## # Way to use this: -# cmsRun runPrintSolid2026_cfg.py type=DDD geometry=D98 +# cmsRun runPrintSolid2026_cfg.py type=DDD geometry=D110 # # Options for type DDD, DD4hep -# Options for geometry D86, D88, D91, D92, D93, D95, D96, D97, D98, D99, -# D100, D101, D102, D103, D104,D105, D106, D107, -# D108, D109, D110, D111, D112, D113 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, +# D105, D106, D107, D108, D109, D110, D111, D112, D113, +# D114, D115 # ################################################################################ import FWCore.ParameterSet.Config as cms @@ -24,7 +24,7 @@ "D110", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: D86, D88, D91, D92, D93, D95, D96, D97, D98, D99, D100, D101, D102, D103, D104,D105, D106, D107, D108, D109, D110, D111, D112, D113") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115") ### get and parse the command line arguments options.parseArguments() diff --git a/SimG4Core/PrintGeomInfo/test/python/runSens2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runSens2026_cfg.py index fb9a56ee690af..5c9a87a2742d4 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runSens2026_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runSens2026_cfg.py @@ -1,10 +1,10 @@ ############################################################################### # Way to use this: -# cmsRun runSens2026_cfg.py geometry=D92 type=DDD +# cmsRun runSens2026_cfg.py geometry=D110 type=DDD # -# Options for geometry D86, D88, D91, D92, D93, D94, D95, D96, D98, D99, -# D100, D101, D102, D103, D104, D105, D106, D107, -# D108, D109, D110, D111, D112, D113 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, +# D105, D106, D107, D108, D109, D110, D111, D112, D113, +# D114, D115 # Options for type DDD, DD4hep # ############################################################################### @@ -19,7 +19,7 @@ "D110", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: D86, D88, D91, D92, D93, D94, D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115") options.register('type', "DDD", VarParsing.VarParsing.multiplicity.singleton, @@ -35,7 +35,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 if (options.type == "DD4hep"): process = cms.Process('G4PrintGeometry',Phase2C20I13M9,dd4hep) diff --git a/SimG4Core/PrintGeomInfo/test/python/runSummary2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runSummary2026_cfg.py index 50630601fe476..5fa5176e8a5ce 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runSummary2026_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runSummary2026_cfg.py @@ -1,10 +1,10 @@ ############################################################################### # Way to use this: -# cmsRun runSummary2026_cfg.py geometry=D92 +# cmsRun runSummary2026_cfg.py geometry=D110 # -# Options for geometry D86, D88, D91, D92, D93, D94, D95, D96, D98, D99, -# D100, D101, D102, D103, D104, D105, D106, D107, -# D108, D109, D110, D111, D112, D113 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, +# D105, D106, D107, D108, D109, D110, D111, D112, D113, +# D114, D115 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -18,7 +18,7 @@ "D110", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: D86, D88, D91, D92, D93, D94, D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115") ### get and parse the command line arguments options.parseArguments() @@ -28,7 +28,7 @@ #####p############################################################### # Use the options -if (options.geometry == "D94"): +if (options.geometry == "D115"): from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 process = cms.Process('G4PrintGeometry',Phase2C20I13M9) else: From 7ae93dea6362e6ab884f1c27f1544e2f4943139c Mon Sep 17 00:00:00 2001 From: Sunanda Date: Fri, 12 Jul 2024 07:53:41 +0200 Subject: [PATCH 2/2] Take care of the remianing mistakes --- .../test/python/g4OverlapCheck2026DD4hep_cfg.py | 6 +++--- .../test/python/g4OverlapCheck2026DDD_cfg.py | 6 +++--- .../test/python/g4OverlapCheckNoseDDD_cfg.py | 4 ++-- .../test/python/runPrintG4Solids2_cfg.py | 16 ++++++++-------- .../test/python/runPrintG4Solids_cfg.py | 16 ++++++++-------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DD4hep_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DD4hep_cfg.py index abc69fa2adeed..5f36abc9f00ae 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DD4hep_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DD4hep_cfg.py @@ -1,6 +1,6 @@ ############################################################################### # Way to use this: -# cmsRun g4OverlapCheck2026DD4hep_cfg.py geometry=D92 tol=0.1 +# cmsRun g4OverlapCheck2026DD4hep_cfg.py geometry=D110 tol=0.01 # # Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, # D105, D106, D107, D108, D109, D110, D111, D112, D113, @@ -15,7 +15,7 @@ ### SETUP OPTIONS options = VarParsing.VarParsing('standard') options.register('geometry', - "D88", + "D110", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115") @@ -35,7 +35,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('OverlapCheck',Phase2C20I13M9,dd4hep) else: diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DDD_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DDD_cfg.py index 0b98a574c3e50..408692d878902 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DDD_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DDD_cfg.py @@ -1,6 +1,6 @@ ############################################################################### # Way to use this: -# cmsRun g4OverlapCheck2026DDD_cfg.py geometry=D88 tol=0.1 +# cmsRun g4OverlapCheck2026DDD_cfg.py geometry=D110 tol=0.01 # # Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, # D105, D106, D107, D108, D109, D110, D111, D112, D113, @@ -15,7 +15,7 @@ ### SETUP OPTIONS options = VarParsing.VarParsing('standard') options.register('geometry', - "D88", + "D110", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115") @@ -34,7 +34,7 @@ #################################################################### # Use the options -if (options.geometry == "D94"): +if (options.geometry == "D115"): from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 process = cms.Process('OverlapCheck',Phase2C20I13M9) else: diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckNoseDDD_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckNoseDDD_cfg.py index c8eabbbecb088..3f83f7fccb65b 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckNoseDDD_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckNoseDDD_cfg.py @@ -2,7 +2,7 @@ # Way to use this: # cmsRun g4OverlapCheckNoseDDD_cfg.py geometry=D115 tol=0.1 # -# Options for geometry D94 +# Options for geometry D115 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -13,7 +13,7 @@ ### SETUP OPTIONS options = VarParsing.VarParsing('standard') options.register('geometry', - "D94", + "D115", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "geometry of operations: D115") diff --git a/SimG4Core/PrintGeomInfo/test/python/runPrintG4Solids2_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runPrintG4Solids2_cfg.py index 6d1bbcaf8d9f9..7134063692c96 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runPrintG4Solids2_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runPrintG4Solids2_cfg.py @@ -1,10 +1,10 @@ ############################################################################### # Way to use this: -# cmsRun grunPrintG4Solids_cfg.py geometry=D98 dd4hep=False +# cmsRun grunPrintG4Solids_cfg.py geometry=D110 dd4hep=False # -# Options for geometry D88, D91, D92, D93, D94, D95, D96, D98, D99, D100, -# D101, D102, D103, D104,D105, D106, D107, -# D108, D109, D110 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, +# D105, D106, D107, D108, D109, D110, D111, D112, D113, +# D114, D115 # Options for type DDD, DD4hep # ############################################################################### @@ -16,10 +16,10 @@ ### SETUP OPTIONS options = VarParsing.VarParsing('standard') options.register('geometry', - "D88", + "D110", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: D88, D91, D92, D93, D94, D95, D96, D98, D99, D100, D101, D102, D103, D104,D105, D106, D107, D108, D109, D110") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115") options.register('type', "DDD", VarParsing.VarParsing.multiplicity.singleton, @@ -37,7 +37,7 @@ if (options.type == "DD4hep"): geomFile = "Configuration.Geometry.GeometryDD4hepExtended2026" + options.geometry + "Reco_cff" - if (options.geometry == "D94"): + if (options.geometry == "D115"): from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 process = cms.Process('PrintG4Solids',Phase2C20I13M9,dd4hep) else: @@ -45,7 +45,7 @@ process = cms.Process('PrintG4Solids',Phase2C17I13M9,dd4hep) else: geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff" - if (options.geometry == "D94"): + if (options.geometry == "D115"): from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 process = cms.Process('PrintG4Solids',Phase2C20I13M9) else: diff --git a/SimG4Core/PrintGeomInfo/test/python/runPrintG4Solids_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runPrintG4Solids_cfg.py index d32851f355f51..d91f003a6b7ee 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runPrintG4Solids_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runPrintG4Solids_cfg.py @@ -1,10 +1,10 @@ ############################################################################### # Way to use this: -# cmsRun grunPrintG4Solids_cfg.py geometry=D98 dd4hep=False +# cmsRun grunPrintG4Solids_cfg.py geometry=D110 dd4hep=False # -# Options for geometry D88, D91, D92, D93, D94, D95, D96, D98, D99, D100, -# D101, D102, D103, D104, D105, D106, D107, -# D108, D109, D110, D111, D112, D113 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, +# D105, D106, D107, D108, D109, D110, D111, D112, D113, +# D114, D115 # Options for type DDD, DD4hep # ############################################################################### @@ -16,10 +16,10 @@ ### SETUP OPTIONS options = VarParsing.VarParsing('standard') options.register('geometry', - "D88", + "D110", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: D88, D91, D92, D93, D94, D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115") options.register('type', "DDD", VarParsing.VarParsing.multiplicity.singleton, @@ -37,7 +37,7 @@ if (options.type == "DD4hep"): geomFile = "Configuration.Geometry.GeometryDD4hepExtended2026" + options.geometry + "Reco_cff" - if (options.geometry == "D94"): + if (options.geometry == "D115"): from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 process = cms.Process('PrintG4Solids',Phase2C20I13M9,dd4hep) else: @@ -45,7 +45,7 @@ process = cms.Process('PrintG4Solids',Phase2C17I13M9,dd4hep) else: geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff" - if (options.geometry == "D94"): + if (options.geometry == "D115"): from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9 process = cms.Process('PrintG4Solids',Phase2C20I13M9) else: