Implementing dildick's comments for pull request 2304

[mark-grimes]

Hi,
I had a go implementing @dildick's comments for cms-sw#2304. Could you check and update the pull request please? Do check in case I've misunderstood though. I'm not sure why the diff is showing so many file changes, I guess the original branch was based on an older IB - you might find it easier to implement yourself than merge this in. When rebased onto the current CMSSW_6_2_X_SLHC these are the only differences:

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023CFCalXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023CFCalXML_cfi.py
index 8df7a2d..5ad0d5f 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023CFCalXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023CFCalXML_cfi.py
@@ -111,7 +111,7 @@ XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
         'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml',
-        'Geometry/GEMGeometryBuilder/data/v4/GEMSpecs.xml',
+        'Geometry/GEMGeometryBuilder/data/v5/GEMSpecs.xml',
         'Geometry/ForwardCommonData/data/brmsens.xml',
         'Geometry/ForwardSimData/data/castorsens.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023SHCal4EtaXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023SHCal4EtaXML_cfi.py
index 61cb209..d91b62e 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023SHCal4EtaXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023SHCal4EtaXML_cfi.py
@@ -111,7 +111,6 @@ XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
         'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml',
-        'Geometry/GEMGeometryBuilder/data/v4/GEMSpecs.xml',
         'Geometry/ForwardCommonData/data/brmsens.xml',
         'Geometry/ForwardSimData/data/castorsens.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',