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()
diff --git a/Geometry/HGCalGeometry/test/python/hgcGeomAnalyzer_cfg.py b/Geometry/HGCalGeometry/test/python/hgcGeomAnalyzer_cfg.py
index 62e4736918ba0..ce242b91040cb 100644
--- a/Geometry/HGCalGeometry/test/python/hgcGeomAnalyzer_cfg.py
+++ b/Geometry/HGCalGeometry/test/python/hgcGeomAnalyzer_cfg.py
@@ -1,26 +1,45 @@
+###############################################################################
+# Way to use this:
+#   cmsRun hgcGeomAnalyzer_cfg.py geom=v17
+#
+#   Options for geometry v16, v17, v18
+#
+###############################################################################
 import FWCore.ParameterSet.Config as cms
 from FWCore.ParameterSet.VarParsing import VarParsing
 from Configuration.StandardSequences.Eras import eras
 from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
 
 options = VarParsing()
-options.register ("geom", "",  VarParsing.multiplicity.singleton, VarParsing.varType.string)
-options.parseArguments()
+options.register ("geom",
+                  "v17",
+                  VarParsing.multiplicity.singleton, VarParsing.varType.string,
+                  "geom of operations: v16, v17, v18")
 
-fileName = "geom_output_"+options.geom
+options.parseArguments()
 
 process = cms.Process("demo",eras.Phase2C17I13M9)
 
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 if options.geom == 'v16':
-    process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
+    geomFile = 'Configuration.Geometry.GeometryExtended2026D100Reco_cff'
 elif options.geom == 'v17':
-    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
+    geomFile = 'Configuration.Geometry.GeometryExtended2026D110Reco_cff'
+elif options.geom == 'v18':
+    geomFile = 'Configuration.Geometry.GeometryExtended2026D104Reco_cff'
 else:
-    raise Exception('UNKNOWN GEOMETRY!')
+    geomFile = 'UNKNOWN GEOMETRY!'
+    raise Exception(geomFile)
+
+fileName = "geom_output_"+options.geom
+
+print("Geometry file: ", geomFile)
+print("Output   file: ", fileName)
 
+process.load(geomFile)
+ 
 from Configuration.AlCa.GlobalTag import GlobalTag
-process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '')
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T25', '')
 
 process.load('FWCore.MessageService.MessageLogger_cfi')
 if hasattr(process,'MessageLogger'):
diff --git a/Geometry/HGCalGeometry/test/python/runCaloCellGeometryTest_cfg.py b/Geometry/HGCalGeometry/test/python/runCaloCellGeometryTest_cfg.py
index 60e6aa8ed1a76..f4963a9c87caf 100644
--- a/Geometry/HGCalGeometry/test/python/runCaloCellGeometryTest_cfg.py
+++ b/Geometry/HGCalGeometry/test/python/runCaloCellGeometryTest_cfg.py
@@ -4,8 +4,8 @@
 
 process = cms.Process("CaloCellGeometryTest",Phase2C17I13M9)
 
-process.load("Configuration.Geometry.GeometryExtended2026D92_cff")
-process.load("Configuration.Geometry.GeometryExtended2026D92Reco_cff")
+process.load("Configuration.Geometry.GeometryExtended2026D110_cff")
+process.load("Configuration.Geometry.GeometryExtended2026D110Reco_cff")
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
 if hasattr(process,'MessageLogger'):
diff --git a/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDDD_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDDD_cfg.py
index 92a933aeb80f4..2d2f12b80cf3c 100644
--- a/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDDD_cfg.py
+++ b/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDDD_cfg.py
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCalCellDumpDDD_cfg.py geometry=D86
+#   cmsRun testHGCalCellDumpDDD_cfg.py geometry=D110
 #
-#   Options for geometry D86, D88, D92, D93
+#   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,36 +14,27 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D86",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D86, D88, D92, D93")
+                  "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()
 
 print(options)
 
+
 ####################################################################
 # Use the options
 
-if (options.geometry == "D88"):
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('PROD',Phase2C17I13M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
-elif (options.geometry == "D92"):
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('PROD',Phase2C17I13M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
-elif (options.geometry == "D93"):
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('PROD',Phase2C17I13M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
-else:
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('PROD',Phase2C17I13M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff')
+from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+process = cms.Process('PROD',Phase2C17I13M9)
+
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+print("Geometry file: ", geomFile)
 
+process.load(geomFile)
 process.load("Geometry.HGCalGeometry.hgcalGeometryDump_cfi")
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
diff --git a/Geometry/HGCalGeometry/test/python/testHGCalCorner_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalCorner_cfg.py
index 7253998082f2e..107e83908db53 100644
--- a/Geometry/HGCalGeometry/test/python/testHGCalCorner_cfg.py
+++ b/Geometry/HGCalGeometry/test/python/testHGCalCorner_cfg.py
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCalCorner_cfg.py geometry=D88
+#   cmsRun testHGCalCorner_cfg.py geometry=D110
 #
-#   Options for type D88, D92, D93
+#   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,11 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D92",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "type of operations: D88, D92, D93")
+                  "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()
@@ -27,13 +29,10 @@
 
 ####################################################################
 # Use the options
-if (options.geometry == "D88"):
-    process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
-elif (options.geometry == "D93"):
-    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
-else:
-    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+print("Geometry file: ", geomFile)
 
+process.load(geomFile)
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeomLocatorSc_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeomLocatorSc_cfg.py
index e6e8b177e7828..a015a6705ff82 100644
--- a/Geometry/HGCalGeometry/test/python/testHGCalGeomLocatorSc_cfg.py
+++ b/Geometry/HGCalGeometry/test/python/testHGCalGeomLocatorSc_cfg.py
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCalGeomLocatorSc_cfg.py geometry=D88
+#   cmsRun testHGCalGeomLocatorSc_cfg.py geometry=D110
 #
-#   Options for type D88, D92, D93
+#   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',
-                 "D92",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "type of operations: D88, D92, D93")
+                  "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()
@@ -27,12 +28,9 @@
 
 ####################################################################
 # Use the options
-if (options.geometry == "D88"):
-    process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
-elif (options.geometry == "D93"):
-    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
-else:
-    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+print("Geometry file: ", geomFile)
+process.load(geomFile)
 
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
 process.load('FWCore.MessageService.MessageLogger_cfi')
diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeomLocator_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeomLocator_cfg.py
index 1ceaa9db9db1f..d6a0b2c2a1d6f 100644
--- a/Geometry/HGCalGeometry/test/python/testHGCalGeomLocator_cfg.py
+++ b/Geometry/HGCalGeometry/test/python/testHGCalGeomLocator_cfg.py
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCalGeomLocator_cfg.py geometry=D88
+#   cmsRun testHGCalGeomLocator_cfg.py geometry=D110
 #
-#   Options for type D88, D92, D93
+#   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',
-                 "D92",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "type of operations: D88, D92, D93")
+                  "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()
@@ -27,13 +28,10 @@
 
 ####################################################################
 # Use the options
-if (options.geometry == "D88"):
-    process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
-elif (options.geometry == "D93"):
-    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
-else:
-    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+print("Geometry file: ", geomFile)
 
+process.load(geomFile)
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeometryCheck_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeometryCheck_cfg.py
index cdd77cd6c0873..f24ee3c17f95f 100644
--- a/Geometry/HGCalGeometry/test/python/testHGCalGeometryCheck_cfg.py
+++ b/Geometry/HGCalGeometry/test/python/testHGCalGeometryCheck_cfg.py
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCalGeometryCheck_cfg.py geometry=D88
+#   cmsRun testHGCalGeometryCheck_cfg.py geometry=D110
 #
-#   Options for geometry D88, D92, D93
+#   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")
+                  "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()
@@ -26,24 +27,16 @@
 ####################################################################
 # Use the options
 
-if (options.geometry == "D93"):
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('HGCGeomCheck',Phase2C17I13M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
-    fileName = 'HGCGeomStudyV17n.root'
-elif (options.geometry == "D92"):
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('HGCGeomCheck',Phase2C17I13M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
-    fileName = 'HGCGeomStudyV17.root'
-else:
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('HGCGeomCheck',Phase2C17I13M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
-    fileName = 'HGCGeomStudyV16.root'
-
-print("Output file: ", fileName)
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+fileName = "HGCGeomStudy" + options.geometry + ".root"
 
+from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+process = cms.Process('HGCGeomCheck',Phase2C17I13M9)
+
+print("Geometry file: ", geomFile)
+print("Output   file: ", fileName)
+
+process.load(geomFile)
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
 process.load('Geometry.HGCalGeometry.hgcalGeometryCheck_cfi')
 process.load('FWCore.MessageService.MessageLogger_cfi')
diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeometryMouseBite_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeometryMouseBite_cfg.py
index 957471ffaac54..edb59de716065 100644
--- a/Geometry/HGCalGeometry/test/python/testHGCalGeometryMouseBite_cfg.py
+++ b/Geometry/HGCalGeometry/test/python/testHGCalGeometryMouseBite_cfg.py
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCalGeometryMouseBite_cfg.py geometry=D88
+#   cmsRun testHGCalGeometryMouseBite_cfg.py geometry=D110
 #
-#   Options for type D88, D92, D93, D94
+#   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',
-                 "D92",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "type of operations: D88, D92, D93, D94")
+                  "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()
@@ -27,15 +28,10 @@
 
 ####################################################################
 # Use the options
-if (options.geometry == "D88"):
-    process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
-elif (options.geometry == "D93"):
-    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
-elif (options.geometry == "D94"):
-    process.load('Configuration.Geometry.GeometryExtended2026D94Reco_cff')
-else:
-    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+print("Geometry file: ", geomFile)
 
+process.load(geomFile)
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeometryNewCorners_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeometryNewCorners_cfg.py
index 34b174370720a..cc71585d3cf04 100644
--- a/Geometry/HGCalGeometry/test/python/testHGCalGeometryNewCorners_cfg.py
+++ b/Geometry/HGCalGeometry/test/python/testHGCalGeometryNewCorners_cfg.py
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCalGeometryNewCorners_cfg.py geometry=D88
+#   cmsRun testHGCalGeometryNewCorners_cfg.py geometry=D110
 #
-#   Options for type D88, D92, D93
+#   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',
-                 "D92",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "type of operations: D88, D92, D93")
+                  "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()
@@ -27,13 +28,10 @@
 
 ####################################################################
 # Use the options
-if (options.geometry == "D88"):
-    process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
-elif (options.geometry == "D93"):
-    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
-else:
-    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+print("Geometry file: ", geomFile)
 
+process.load(geomFile)
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
 process.load('Geometry.HGCalGeometry.hgcalGeometryNewCornersTest_cfi')
 process.load('FWCore.MessageService.MessageLogger_cfi')
diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeometryRotCheck_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeometryRotCheck_cfg.py
index 037122f4a94ca..e4d3d7e000459 100644
--- a/Geometry/HGCalGeometry/test/python/testHGCalGeometryRotCheck_cfg.py
+++ b/Geometry/HGCalGeometry/test/python/testHGCalGeometryRotCheck_cfg.py
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCalGeometryRotCheck_cfg.py geometry=D88
+#   cmsRun testHGCalGeometryRotCheck_cfg.py geometry=D110
 #
-#   Options for type D88, D92, D93
+#   Options for type 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',
-                 "D92",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "type of operations: D88, D92, D93")
+                  "type 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()
@@ -27,12 +28,9 @@
 
 ####################################################################
 # Use the options
-if (options.geometry == "D88"):
-    process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
-elif (options.geometry == "D93"):
-    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
-else:
-    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+print("Geometry file: ", geomFile)
+process.load(geomFile)
 
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
 process.load('Geometry.HGCalGeometry.hgcalGeometryRotCheck_cfi')
diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeometryRotTest_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeometryRotTest_cfg.py
index 4f2ab4301b724..9cce380eb0c5d 100644
--- a/Geometry/HGCalGeometry/test/python/testHGCalGeometryRotTest_cfg.py
+++ b/Geometry/HGCalGeometry/test/python/testHGCalGeometryRotTest_cfg.py
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCalGeometryRotTest_cfg.py geometry=D88
+#   cmsRun testHGCalGeometryRotTest_cfg.py geometry=D110
 #
-#   Options for type D88, D92, D93
+#   Options for type 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',
-                 "D92",
+                 "D110",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "type of operations: D88, D92, D93")
+                  "type 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()
@@ -27,12 +28,9 @@
 
 ####################################################################
 # Use the options
-if (options.geometry == "D88"):
-    process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
-elif (options.geometry == "D93"):
-    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
-else:
-    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+print("Geometry file: ", geomFile)
+process.load(geomFile)
 
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
 process.load('Geometry.HGCalGeometry.hgcalGeometryRotTest_cfi')
diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeometry_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeometry_cfg.py
index c917f48820c08..2ff614d7f5476 100644
--- a/Geometry/HGCalGeometry/test/python/testHGCalGeometry_cfg.py
+++ b/Geometry/HGCalGeometry/test/python/testHGCalGeometry_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun testHGCalHGCalGeometry_cfg.py geometry=V17
 #
-#   Options for geometry V16, V17
+#   Options for geometry V16, V17, V18
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "V17",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: V16, V17")
+                  "geometry of operations: V16, V17, V18")
 
 ### get and parse the command line arguments
 options.parseArguments()
@@ -26,16 +26,13 @@
 ####################################################################
 # Use the options
 
-if (options.geometry == "V16"):
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('HGCHGCalGeometry',Phase2C17I13M9)
-    process.load("Geometry.HGCalCommonData.testHGCalV16XML_cfi")
-    process.load("Geometry.HGCalCommonData.hgcalV15ParametersInitialization_cfi")
-else:
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('HGCHGCalGeometry',Phase2C17I13M9)
-    process.load("Geometry.HGCalCommonData.testHGCalV17XML_cfi")
-    process.load("Geometry.HGCalCommonData.hgcalV15ParametersInitialization_cfi")
+from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+process = cms.Process('HGCHGCalGeometry',Phase2C17I13M9)
+geomFile = "Geometry.HGCalCommonData.testHGCal" + options.geometry + "XML_cfi"
+print("Geometry file: ", geomFile)
+process.load(geomFile)
+process.load("Geometry.HGCalCommonData.hgcalParametersInitialization_cfi")
+process.load("Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi")
 
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
 process.load("Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi")
diff --git a/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileCheck_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileCheck_cfg.py
index 9f4fc5e04b12c..4a417efcc1981 100644
--- a/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileCheck_cfg.py
+++ b/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileCheck_cfg.py
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCalWaferInFileCheck_cfg.py geometry=D88
+#   cmsRun testHGCalWaferInFileCheck_cfg.py geometry=D110
 #
-#   Options for geometry D88, D92, D93
+#   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")
+                  "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()
@@ -24,19 +25,13 @@
 
 ####################################################################
 # Use the options
-if (options.geometry == "D92"):
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('WaferInFileCheck',Phase2C17I13M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
-elif (options.geometry == "D93"):
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('WaferInFileCheck',Phase2C17I13M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
-else:
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('WaferInFileCheck',Phase2C17I13M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
+from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+process = cms.Process('PROD',Phase2C17I13M9)
 
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+print("Geometry file: ", geomFile)
+
+process.load(geomFile)
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
 process.load("Geometry.HGCalGeometry.hgcalEEWaferInFileCheck_cfi")
 process.load('FWCore.MessageService.MessageLogger_cfi')
diff --git a/Geometry/HGCalGeometry/test/python/testHGCalWaferTypeTester_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalWaferTypeTester_cfg.py
index 78824bb842ebd..6b88c65e93989 100644
--- a/Geometry/HGCalGeometry/test/python/testHGCalWaferTypeTester_cfg.py
+++ b/Geometry/HGCalGeometry/test/python/testHGCalWaferTypeTester_cfg.py
@@ -1,8 +1,9 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCalWaferTypeTester_cfg.py geometry=D88
+#   cmsRun testHGCalWaferTypeTester_cfg.py geometry=D110
 #
-#   Options for geometry D88, D92, D93
+#   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")
+                  "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()
@@ -24,19 +25,13 @@
 
 ####################################################################
 # Use the options
-if (options.geometry == "D92"):
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('WaferTypeTester',Phase2C17I13M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
-elif (options.geometry == "D93"):
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('WaferTypeTester',Phase2C17I13M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
-else:
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('WaferTypeTester',Phase2C17I13M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
+from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+process = cms.Process('PROD',Phase2C17I13M9)
 
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+print("Geometry file: ", geomFile)
+
+process.load(geomFile)
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
 process.load("Geometry.HGCalGeometry.hgcalEEWaferTypeTester_cfi")