From 4d7b5e77317ae20bfc9ef1e8753c99382597f24e Mon Sep 17 00:00:00 2001 From: Sunanda Date: Sat, 24 Aug 2024 07:46:10 +0200 Subject: [PATCH] Modify the testing code in Geometry/HGCalCommonData in view of changes made in the Configuration/Geometry area for Phase2 scenarios --- .../test/python/dumpHGCalGeometryDD4hep_cfg.py | 9 +++++---- .../test/python/dumpHGCalGeometryDDD_cfg.py | 9 +++++---- .../HGCalCommonData/test/python/runHGCalDD4hep_cfg.py | 9 +++++---- .../HGCalCommonData/test/python/runHGCalDDD_cfg.py | 9 +++++---- .../test/python/testHGCGeometry_cfg.py | 9 +++++---- .../test/python/testHGCalPartialWaferTester_cfg.py | 11 ++++++----- .../test/python/testHGCalScintID_cfg.py | 9 +++++---- .../test/python/testHGCalValidHex_cfg.py | 9 +++++---- .../test/python/testHGCalValidity_cfg.py | 9 +++++---- .../HGCalCommonData/test/python/testHGCalWafer_cfg.py | 9 +++++---- 10 files changed, 51 insertions(+), 41 deletions(-) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4hep_cfg.py index 45e5fa189fd7e..1b097a026e69d 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4hep_cfg.py @@ -1,8 +1,9 @@ ############################################################################### # Way to use this: -# cmsRun dumpHGCalGeometryDD4hep_cfg.py geometry=D88 +# cmsRun dumpHGCalGeometryDD4hep_cfg.py geometry=D110 # -# Options for geometry D88, D92, D93, D98, D99, D101 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, +# D106, D107, D108, D109, D110, D111, D112, D113, D114 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -13,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: D88, D92, D93, D98, D99, D101") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114") ### get and parse the command line arguments options.parseArguments() diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDDD_cfg.py index f7f4b3b7025da..cac2934de1335 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDDD_cfg.py @@ -1,8 +1,9 @@ ############################################################################### # Way to use this: -# cmsRun dumpHGCalGeometryDDD_cfg.py geometry=D88 +# cmsRun dumpHGCalGeometryDDD_cfg.py geometry=D110 # -# Options for geometry D88, D92, D93, D98, D99, D101 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, +# D106, D107, D108, D109, D110, D111, D112, D113, D114 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -13,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: D88, D92, D93, D98, D99, D101") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114") ### get and parse the command line arguments options.parseArguments() diff --git a/Geometry/HGCalCommonData/test/python/runHGCalDD4hep_cfg.py b/Geometry/HGCalCommonData/test/python/runHGCalDD4hep_cfg.py index c57919de3af96..0c0915f536e5f 100644 --- a/Geometry/HGCalCommonData/test/python/runHGCalDD4hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/runHGCalDD4hep_cfg.py @@ -1,8 +1,9 @@ ############################################################################### # Way to use this: -# cmsRun runHGCalDD4hep_cfg.py geometry=D88 +# cmsRun runHGCalDD4hep_cfg.py geometry=D110 # -# Options for geometry D88, D92, D93, D98, D99, D101 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, +# D106, D107, D108, D109, D110, D111, D112, D113, D114 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -13,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: D88, D92, D93, D98, D99, D101") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114") ### get and parse the command line arguments options.parseArguments() diff --git a/Geometry/HGCalCommonData/test/python/runHGCalDDD_cfg.py b/Geometry/HGCalCommonData/test/python/runHGCalDDD_cfg.py index dcedc9c809eed..2b4cbf0b00a9e 100644 --- a/Geometry/HGCalCommonData/test/python/runHGCalDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/runHGCalDDD_cfg.py @@ -1,8 +1,9 @@ ############################################################################### # Way to use this: -# cmsRun runHGCalDDD_cfg.py geometry=D88 +# cmsRun runHGCalDDD_cfg.py geometry=D110 # -# Options for geometry D88, D92, D93, D98, D99, D101 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, +# D106, D107, D108, D109, D110, D111, D112, D113, D114 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -13,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: D88, D92, D93, D98, D99, D101") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114") ### get and parse the command line arguments options.parseArguments() diff --git a/Geometry/HGCalCommonData/test/python/testHGCGeometry_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCGeometry_cfg.py index 1fa5d284bdf5b..d4d2ea2b66c82 100644 --- a/Geometry/HGCalCommonData/test/python/testHGCGeometry_cfg.py +++ b/Geometry/HGCalCommonData/test/python/testHGCGeometry_cfg.py @@ -1,8 +1,9 @@ ############################################################################### # Way to use this: -# cmsRun testHGCGeometry_cfg.py geometry=D88 +# cmsRun testHGCGeometry_cfg.py geometry=D110 # -# Options for geometry D88, D92, D93, D99, D101 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, +# D106, D107, D108, D109, D110, D111, D112, D113, D114 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -13,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: D88, D92, D93, D99, D101") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114") ### get and parse the command line arguments options.parseArguments() diff --git a/Geometry/HGCalCommonData/test/python/testHGCalPartialWaferTester_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalPartialWaferTester_cfg.py index e9c70a8fb8b4f..e00e0acc9cedc 100644 --- a/Geometry/HGCalCommonData/test/python/testHGCalPartialWaferTester_cfg.py +++ b/Geometry/HGCalCommonData/test/python/testHGCalPartialWaferTester_cfg.py @@ -1,8 +1,9 @@ ############################################################################### # Way to use this: -# cmsRun testHGCalPartialWaferTester_cfg.py geometry=D88 +# cmsRun testHGCalPartialWaferTester_cfg.py geometry=D119 # -# Options for geometry D88, D92, D93, D99, D101 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, +# D106, D107, D108, D109, D110, D111, D112, D113, D114 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -13,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: D88, D92, D93, D99, D101") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114") ### get and parse the command line arguments options.parseArguments() @@ -32,7 +33,7 @@ print("Geometry file: ", geomFile) process.load("SimGeneral.HepPDTESSource.pdt_cfi") -process.load(geomFile") +process.load(geomFile) process.load('FWCore.MessageService.MessageLogger_cfi') if hasattr(process,'MessageLogger'): diff --git a/Geometry/HGCalCommonData/test/python/testHGCalScintID_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalScintID_cfg.py index 8f58bea654cae..6391c207f1ee2 100644 --- a/Geometry/HGCalCommonData/test/python/testHGCalScintID_cfg.py +++ b/Geometry/HGCalCommonData/test/python/testHGCalScintID_cfg.py @@ -1,8 +1,9 @@ ############################################################################### # Way to use this: -# cmsRun testHGCalScintID_cfg.py geometry=D88 +# cmsRun testHGCalScintID_cfg.py geometry=D110 # -# Options for geometry D88, D92, D93, D99, D101 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, +# D106, D107, D108, D109, D110, D111, D112, D113, D114 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -13,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: D88, D92, D93, D99, D101") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114") ### get and parse the command line arguments options.parseArguments() diff --git a/Geometry/HGCalCommonData/test/python/testHGCalValidHex_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalValidHex_cfg.py index e998ea779b273..8d84c05bdba77 100644 --- a/Geometry/HGCalCommonData/test/python/testHGCalValidHex_cfg.py +++ b/Geometry/HGCalCommonData/test/python/testHGCalValidHex_cfg.py @@ -1,8 +1,9 @@ ############################################################################### # Way to use this: -# cmsRun testHGCalValidHex_cfg.py geometry=D88 +# cmsRun testHGCalValidHex_cfg.py geometry=D110 # -# Options for geometry D88, D92, D93, D99, D101 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, +# D106, D107, D108, D109, D110, D111, D112, D113, D114 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -13,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: D88, D92, D93, D99, D101") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114") ### get and parse the command line arguments options.parseArguments() diff --git a/Geometry/HGCalCommonData/test/python/testHGCalValidity_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalValidity_cfg.py index 49fb2a95bbe1c..53b88b605f6b2 100644 --- a/Geometry/HGCalCommonData/test/python/testHGCalValidity_cfg.py +++ b/Geometry/HGCalCommonData/test/python/testHGCalValidity_cfg.py @@ -1,8 +1,9 @@ ############################################################################### # Way to use this: -# cmsRun testHGCalValidityCheck_cfg.py geometry=D88 +# cmsRun testHGCalValidityCheck_cfg.py geometry=D110 # -# Options for geometry D88, D92, D93, D99, D101 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, +# D106, D107, D108, D109, D110, D111, D112, D113, D114 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -13,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: D88, D92, D93, D99, D101") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114") ### get and parse the command line arguments options.parseArguments() diff --git a/Geometry/HGCalCommonData/test/python/testHGCalWafer_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalWafer_cfg.py index 0f2167c4e9b03..26dd8dc219f3e 100644 --- a/Geometry/HGCalCommonData/test/python/testHGCalWafer_cfg.py +++ b/Geometry/HGCalCommonData/test/python/testHGCalWafer_cfg.py @@ -1,8 +1,9 @@ ############################################################################### # Way to use this: -# cmsRun testHGCalWafer_cfg.py geometry=D88 +# cmsRun testHGCalWafer_cfg.py geometry=D110 # -# Options for geometry D88, D92, D93, D99, D101 +# Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, +# D106, D107, D108, D109, D110, D111, D112, D113, D114 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -13,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: D88, D92, D93, D99, D101") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114") ### get and parse the command line arguments options.parseArguments()