diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md
index 16583428fc5df..03445bd1b2fa9 100644
--- a/Configuration/Geometry/README.md
+++ b/Configuration/Geometry/README.md
@@ -128,9 +128,11 @@ Calorimeters:
 * C21: HGCal (v17 version of HGCal geometry as in C19 but turning off all dead areas and gaps) + Phase2 HCAL and EB (used in Run4D101)
 * C22: HGCal (v18 version of HGCal geometry as in C18 with calibration cells, nonzero cssette retraction, correct mousebite, guard ring, proper cell size) + Phase2 HCAL and EB (used in Run4D104)
 * C23: HGCal (same as the v18 version which is in C22 but without internal cells in the Geant4 geometry defintiion) + Phase2 HCAL and EB (used in Run4D106)
-* C24: HGCal (v18 version of HGCal geometry as in C122 but turning off all dead areas and gaps) + Phase2 HCAL and EB (used in Run4D109)
+* C24: HGCal (v18 version of HGCal geometry as in C22 but turning off all dead areas and gaps) + Phase2 HCAL and EB (used in Run4D109)
 * C25: sane as C18 but changing ebalgo.xml to make it more conformant with standard
 * C26: HGCal (v19 version of HGCal geometry with calibration cells, nonzero cssette retraction, correct mousebite, guard ring, proper cell size) + Phase2 HCAL and EB (used in Run4D120)
+* C27: HGCal (same as the v19 version which is in C26 but without internal cells in the Geant4 geometry defintiion) + Phase2 HCAL and EB (used in Run4D106)
+* C28: HGCal (v19 version of HGCal geometry as in C22 but turning off all dead areas and gaps) + Phase2 HCAL and EB (used in Run4D109)
 
 Muon system:
 * M4: Phase2 muon system for TDR w/ GE2/1, ME0, RE3/1, RE4/1 (incl. granularity in ME0, staggered GE2/1), 96 iRPC strips, no overlaps, MB4Shields
@@ -204,3 +206,5 @@ Several detector combinations have been generated:
 * D119 = T35+C25+M15+I20+O10+F9
 * D120 = T35+C26+M15+I20+O10+F9
 * D121 = T35+C25+M16+I17+O10+F9
+* D122 = T35+C27+M15+I20+O10+F9 
+* D123 = T35+C28+M15+I20+O10+F9 
diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D122Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D122Reco_cff.py
new file mode 100644
index 0000000000000..affb2f8423b54
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D122Reco_cff.py
@@ -0,0 +1,61 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generateRun4Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Configuration.Geometry.GeometryDD4hepExtendedRun4D122_cff import *
+
+# tracker
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *
+from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+trackerGeometry.applyAlignment = True
+
+# calo
+from Geometry.CaloEventSetup.HGCalTopology_cfi import *
+from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
+CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
+    SelectedCalos = cms.vstring("HCAL",
+                                "ZDC",
+                                "EcalBarrel",
+                                "TOWER",
+                                "HGCalEESensitive",
+                                "HGCalHESiliconSensitive",
+                                "HGCalHEScintillatorSensitive"
+    )
+)
+from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
+from Geometry.HcalEventSetup.HcalGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+
+# muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+# forward
+from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
+from Geometry.ForwardGeometry.ZdcGeometry_cfi import *
+
+# timing
+from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
+from Geometry.MTDGeometryBuilder.mtdParameters_cff import *
+from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *
+from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
+from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
+from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
+mtdGeometry.applyAlignment = False
+
diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D122_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D122_cff.py
new file mode 100644
index 0000000000000..aae9754673070
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D122_cff.py
@@ -0,0 +1,17 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generateRun4Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Configuration.Geometry.GeometryDD4hep_cff import *
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D122.xml")
+
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
+from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *
+from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
+from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
+from Geometry.MuonNumbering.muonGeometryConstants_cff import *
+from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
+from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *
diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D123Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D123Reco_cff.py
new file mode 100644
index 0000000000000..946bf15e70829
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D123Reco_cff.py
@@ -0,0 +1,61 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generateRun4Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Configuration.Geometry.GeometryDD4hepExtendedRun4D123_cff import *
+
+# tracker
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *
+from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+trackerGeometry.applyAlignment = True
+
+# calo
+from Geometry.CaloEventSetup.HGCalTopology_cfi import *
+from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
+CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
+    SelectedCalos = cms.vstring("HCAL",
+                                "ZDC",
+                                "EcalBarrel",
+                                "TOWER",
+                                "HGCalEESensitive",
+                                "HGCalHESiliconSensitive",
+                                "HGCalHEScintillatorSensitive"
+    )
+)
+from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
+from Geometry.HcalEventSetup.HcalGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+
+# muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+# forward
+from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
+from Geometry.ForwardGeometry.ZdcGeometry_cfi import *
+
+# timing
+from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
+from Geometry.MTDGeometryBuilder.mtdParameters_cff import *
+from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *
+from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
+from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
+from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
+mtdGeometry.applyAlignment = False
+
diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D123_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D123_cff.py
new file mode 100644
index 0000000000000..dca297e60ea9f
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D123_cff.py
@@ -0,0 +1,17 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generateRun4Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Configuration.Geometry.GeometryDD4hep_cff import *
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D123.xml")
+
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
+from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *
+from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
+from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
+from Geometry.MuonNumbering.muonGeometryConstants_cff import *
+from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
+from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *
diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D122Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D122Reco_cff.py
new file mode 100644
index 0000000000000..c4c4c8423bc81
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryExtendedRun4D122Reco_cff.py
@@ -0,0 +1,61 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generateRun4Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Configuration.Geometry.GeometryExtendedRun4D122_cff import *
+
+# tracker
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *
+from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+trackerGeometry.applyAlignment = True
+
+# calo
+from Geometry.CaloEventSetup.HGCalTopology_cfi import *
+from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
+CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
+    SelectedCalos = cms.vstring("HCAL",
+                                "ZDC",
+                                "EcalBarrel",
+                                "TOWER",
+                                "HGCalEESensitive",
+                                "HGCalHESiliconSensitive",
+                                "HGCalHEScintillatorSensitive"
+    )
+)
+from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
+from Geometry.HcalEventSetup.HcalGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+
+# muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+# forward
+from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
+from Geometry.ForwardGeometry.ZdcGeometry_cfi import *
+
+# timing
+from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
+from Geometry.MTDGeometryBuilder.mtdParameters_cff import *
+from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *
+from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
+from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
+from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
+mtdGeometry.applyAlignment = False
+
diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D122_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D122_cff.py
new file mode 100644
index 0000000000000..c967d1d03e2df
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryExtendedRun4D122_cff.py
@@ -0,0 +1,15 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generateRun4Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Geometry.CMSCommonData.cmsExtendedGeometryRun4D122XML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
+from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *
+from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
+from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
+from Geometry.MuonNumbering.muonGeometryConstants_cff import *
+from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
+from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *
diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D123Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D123Reco_cff.py
new file mode 100644
index 0000000000000..efb7b878d5969
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryExtendedRun4D123Reco_cff.py
@@ -0,0 +1,61 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generateRun4Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Configuration.Geometry.GeometryExtendedRun4D123_cff import *
+
+# tracker
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import *
+from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+trackerGeometry.applyAlignment = True
+
+# calo
+from Geometry.CaloEventSetup.HGCalTopology_cfi import *
+from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
+CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
+    SelectedCalos = cms.vstring("HCAL",
+                                "ZDC",
+                                "EcalBarrel",
+                                "TOWER",
+                                "HGCalEESensitive",
+                                "HGCalHESiliconSensitive",
+                                "HGCalHEScintillatorSensitive"
+    )
+)
+from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
+from Geometry.HcalEventSetup.HcalGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+
+# muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+# forward
+from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *
+from Geometry.ForwardGeometry.ZdcGeometry_cfi import *
+
+# timing
+from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
+from Geometry.MTDGeometryBuilder.mtdParameters_cff import *
+from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *
+from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
+from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
+from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
+mtdGeometry.applyAlignment = False
+
diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D123_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D123_cff.py
new file mode 100644
index 0000000000000..cc047b2e4c93e
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryExtendedRun4D123_cff.py
@@ -0,0 +1,15 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generateRun4Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Geometry.CMSCommonData.cmsExtendedGeometryRun4D123XML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
+from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *
+from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
+from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
+from Geometry.MuonNumbering.muonGeometryConstants_cff import *
+from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
+from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *
diff --git a/Configuration/Geometry/python/dictRun4Geometry.py b/Configuration/Geometry/python/dictRun4Geometry.py
index ad86caf12b123..e82e92dd2b9df 100644
--- a/Configuration/Geometry/python/dictRun4Geometry.py
+++ b/Configuration/Geometry/python/dictRun4Geometry.py
@@ -866,7 +866,7 @@
             'Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml',
             'Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml',
             'Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml',
-            'Geometry/HGCalCommonData/data/hgcalCons/v17n/hgcalCons.xml',
+            'Geometry/HGCalCommonData/data/hgcalCons/v17ng/hgcalCons.xml',
             'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml',
         ],
         3 : [
@@ -1089,7 +1089,7 @@
             'Geometry/HGCalCommonData/data/hgcalEE/v18/hgcalEE.xml',
             'Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml',
             'Geometry/HGCalCommonData/data/hgcalHEmix/v18/hgcalHEmix.xml',
-            'Geometry/HGCalCommonData/data/hgcalCons/v18n/hgcalCons.xml',
+            'Geometry/HGCalCommonData/data/hgcalCons/v18ngx/hgcalCons.xml',
             'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml',
         ],
         3 : [
@@ -1288,6 +1288,229 @@
         ],
         "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose, phase2-hgcalV18",
     },
+    "C27" : {
+        1 : [
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/ebalgo.xml',
+        'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
+        'Geometry/EcalCommonData/data/ebrot.xml',
+        'Geometry/HcalCommonData/data/hcalrotations.xml',
+        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+        'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
+        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+        'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
+        'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
+        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+        'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
+        'Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml',
+        'Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v19n/hgcalwafer.xml',
+        'Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml',
+        'Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEsil/v19/hgcalHEsil.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml',
+        'Geometry/HGCalCommonData/data/hgcalCons/v19n/hgcalCons.xml',
+        'Geometry/HGCalCommonData/data/hgcalConsData/v19/hgcalConsData.xml',
+        ],
+        3 : [
+            'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
+            'Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml',
+            'Geometry/HcalSimData/data/hf.xml',
+            'Geometry/HcalSimData/data/hfpmt.xml',
+            'Geometry/HcalSimData/data/hffibrebundle.xml',
+            'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
+            'Geometry/HGCalSimData/data/hgcsensv15.xml',
+        ],
+        4 : [
+            'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
+            'Geometry/EcalSimData/data/EcalProdCuts.xml',
+            'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
+        ],
+        "sim" : [
+            'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *',
+            'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *',
+            'from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *',
+            'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *'
+        ],
+        "reco" : [
+            'from Geometry.CaloEventSetup.HGCalTopology_cfi import *',
+            'from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *',
+            'from Geometry.CaloEventSetup.CaloTopology_cfi import *',
+            'from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *',
+            'CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",',
+            '    SelectedCalos = cms.vstring("HCAL",',
+            '                                "ZDC",',
+            '                                "EcalBarrel",',
+            '                                "TOWER",',
+            '                                "HGCalEESensitive",',
+            '                                "HGCalHESiliconSensitive",',
+            '                                "HGCalHEScintillatorSensitive"',
+            '    )',
+            ')',
+            'from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *',
+            'from Geometry.HcalEventSetup.HcalGeometry_cfi import *',
+            'from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *',
+            'from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *',
+            'from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *',
+            'from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *',
+            'from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *',
+            'from Geometry.EcalMapping.EcalMapping_cfi import *',
+            'from Geometry.EcalMapping.EcalMappingRecord_cfi import *',
+        ],
+        "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose, phase2-hgcalV18",
+    },
+    "C28" : {
+        1 : [
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/ebalgo.xml',
+        'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
+        'Geometry/EcalCommonData/data/ebrot.xml',
+        'Geometry/HcalCommonData/data/hcalrotations.xml',
+        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+        'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
+        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+        'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
+        'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
+        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+        'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
+        'Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml',
+        'Geometry/HGCalCommonData/data/hgcal/v19ng/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v19ng/hgcalwafer.xml',
+        'Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml',
+        'Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEsil/v19/hgcalHEsil.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml',
+        'Geometry/HGCalCommonData/data/hgcalCons/v19ng/hgcalCons.xml',
+        'Geometry/HGCalCommonData/data/hgcalConsData/v19/hgcalConsData.xml',
+        ],
+        3 : [
+            'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
+            'Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml',
+            'Geometry/HcalSimData/data/hf.xml',
+            'Geometry/HcalSimData/data/hfpmt.xml',
+            'Geometry/HcalSimData/data/hffibrebundle.xml',
+            'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
+            'Geometry/HGCalSimData/data/hgcsensv15.xml',
+        ],
+        4 : [
+            'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
+            'Geometry/EcalSimData/data/EcalProdCuts.xml',
+            'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
+        ],
+        "sim" : [
+            'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *',
+            'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *',
+            'from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *',
+            'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *'
+        ],
+        "reco" : [
+            'from Geometry.CaloEventSetup.HGCalTopology_cfi import *',
+            'from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *',
+            'from Geometry.CaloEventSetup.CaloTopology_cfi import *',
+            'from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *',
+            'CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",',
+            '    SelectedCalos = cms.vstring("HCAL",',
+            '                                "ZDC",',
+            '                                "EcalBarrel",',
+            '                                "TOWER",',
+            '                                "HGCalEESensitive",',
+            '                                "HGCalHESiliconSensitive",',
+            '                                "HGCalHEScintillatorSensitive"',
+            '    )',
+            ')',
+            'from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *',
+            'from Geometry.HcalEventSetup.HcalGeometry_cfi import *',
+            'from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *',
+            'from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *',
+            'from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *',
+            'from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *',
+            'from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *',
+            'from Geometry.EcalMapping.EcalMapping_cfi import *',
+            'from Geometry.EcalMapping.EcalMappingRecord_cfi import *',
+        ],
+        "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose, phase2-hgcalV18",
+    },
+    "C26" : {
+        1 : [
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/ebalgo.xml',
+        'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
+        'Geometry/EcalCommonData/data/ebrot.xml',
+        'Geometry/HcalCommonData/data/hcalrotations.xml',
+        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+        'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
+        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+        'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
+        'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
+        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+        'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
+        'Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml',
+        'Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v19/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v19/hgcalwafer.xml',
+        'Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml',
+        'Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEsil/v19/hgcalHEsil.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml',
+        'Geometry/HGCalCommonData/data/hgcalCons/v19/hgcalCons.xml',
+        'Geometry/HGCalCommonData/data/hgcalConsData/v19/hgcalConsData.xml',
+        ],
+        3 : [
+            'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
+            'Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml',
+            'Geometry/HcalSimData/data/hf.xml',
+            'Geometry/HcalSimData/data/hfpmt.xml',
+            'Geometry/HcalSimData/data/hffibrebundle.xml',
+            'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
+            'Geometry/HGCalSimData/data/hgcsensv15.xml',
+        ],
+        4 : [
+            'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
+            'Geometry/EcalSimData/data/EcalProdCuts.xml',
+            'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
+        ],
+        "sim" : [
+            'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *',
+            'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *',
+            'from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *',
+            'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *'
+        ],
+        "reco" : [
+            'from Geometry.CaloEventSetup.HGCalTopology_cfi import *',
+            'from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *',
+            'from Geometry.CaloEventSetup.CaloTopology_cfi import *',
+            'from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *',
+            'CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",',
+            '    SelectedCalos = cms.vstring("HCAL",',
+            '                                "ZDC",',
+            '                                "EcalBarrel",',
+            '                                "TOWER",',
+            '                                "HGCalEESensitive",',
+            '                                "HGCalHESiliconSensitive",',
+            '                                "HGCalHEScintillatorSensitive"',
+            '    )',
+            ')',
+            'from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *',
+            'from Geometry.HcalEventSetup.HcalGeometry_cfi import *',
+            'from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *',
+            'from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *',
+            'from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *',
+            'from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *',
+            'from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *',
+            'from Geometry.EcalMapping.EcalMapping_cfi import *',
+            'from Geometry.EcalMapping.EcalMappingRecord_cfi import *',
+        ],
+        "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose, phase2-hgcalV18",
+    },
 
 }
 
@@ -1768,6 +1991,8 @@
     ("O10","T35","C25","M15","F9","I20") : "D119",
     ("O10","T35","C26","M15","F9","I20") : "D120",
     ("O10","T35","C25","M16","F9","I17") : "D121",
+    ("O10","T35","C27","M15","F9","I20") : "D122",
+    ("O10","T35","C28","M15","F9","I20") : "D123",
 }
 
 deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42", "D35", "D41", "D43", "D44", "D45", "D46", "D48", "D47", "D50", "D51", "D52", "D53", "D54", "D55", "D56", "D57", "D58", "D59", "D61", "D62", "D63", "D64", "D65", "D66", "D67", "D69", "D71", "D72", "D73", "D74", "D75", "D78", "D79", "D87", "D89", "D90", "D49", "D60", "D68", "D70", "D76", "D77", "D80", "D81", "D82", "D83", "D84", "D85","D86","D88","D91","D92","D93","D94","D97"])
diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py
index 9dbd015081a2c..b2c8bd1c940c4 100644
--- a/Configuration/StandardSequences/python/GeometryConf.py
+++ b/Configuration/StandardSequences/python/GeometryConf.py
@@ -140,4 +140,8 @@
     'DD4hepExtendedRun4D120' : 'DD4hepExtendedRun4D120,DD4hepExtendedRun4D120Reco',
     'ExtendedRun4D121' : 'ExtendedRun4D121,ExtendedRun4D121Reco',
     'DD4hepExtendedRun4D121' : 'DD4hepExtendedRun4D121,DD4hepExtendedRun4D121Reco',
+    'ExtendedRun4D122' : 'ExtendedRun4D122,ExtendedRun4D122Reco',
+    'DD4hepExtendedRun4D122' : 'DD4hepExtendedRun4D122,DD4hepExtendedRun4D122Reco',
+    'ExtendedRun4D123' : 'ExtendedRun4D123,ExtendedRun4D123Reco',
+    'DD4hepExtendedRun4D123' : 'DD4hepExtendedRun4D123,DD4hepExtendedRun4D123Reco',
 }
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D103.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D103.xml
index 512fee4793a94..7c6dc4f41962f 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D103.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D103.xml
@@ -63,7 +63,7 @@
     <Include ref='Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalCons/v17n/hgcalCons.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcalCons/v17ng/hgcalCons.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D109.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D109.xml
index ef3f1fce3331c..06c5b300b2bf7 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D109.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D109.xml
@@ -63,7 +63,7 @@
     <Include ref='Geometry/HGCalCommonData/data/hgcalEE/v18/hgcalEE.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalHEmix/v18/hgcalHEmix.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalCons/v18n/hgcalCons.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcalCons/v18ngx/hgcalCons.xml'/>
     <Include ref='Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D122.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D122.xml
new file mode 100644
index 0000000000000..754853bd7078f
--- /dev/null
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D122.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<DDDefinition>
+  <open_geometry/>
+  <close_geometry/>
+
+  <IncludeSection>
+    <Include ref='Geometry/CMSCommonData/data/materials/2030/v1/materials.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_OT800_IT615_2022_10/pixbar.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_03/tracker.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixel.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerStructureTopology.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelStructureTopology.xml'/>
+    <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackersens.xml'/>
+    <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelsens.xml'/>
+    <Include ref='Geometry/TrackerRecoData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/trackerRecoMaterial.xml'/>
+    <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
+    <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml'/>
+    <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalrotations.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalbarrelalgo.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcalwafer/v19n/hgcalwafer.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcalHEsil/v19/hgcalHEsil.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcalCons/v19n/hgcalCons.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcalConsData/v19/hgcalConsData.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb3/2015/v3/mb3.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb4Shield/2030/v1/mb4Shield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v4/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/csc/2021/v2/csc.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2030/v4/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v5/ge0.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v5/forwardshield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/btl/v4/btl.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/etl/v10/etl.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/mtdParameters/v8/mtdStructureTopology.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/mtdParameters/v8/mtdParameters.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
+    <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml'/>
+    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
+    <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
+    <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
+    <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
+    <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml'/>
+    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
+    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
+    <Include ref='Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
+    <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
+    <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
+    <Include ref='Geometry/MTDSimData/data/v5/mtdsens.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
+    <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
+    <Include ref='Geometry/MTDSimData/data/v5/mtdProdCuts.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
+  </IncludeSection>
+</DDDefinition>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D123.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D123.xml
new file mode 100644
index 0000000000000..2430a0159f58a
--- /dev/null
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D123.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<DDDefinition>
+  <open_geometry/>
+  <close_geometry/>
+
+  <IncludeSection>
+    <Include ref='Geometry/CMSCommonData/data/materials/2030/v1/materials.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2030/v5/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_OT800_IT615_2022_10/pixbar.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_03/tracker.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixel.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerStructureTopology.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelStructureTopology.xml'/>
+    <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackersens.xml'/>
+    <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelsens.xml'/>
+    <Include ref='Geometry/TrackerRecoData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/trackerRecoMaterial.xml'/>
+    <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml'/>
+    <Include ref='Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml'/>
+    <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalrotations.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalbarrelalgo.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcal/v19ng/hgcal.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcalwafer/v19ng/hgcalwafer.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcalHEsil/v19/hgcalHEsil.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcalCons/v19ng/hgcalCons.xml'/>
+    <Include ref='Geometry/HGCalCommonData/data/hgcalConsData/v19/hgcalConsData.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb3/2015/v3/mb3.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb4Shield/2030/v1/mb4Shield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonYoke/2030/v4/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mf/2030/v8/mf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/csc/2021/v2/csc.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2030/v4/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v5/ge0.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2030/v5/forwardshield.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
+    <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/btl/v4/btl.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/etl/v10/etl.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/mtdParameters/v8/mtdStructureTopology.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/mtdParameters/v8/mtdParameters.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
+    <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
+    <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml'/>
+    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
+    <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
+    <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
+    <Include ref='Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml'/>
+    <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
+    <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
+    <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml'/>
+    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
+    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
+    <Include ref='Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml'/>
+    <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
+    <Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
+    <Include ref='Geometry/MTDSimData/data/v5/mtdsens.xml'/>
+    <Include ref='Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml'/>
+    <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
+    <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv15.xml'/>
+    <Include ref='Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
+    <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
+    <Include ref='Geometry/MTDSimData/data/v5/mtdProdCuts.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
+  </IncludeSection>
+</DDDefinition>
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D103XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D103XML_cfi.py
index a7a0e5b564ad1..d13c1a24199e0 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D103XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D103XML_cfi.py
@@ -64,7 +64,7 @@
         'Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml',
         'Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml',
         'Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalCons/v17n/hgcalCons.xml',
+        'Geometry/HGCalCommonData/data/hgcalCons/v17ng/hgcalCons.xml',
         'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml',
         'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D109XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D109XML_cfi.py
index 30f173c57f398..cccc173e2544e 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D109XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D109XML_cfi.py
@@ -64,7 +64,7 @@
         'Geometry/HGCalCommonData/data/hgcalEE/v18/hgcalEE.xml',
         'Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml',
         'Geometry/HGCalCommonData/data/hgcalHEmix/v18/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalCons/v18n/hgcalCons.xml',
+        'Geometry/HGCalCommonData/data/hgcalCons/v18ngx/hgcalCons.xml',
         'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml',
         'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D122XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D122XML_cfi.py
new file mode 100644
index 0000000000000..13f8d5612d590
--- /dev/null
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D122XML_cfi.py
@@ -0,0 +1,128 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generateRun4Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring(
+        'Geometry/CMSCommonData/data/materials/2030/v1/materials.xml',
+        'Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml',
+        'Geometry/CMSCommonData/data/rotations.xml',
+        'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
+        'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cmsMother.xml',
+        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
+        'Geometry/CMSCommonData/data/cmsTracker.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/cmsCalo.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/cmsMuon.xml',
+        'Geometry/CMSCommonData/data/mgnt.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/muonMB.xml',
+        'Geometry/CMSCommonData/data/muonMagnet.xml',
+        'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
+        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
+        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_OT800_IT615_2022_10/pixbar.xml',
+        'Geometry/TrackerCommonData/data/trackermaterial.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_03/tracker.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixel.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerStructureTopology.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelStructureTopology.xml',
+        'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackersens.xml',
+        'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelsens.xml',
+        'Geometry/TrackerRecoData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/trackerRecoMaterial.xml',
+        'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
+        'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml',
+        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/ebalgo.xml',
+        'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
+        'Geometry/EcalCommonData/data/ebrot.xml',
+        'Geometry/HcalCommonData/data/hcalrotations.xml',
+        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+        'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
+        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+        'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
+        'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
+        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+        'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
+        'Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml',
+        'Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v19n/hgcalwafer.xml',
+        'Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml',
+        'Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEsil/v19/hgcalHEsil.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml',
+        'Geometry/HGCalCommonData/data/hgcalCons/v19n/hgcalCons.xml',
+        'Geometry/HGCalCommonData/data/hgcalConsData/v19/hgcalConsData.xml',
+        'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
+        'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',
+        'Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml',
+        'Geometry/MuonCommonData/data/mb3/2015/v3/mb3.xml',
+        'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
+        'Geometry/MuonCommonData/data/mb4Shield/2030/v1/mb4Shield.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v4/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
+        'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v4/rpcf.xml',
+        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
+        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/ge0/TDR_Dev/v5/ge0.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v5/forwardshield.xml',
+        'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
+        'Geometry/ForwardCommonData/data/lumimaterials.xml',
+        'Geometry/ForwardCommonData/data/zdcrotations.xml',
+        'Geometry/ForwardCommonData/data/lumirotations.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/cmszdc.xml',
+        'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
+        'Geometry/MTDCommonData/data/btl/v4/btl.xml',
+        'Geometry/MTDCommonData/data/etl/v10/etl.xml',
+        'Geometry/MTDCommonData/data/mtdParameters/v8/mtdStructureTopology.xml',
+        'Geometry/MTDCommonData/data/mtdParameters/v8/mtdParameters.xml',
+    )+
+    cms.vstring(
+        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
+        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
+        'Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml',
+        'Geometry/HcalSimData/data/hf.xml',
+        'Geometry/HcalSimData/data/hfpmt.xml',
+        'Geometry/HcalSimData/data/hffibrebundle.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
+        'Geometry/HGCalSimData/data/hgcsensv15.xml',
+        'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
+        'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
+        'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
+        'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
+        'Geometry/ForwardSimData/data/zdcsens.xml',
+        'Geometry/MTDSimData/data/v5/mtdsens.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
+        'Geometry/EcalSimData/data/EcalProdCuts.xml',
+        'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
+        'Geometry/MTDSimData/data/v5/mtdProdCuts.xml',
+        'Geometry/CMSCommonData/data/FieldParameters.xml',
+    ),
+    rootNodeName = cms.string('cms:OCMS')
+)
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D123XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D123XML_cfi.py
new file mode 100644
index 0000000000000..53f5d48f31353
--- /dev/null
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D123XML_cfi.py
@@ -0,0 +1,128 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generateRun4Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring(
+        'Geometry/CMSCommonData/data/materials/2030/v1/materials.xml',
+        'Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml',
+        'Geometry/CMSCommonData/data/rotations.xml',
+        'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
+        'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cmsMother.xml',
+        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
+        'Geometry/CMSCommonData/data/cmsTracker.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v7/caloBase.xml',
+        'Geometry/CMSCommonData/data/cmsCalo.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/cmsMuon.xml',
+        'Geometry/CMSCommonData/data/mgnt.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/muonMB.xml',
+        'Geometry/CMSCommonData/data/muonMagnet.xml',
+        'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
+        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
+        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_OT800_IT615_2022_10/pixbar.xml',
+        'Geometry/TrackerCommonData/data/trackermaterial.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_03/tracker.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixel.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerStructureTopology.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelStructureTopology.xml',
+        'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackersens.xml',
+        'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelsens.xml',
+        'Geometry/TrackerRecoData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/trackerRecoMaterial.xml',
+        'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
+        'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml',
+        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/ebalgo.xml',
+        'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
+        'Geometry/EcalCommonData/data/ebrot.xml',
+        'Geometry/HcalCommonData/data/hcalrotations.xml',
+        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+        'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
+        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+        'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
+        'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
+        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+        'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
+        'Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml',
+        'Geometry/HGCalCommonData/data/hgcal/v19ng/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v19ng/hgcalwafer.xml',
+        'Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml',
+        'Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEsil/v19/hgcalHEsil.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml',
+        'Geometry/HGCalCommonData/data/hgcalCons/v19ng/hgcalCons.xml',
+        'Geometry/HGCalCommonData/data/hgcalConsData/v19/hgcalConsData.xml',
+        'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
+        'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',
+        'Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml',
+        'Geometry/MuonCommonData/data/mb3/2015/v3/mb3.xml',
+        'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
+        'Geometry/MuonCommonData/data/mb4Shield/2030/v1/mb4Shield.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v4/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
+        'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v4/rpcf.xml',
+        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
+        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
+        'Geometry/MuonCommonData/data/gem21/2030/v1/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/ge0/TDR_Dev/v5/ge0.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v5/forwardshield.xml',
+        'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
+        'Geometry/ForwardCommonData/data/lumimaterials.xml',
+        'Geometry/ForwardCommonData/data/zdcrotations.xml',
+        'Geometry/ForwardCommonData/data/lumirotations.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/cmszdc.xml',
+        'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
+        'Geometry/MTDCommonData/data/btl/v4/btl.xml',
+        'Geometry/MTDCommonData/data/etl/v10/etl.xml',
+        'Geometry/MTDCommonData/data/mtdParameters/v8/mtdStructureTopology.xml',
+        'Geometry/MTDCommonData/data/mtdParameters/v8/mtdParameters.xml',
+    )+
+    cms.vstring(
+        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
+        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
+        'Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml',
+        'Geometry/HcalSimData/data/hf.xml',
+        'Geometry/HcalSimData/data/hfpmt.xml',
+        'Geometry/HcalSimData/data/hffibrebundle.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
+        'Geometry/HGCalSimData/data/hgcsensv15.xml',
+        'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
+        'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
+        'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
+        'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
+        'Geometry/ForwardSimData/data/zdcsens.xml',
+        'Geometry/MTDSimData/data/v5/mtdsens.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
+        'Geometry/EcalSimData/data/EcalProdCuts.xml',
+        'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
+        'Geometry/MTDSimData/data/v5/mtdProdCuts.xml',
+        'Geometry/CMSCommonData/data/FieldParameters.xml',
+    ),
+    rootNodeName = cms.string('cms:OCMS')
+)
diff --git a/Geometry/HGCalCommonData/data/hgcal/v19ng/hgcal.xml b/Geometry/HGCalCommonData/data/hgcal/v19ng/hgcal.xml
new file mode 100644
index 0000000000000..dcbf75403686e
--- /dev/null
+++ b/Geometry/HGCalCommonData/data/hgcal/v19ng/hgcal.xml
@@ -0,0 +1,340 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+<ConstantsSection label="hgcal.xml" eval="true">
+  <Constant name="WaferSize"             value="167.64*mm"/>
+  <Constant name="WaferSizeNominal"      value="167.4408*mm"/>
+  <Constant name="WaferThickness"        value="0.30*mm"/>
+  <Constant name="WaferThicknessFine"    value="0.30*mm"/>
+  <Constant name="WaferThicknessCoarse1" value="0.20*mm"/>
+  <Constant name="WaferThicknessCoarse2" value="0.30*mm"/>
+  <Constant name="SensorSeparation"      value="0.0*mm"/>
+  <Constant name="SensorSizeOffset"      value="0.0*mm"/>
+  <Constant name="GuardRingOffset"       value="0.0*mm"/>
+  <Constant name="MouseBite"             value="0.0*mm"/>
+  <Constant name="UseOffset"             value="1"/>
+  <Constant name="ModuleThicknessEE"     value="8.485*mm"/>
+  <Constant name="ModuleThicknessHE"     value="8.135*mm"/>
+  <Constant name="CellThicknessFine"     value="0.12*mm"/>
+  <Constant name="CellThicknessCoarse1"  value="0.20*mm"/>
+  <Constant name="CellThicknessCoarse2"  value="0.30*mm"/>
+  <Constant name="ScintillatorThickness" value="3.0*mm"/>
+  <Constant name="NumberOfCellsFine"     value="12"/>
+  <Constant name="NumberOfCellsCoarse"   value="8"/>
+  <Constant name="NPhiBinBHFine"         value="432"/>
+  <Constant name="NPhiBinBH"             value="288"/>
+  <Constant name="FirstMixedLayer"       value="8"/>
+  <Constant name="FirstMixedCoarseLayer" value="12"/>
+  <Constant name="LayerRotation"         value="-30*deg"/>
+  <Constant name="CalibCellRHD"          value="2.04*mm"/>
+  <Constant name="CalibCellRLD"          value="3.05*mm"/>
+  <Constant name="rad100200P0"           value="-1.60163E-06"/>
+  <Constant name="rad100200P1"           value="2.50640E-03"/>
+  <Constant name="rad100200P2"           value="-1.46943E+00"/>
+  <Constant name="rad100200P3"           value="3.82025E+02"/>
+  <Constant name="rad100200P4"           value="-3.705690E+04"/>
+  <Constant name="rad200300P0"           value="-4.43240E-07"/>
+  <Constant name="rad200300P1"           value="7.70078E-04"/>
+  <Constant name="rad200300P2"           value="-4.97013E-01"/>
+  <Constant name="rad200300P3"           value="1.40778E+02"/>
+  <Constant name="rad200300P4"           value="-1.46340E+04"/>
+  <Constant name="zMinForRadPar"         value="335.0*cm"/>
+  <Constant name="ChoiceType"            value="0"/>
+  <Constant name="NCornerCut"            value="2"/>
+  <Constant name="FracAreaMin"           value="0.2"/>
+  <Constant name="radMixL0"              value="1537.05*mm"/>
+  <Constant name="radMixL1"              value="1537.05*mm"/>
+  <Constant name="radMixL2"              value="1537.05*mm"/>
+  <Constant name="radMixL3"              value="1537.05*mm"/>
+  <Constant name="radMixL4"              value="1378.52*mm"/>
+  <Constant name="radMixL5"              value="1378.52*mm"/>
+  <Constant name="radMixL6"              value="1207.60*mm"/>
+  <Constant name="radMixL7"              value="1207.60*mm"/>
+  <Constant name="radMixL8"              value="1207.60*mm"/>
+  <Constant name="radMixL9"              value="1207.60*mm"/>
+  <Constant name="radMixL10"             value="1045.90*mm"/>
+  <Constant name="radMixL11"             value="1045.90*mm"/>
+  <Constant name="radMixL12"             value="1045.90*mm"/>
+  <Constant name="radMixL13"             value="1045.90*mm"/>
+  <Constant name="zPosV0"                value="3210.5*mm"/>
+  <Constant name="rPosV0"                value="1523.3*mm"/>
+  <Constant name="zPosV01"               value="3621.8*mm"/>
+  <Constant name="rPosV01"               value="1646.7*mm"/>
+  <Constant name="zPosV1"                value="3877.5*mm"/>
+  <Constant name="rPosV1"                value="1753.2*mm"/>
+  <Constant name="zPosV2"                value="4562.0*mm"/>
+  <Constant name="rPosV2"                value="2634.5*mm"/>
+  <Constant name="slope1"                value="([rPosV1]-[rPosV0])/([zPosV1]-[zPosV0])"/>
+  <Constant name="slope2"                value="([rPosV1]-[rPosV01])/([zPosV1]-[zPosV01])"/>
+  <Constant name="slope3"                value="([caloBase:Rmax36]-[rPosV1])/([caloBase:Zpos36]-[zPosV1])"/>
+  <Constant name="cslope1"               value="sqrt([slope1]*[slope1]+1.0)"/>
+  <Constant name="cslope2"               value="sqrt([slope2]*[slope2]+1.0)"/>
+  <Constant name="cslope3"               value="sqrt([slope3]*[slope3]+1.0)"/>
+  <Constant name="zHGCal0"               value="[caloBase:ZposV0]"/>
+  <Constant name="zHGCal1"               value="[zPosV0]"/>
+  <Constant name="zHGCal2"               value="3620.96*mm"/>
+  <Constant name="zHGCal3"               value="[caloBase:Zpos31]"/>
+  <Constant name="zHGCal4"               value="[caloBase:Zpos32]"/>
+  <Constant name="zHGCal5"               value="[zPosV1]"/>
+  <Constant name="zHGCal6"               value="4065.81*mm"/>
+  <Constant name="zHGCal7"               value="[caloBase:Zpos33]"/>
+  <Constant name="zHGCal8"               value="[caloBase:Zpos34]"/>
+  <Constant name="zHGCal9"               value="[caloBase:Zpos36]"/>
+  <Constant name="zHGCal10"              value="[zPosV2]"/>
+  <Constant name="zHGCal11"              value="[caloBase:Zpos37]"/>
+  <Constant name="zHGCal12"              value="5140.51*mm"/>
+  <Constant name="zHGCal12S"             value="[caloBase:Zpos2H]"/>
+  <Constant name="zHGCal13"              value="[caloBase:Zpos38]"/>
+  <Constant name="rMinHGCal0"            value="[caloBase:Rmin11]"/>
+  <Constant name="rMinHGCal1"            value="[caloBase:Rmin11]"/>
+  <Constant name="rMinHGCal2"            value="314.0*mm"/> 
+  <Constant name="rMinHGCal3"            value="[caloBase:Rmin31]"/> 
+  <Constant name="rMinHGCal4"            value="348.6*mm"/>
+  <Constant name="rMinHGCal5"            value="[caloBase:Rmin33]"/>    
+  <Constant name="rMinHGCal6"            value="418.6*mm"/>
+  <Constant name="rMinHGCal7"            value="[caloBase:Rmin34]"/>
+  <Constant name="rMinHGCal8"            value="483.4*mm"/>
+  <Constant name="rMaxHGCal0"            value="([rPosV0]+[slope1]*([zHGCal0]-[zPosV0]))"/>
+  <Constant name="rMaxHGCal0S"           value="[caloBase:RmaxV0]"/>
+  <Constant name="rMaxHGCal1"            value="1540.0*mm"/>
+  <Constant name="rMaxHGCal2"            value="([rMaxHGCal1]+[slope1]*([zHGCal2]-[zPosV0]))"/>
+  <Constant name="rMaxHGCal3"            value="([rMaxHGCal1]+[slope1]*([zHGCal3]-[zPosV0]))"/>
+  <Constant name="rMaxHGCal3S"           value="[caloBase:Rmax31]"/>
+  <Constant name="rMaxHGCal4S"           value="[caloBase:Rmax32]"/>
+  <Constant name="rMaxHGCal5"            value="([rMaxHGCal1]+[slope1]*([zHGCal5]-[zPosV0]))"/>
+  <Constant name="rMaxHGCal6"            value="([rMaxHGCal5]+[slope3]*([zHGCal6]-[zHGCal5]))"/>
+  <Constant name="rMaxHGCal7"            value="([rMaxHGCal5]+[slope3]*([zHGCal7]-[zHGCal5]))"/>
+  <Constant name="rMaxHGCal7S"           value="[caloBase:Rmax33]"/>
+  <Constant name="rMaxHGCal8"            value="([rMaxHGCal5]+[slope3]*([zHGCal8]-[zHGCal5]))"/>
+  <Constant name="rMaxHGCal8S"           value="[caloBase:Rmax34]"/>
+  <Constant name="rMaxHGCal9S"           value="[caloBase:Rmax36]"/>
+  <Constant name="rMaxHGCal10"           value="([rMaxHGCal5]+[slope3]*([zHGCal10]-[zHGCal5]))"/>
+  <Constant name="rMaxHGCal11"           value="[caloBase:Rmax37]"/>
+  <Constant name="rMaxHGCal12"           value="[caloBase:Rmax37]"/>
+  <Constant name="rMaxHGCal12S"          value="[caloBase:Rmax38]"/>
+  <Constant name="zHGCalEE1"             value="[zHGCal1]"/>
+  <Constant name="zHGCalEE2"             value="[zHGCal2]"/>
+  <Constant name="rMinHGCalEE1"          value="[rMinHGCal2]"/>
+  <Constant name="rMaxHGCalEE1"          value="[rMaxHGCal1]"/>
+  <Constant name="rMaxHGCalEE2"          value="[rMaxHGCal2]"/>
+  <Constant name="zHGCalHEsil1"          value="[zHGCal2]"/>
+  <Constant name="zHGCalHEsil2"          value="[zHGCal5]"/>
+  <Constant name="zHGCalHEsil3"          value="[zHGCal6]"/>
+  <Constant name="rMinHGCalHEsil1"       value="[rMinHGCal4]"/>
+  <Constant name="rMaxHGCalHEsil1"       value="[rMaxHGCal2]"/>
+  <Constant name="rMaxHGCalHEsil2"       value="[rMaxHGCal5]"/>
+  <Constant name="rMaxHGCalHEsil3"       value="[rMaxHGCal6]"/>
+  <Constant name="zHGCalHEmix1"          value="[zHGCal6]"/>
+  <Constant name="zHGCalHEmix2"          value="[zHGCal7]"/>
+  <Constant name="zHGCalHEmix3"          value="[zHGCal8]"/>
+  <Constant name="zHGCalHEmix4"          value="[zHGCal10]"/>
+  <Constant name="zHGCalHEmix5"          value="[zHGCal11]"/>
+  <Constant name="zHGCalHEmix6"          value="[zHGCal12]"/>
+  <Constant name="rMinHGCalHEmix1"       value="[rMinHGCal6]"/>
+  <Constant name="rMinHGCalHEmix2"       value="[rMinHGCal8]"/>
+  <Constant name="rMaxHGCalHEmix1"       value="[rMaxHGCal6]"/>
+  <Constant name="rMaxHGCalHEmix2"       value="[rMaxHGCal7]"/>
+  <Constant name="rMaxHGCalHEmix3"       value="[rMaxHGCal8]"/>
+  <Constant name="rMaxHGCalHEmix4"       value="[rMaxHGCal10]"/>
+  <Constant name="rMaxHGCalHEmix5"       value="[rMaxHGCal12]"/>
+  <Constant name="thickEEModule1"        value="28.87*mm"/>
+  <Constant name="thickEEModule2"        value="30.57*mm"/>
+  <Constant name="thickEEModule3"        value="33.82*mm"/>
+  <Constant name="thickEEModule4"        value="34.82*mm"/>
+  <Constant name="thickEEAbsorber1"      value="3.10*mm"/>
+  <Constant name="thickEEAbsorber2"      value="4.80*mm"/>
+  <Constant name="thickEEAbsorber3"      value="8.10*mm"/>
+  <Constant name="thickEECooling"        value="6.05*mm"/>
+  <Constant name="nEEModule1"            value="1"/>
+  <Constant name="nEEModule2"            value="8"/>
+  <Constant name="nEEModule3"            value="4"/>
+  <Constant name="thickHEModule1"        value="66.55*mm"/>
+  <Constant name="thickHEModule2"        value="63.05*mm"/>
+  <Constant name="thickHEModule3"        value="82.25*mm"/>
+  <Constant name="thickHEAbsorber1"      value="45.0*mm"/>
+  <Constant name="thickHEAbsorber2"      value="41.5*mm"/>
+  <Constant name="thickHEAbsorber3"      value="60.7*mm"/>
+  <Constant name="thickHEAirGap"         value="4.02*mm"/>
+  <Constant name="thickHESteelCover"     value="2.0*mm"/>
+  <Constant name="thickHEService"        value="5.06*mm"/>
+  <Constant name="thickHEShift1"         value="([thickHEAbsorber1] + [thickHEAirGap])"/>
+  <Constant name="thickHEShift2"         value="([thickHEAbsorber2] + [thickHEAirGap])"/>
+  <Constant name="thickHEShift3"         value="([thickHEAbsorber3] + [thickHEAirGap])"/>
+  <Constant name="thickHECooling"        value="6.35*mm"/>
+  <Constant name="nHEModule1"            value="1"/>
+  <Constant name="nHEModule2"            value="4"/>
+</ConstantsSection>
+
+<RotationSection label="hgcal.xml">
+  <Rotation name="LayerRotation" phiX="[LayerRotation]" thetaX="90*deg" 
+	    phiY="(90*deg+[LayerRotation])" thetaY="90*deg" 
+	    phiZ="0*deg" thetaZ="0*deg"/>
+</RotationSection>
+
+<SolidSection label="hgcal.xml" eval="true">
+  <Polycone name="HGCalService" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zHGCal0]"   rMin="[rMinHGCal1]" rMax="[rMaxHGCal0S]"/>
+    <ZSection z="[zHGCal3]"   rMin="[rMinHGCal1]" rMax="[rMaxHGCal3S]"/>
+    <ZSection z="[zHGCal3]"   rMin="[rMinHGCal3]" rMax="[rMaxHGCal3S]"/>
+    <ZSection z="[zHGCal4]"   rMin="[rMinHGCal3]" rMax="[rMaxHGCal4S]"/>
+    <ZSection z="[zHGCal7]"   rMin="[rMinHGCal3]" rMax="[rMaxHGCal7S]"/>
+    <ZSection z="[zHGCal7]"   rMin="[rMinHGCal5]" rMax="[rMaxHGCal7S]"/>
+    <ZSection z="[zHGCal8]"   rMin="[rMinHGCal5]" rMax="[rMaxHGCal8S]"/>
+    <ZSection z="[zHGCal8]"   rMin="[rMinHGCal7]" rMax="[rMaxHGCal8S]"/>
+    <ZSection z="[zHGCal12S]" rMin="[rMinHGCal7]" rMax="[rMaxHGCal12S]"/>
+    <ZSection z="[zHGCal13]"  rMin="[rMinHGCal7]" rMax="[rMaxHGCal12S]"/>
+  </Polycone>
+  <Polycone name="HGCal" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zHGCal1]"   rMin="[rMinHGCal1]"   rMax="[rMaxHGCal1]"/>
+    <ZSection z="[zHGCal3]"   rMin="[rMinHGCal1]"   rMax="[rMaxHGCal3]"/>
+    <ZSection z="[zHGCal3]"   rMin="[rMinHGCal3]"   rMax="[rMaxHGCal3]"/>
+    <ZSection z="[zHGCal5]"   rMin="[rMinHGCal3]"   rMax="[rMaxHGCal5]"/>
+    <ZSection z="[zHGCal7]"   rMin="[rMinHGCal3]"   rMax="[rMaxHGCal7]"/>
+    <ZSection z="[zHGCal7]"   rMin="[rMinHGCal5]"   rMax="[rMaxHGCal7]"/>
+    <ZSection z="[zHGCal8]"   rMin="[rMinHGCal5]"   rMax="[rMaxHGCal8]"/>
+    <ZSection z="[zHGCal8]"   rMin="[rMinHGCal7]"   rMax="[rMaxHGCal8]"/>
+    <ZSection z="[zHGCal10]"  rMin="[rMinHGCal7]"   rMax="[rMaxHGCal10]"/>
+    <ZSection z="[zHGCal11]"  rMin="[rMinHGCal7]"   rMax="[rMaxHGCal10]"/>
+    <ZSection z="[zHGCal11]"  rMin="[rMinHGCal7]"   rMax="[rMaxHGCal11]"/>
+    <ZSection z="[zHGCal13]"  rMin="[rMinHGCal7]"   rMax="[rMaxHGCal11]"/>
+  </Polycone>
+  <Polycone name="HGCalEE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zHGCalEE1]" rMin="[rMinHGCalEE1]"  rMax="[rMaxHGCalEE1]"/>
+    <ZSection z="[zHGCalEE2]" rMin="[rMinHGCalEE1]"  rMax="[rMaxHGCalEE2]"/>
+  </Polycone>
+  <Polycone name="HGCalEEsup" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zHGCalEE1]" rMin="[rMinHGCal1]"  rMax="[rMinHGCalEE1]"/>
+    <ZSection z="[zHGCalEE2]" rMin="[rMinHGCal1]"  rMax="[rMinHGCalEE1]"/>
+  </Polycone>
+  <Polycone name="HGCalHEsil" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zHGCalHEsil1]" rMin="[rMinHGCalHEsil1]" rMax="[rMaxHGCalHEsil1]"/>
+    <ZSection z="[zHGCalHEsil2]" rMin="[rMinHGCalHEsil1]" rMax="[rMaxHGCalHEsil2]"/>
+    <ZSection z="[zHGCalHEsil3]" rMin="[rMinHGCalHEsil1]" rMax="[rMaxHGCalHEsil3]"/>
+  </Polycone>
+  <Polycone name="HGCalHEmix" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zHGCalHEmix1]" rMin="[rMinHGCalHEsil1]" rMax="[rMaxHGCalHEmix1]"/>
+    <ZSection z="[zHGCalHEmix2]" rMin="[rMinHGCalHEsil1]" rMax="[rMaxHGCalHEmix2]"/>
+    <ZSection z="[zHGCalHEmix2]" rMin="[rMinHGCalHEmix1]" rMax="[rMaxHGCalHEmix2]"/>
+    <ZSection z="[zHGCalHEmix3]" rMin="[rMinHGCalHEmix1]" rMax="[rMaxHGCalHEmix3]"/>
+    <ZSection z="[zHGCalHEmix3]" rMin="[rMinHGCalHEmix2]" rMax="[rMaxHGCalHEmix3]"/>
+    <ZSection z="[zHGCalHEmix4]" rMin="[rMinHGCalHEmix2]" rMax="[rMaxHGCalHEmix4]"/>
+    <ZSection z="[zHGCalHEmix5]" rMin="[rMinHGCalHEmix2]" rMax="[rMaxHGCalHEmix4]"/>
+    <ZSection z="[zHGCalHEmix5]" rMin="[rMinHGCalHEmix2]" rMax="[rMaxHGCalHEmix5]"/>
+    <ZSection z="[zHGCalHEmix6]" rMin="[rMinHGCalHEmix2]" rMax="[rMaxHGCalHEmix5]"/>
+  </Polycone>
+  <Polycone name="HGCalHEsup1" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zHGCal2]"   rMin="[rMinHGCal1]" rMax="[rMinHGCalHEsil1]"/>
+    <ZSection z="[zHGCal3]"   rMin="[rMinHGCal1]" rMax="[rMinHGCalHEsil1]"/>
+    <ZSection z="[zHGCal3]"   rMin="[rMinHGCal3]" rMax="[rMinHGCalHEsil1]"/>
+    <ZSection z="[zHGCal7]"   rMin="[rMinHGCal3]" rMax="[rMinHGCalHEsil1]"/>
+  </Polycone>
+  <Polycone name="HGCalHEsup2" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zHGCal7]"   rMin="[rMinHGCal5]" rMax="[rMinHGCalHEmix1]"/>
+    <ZSection z="[zHGCal8]"   rMin="[rMinHGCal5]" rMax="[rMinHGCalHEmix1]"/>
+  </Polycone>
+  <Polycone name="HGCalHEsup3" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zHGCal8]"   rMin="[rMinHGCal7]" rMax="[rMinHGCalHEmix2]"/>
+    <ZSection z="[zHGCal12]"  rMin="[rMinHGCal7]" rMax="[rMinHGCalHEmix2]"/>
+  </Polycone>
+  <Polycone name="HGCalBackPlate" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zHGCal12]"  rMin="[rMinHGCal7]" rMax="[rMaxHGCal12]"/>
+    <ZSection z="[zHGCal13]"  rMin="[rMinHGCal7]" rMax="[rMaxHGCal12]"/>
+  </Polycone>
+</SolidSection>
+
+<LogicalPartSection label="hgcal.xml">
+  <LogicalPart name="HGCalService" category="unspecified">
+    <rSolid name="HGCalService"/>
+    <rMaterial name="caloBase:CEService"/>
+  </LogicalPart>
+  <LogicalPart name="HGCal" category="unspecified">
+    <rSolid name="HGCal"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEE" category="unspecified">
+    <rSolid name="HGCalEE"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEsil" category="unspecified">
+    <rSolid name="HGCalHEsil"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEmix" category="unspecified">
+    <rSolid name="HGCalHEmix"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEsup" category="unspecified">
+    <rSolid name="HGCalEEsup"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEsup1" category="unspecified">
+    <rSolid name="HGCalHEsup1"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEsup2" category="unspecified">
+    <rSolid name="HGCalHEsup2"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEsup3" category="unspecified">
+    <rSolid name="HGCalHEsup3"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBackPlate" category="unspecified">
+    <rSolid name="HGCalBackPlate"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcal.xml">
+  <PosPart copyNumber="1">
+    <rParent name="caloBase:CALOECRear"/>
+    <rChild name="hgcal:HGCalService"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalEE"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCalService"/>
+    <rChild name="hgcal:HGCal"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalHEsil"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalHEmix"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalEEsup"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalHEsup1"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalHEsup2"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalHEsup3"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalBackPlate"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/hgcalwafer/v19ng/hgcalwafer.xml b/Geometry/HGCalCommonData/data/hgcalwafer/v19ng/hgcalwafer.xml
new file mode 100644
index 0000000000000..a04abb9ce0a71
--- /dev/null
+++ b/Geometry/HGCalCommonData/data/hgcalwafer/v19ng/hgcalwafer.xml
@@ -0,0 +1,1131 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+<ConstantsSection label="hgcalwafer.xml" eval="true">
+  <Constant name="ModuleThicknessEE"     value="[hgcal:ModuleThicknessEE]"/>
+  <Constant name="ModuleThicknessHE"     value="[hgcal:ModuleThicknessHE]"/>
+  <Constant name="WaferSize"             value="[hgcal:WaferSize]"/>
+  <Constant name="WaferThickness"        value="[hgcal:WaferThickness]"/>
+  <Constant name="WaferThickness120"     value="[hgcal:WaferThicknessFine]"/>
+  <Constant name="WaferThickness200"     value="[hgcal:WaferThicknessCoarse1]"/>
+  <Constant name="WaferThickness300"     value="[hgcal:WaferThicknessCoarse2]"/>
+  <Constant name="SensorSeparation"      value="[hgcal:SensorSeparation]"/>
+  <Constant name="SensorSizeOffset"      value="[hgcal:SensorSizeOffset]"/>
+  <Constant name="CellThickness120"      value="[hgcal:CellThicknessFine]"/>
+  <Constant name="CellThickness200"      value="[hgcal:CellThicknessCoarse1]"/>
+  <Constant name="CellThickness300"      value="[hgcal:CellThicknessCoarse2]"/>
+  <Constant name="NumberOfCellsHD"       value="[hgcal:NumberOfCellsFine]"/>
+  <Constant name="NumberOfCellsLD"       value="[hgcal:NumberOfCellsCoarse]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalwafer.xml" eval="true">
+  <Algorithm name="hgcal:DDHGCalWaferFullRotated">
+    <rParent name="hgcalwafer:HGCalEEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessEE]"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness120]"/>
+    <String name="WaferTag" value="HD120"/>
+    <Vector name="WaferOrient" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5 </Vector>
+    <Vector name="WaferFace" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 0, 0 </Vector>
+    <Vector name="WaferPlacementIndex" type="string" nEntries="6"> 
+      06, 07, 08, 09, 10, 11 </Vector>  
+    <Vector name="LayerNames" type="string" nEntries="6">
+      HGCalEEServices, HGCalEEMotherBoard, HGCalEEEpoxy,
+      HGCalEEKapton, HGCalEESensitive, HGCalEEBasePlate</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="6">
+      hgcalMaterial:HGC_EEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="6">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness120], 1.40*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 1, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="6"> 
+      0, 1, 2, 4, 3, 5</Vector>
+    <Numeric name="NCells"           value="0"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferFullRotated">
+    <rParent name="hgcalwafer:HGCalEEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessEE]"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness120]"/>
+    <String name="WaferTag" value="HD120"/>
+    <Vector name="WaferOrient" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5 </Vector>
+    <Vector name="WaferFace" type="numeric" nEntries="6"> 
+      1, 1, 1, 1, 1, 1 </Vector>
+    <Vector name="WaferPlacementIndex" type="string" nEntries="6"> 
+      00, 01, 02, 03, 04, 05 </Vector>  
+    <Vector name="LayerNames" type="string" nEntries="6">
+      HGCalEEServices, HGCalEEMotherBoard, HGCalEEEpoxy,
+      HGCalEEKapton, HGCalEESensitive, HGCalEEBasePlate</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="6">
+      hgcalMaterial:HGC_EEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="6">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness120], 1.40*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 1, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="6"> 
+      5, 3, 4, 2, 1, 0</Vector>
+    <Numeric name="NCells"           value="0"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferFullRotated">
+    <rParent name="hgcalwafer:HGCalEEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessEE]"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness200]"/>
+    <String name="WaferTag" value="HD200"/>
+    <Vector name="WaferOrient" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5 </Vector>
+    <Vector name="WaferFace" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 0, 0 </Vector>
+    <Vector name="WaferPlacementIndex" type="string" nEntries="6"> 
+      06, 07, 08, 09, 10, 11 </Vector>  
+    <Vector name="LayerNames" type="string" nEntries="7">
+      HGCalEEServices, HGCalEEMotherBoard, HGCalEEEpoxy,
+      HGCalEEKapton, HGCalEESensitive, HGCalEEBasePlate,
+      HGCalEEAirGap0</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="7">
+      hgcalMaterial:HGC_EEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:WCu,
+      materials:Air</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="7">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness200], 1.40*mm,
+      0.100</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="7">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm, 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
+      0, 0, 0, 0, 1, 0, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="7"> 
+      0, 6, 1, 2, 4, 3, 5</Vector>
+    <Numeric name="NCells"           value="0"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferFullRotated">
+    <rParent name="hgcalwafer:HGCalEEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessEE]"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness200]"/>
+    <String name="WaferTag" value="HD200"/>
+    <Vector name="WaferOrient" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5 </Vector>
+    <Vector name="WaferFace" type="numeric" nEntries="6"> 
+      1, 1, 1, 1, 1, 1 </Vector>
+    <Vector name="WaferPlacementIndex" type="string" nEntries="6"> 
+      00, 01, 02, 03, 04, 05 </Vector>  
+    <Vector name="LayerNames" type="string" nEntries="7">
+      HGCalEEServices, HGCalEEMotherBoard, HGCalEEEpoxy,
+      HGCalEEKapton, HGCalEESensitive, HGCalEEBasePlate,
+      HGCalEEAirGap0</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="7">
+      hgcalMaterial:HGC_EEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:WCu,
+      materials:Air</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="7">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness200], 1.40*mm,
+      0.100</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="7">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm, 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
+      0, 0, 0, 0, 1, 0, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="7"> 
+      5, 3, 4, 2, 1, 6, 0</Vector>
+    <Numeric name="NCells"           value="0"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferFullRotated">
+    <rParent name="hgcalwafer:HGCalEEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessEE]"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness200]"/>
+    <String name="WaferTag" value="LD200"/>
+    <Vector name="WaferOrient" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5 </Vector>
+    <Vector name="WaferFace" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 0, 0 </Vector>
+    <Vector name="WaferPlacementIndex" type="string" nEntries="6"> 
+      06, 07, 08, 09, 10, 11 </Vector>  
+    <Vector name="LayerNames" type="string" nEntries="7">
+      HGCalEEServices, HGCalEEMotherBoard, HGCalEEEpoxy,
+      HGCalEEKapton, HGCalEESensitive, HGCalEEBasePlate,
+      HGCalEEAirGap0</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="7">
+      hgcalMaterial:HGC_EEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:WCu,
+      materials:Air</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="7">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness200], 1.40*mm,
+      0.100</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="7">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm, 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
+      0, 0, 0, 0, 1, 0, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="7"> 
+      0, 6, 1, 2, 4, 3, 5</Vector>
+    <Numeric name="NCells"           value="0"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferFullRotated">
+    <rParent name="hgcalwafer:HGCalEEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessEE]"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness200]"/>
+    <String name="WaferTag" value="LD200"/>
+    <Vector name="WaferOrient" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5 </Vector>
+    <Vector name="WaferFace" type="numeric" nEntries="6"> 
+      1, 1, 1, 1, 1, 1 </Vector>
+    <Vector name="WaferPlacementIndex" type="string" nEntries="6"> 
+      00, 01, 02, 03, 04, 05 </Vector>  
+    <Vector name="LayerNames" type="string" nEntries="7">
+      HGCalEEServices, HGCalEEMotherBoard, HGCalEEEpoxy,
+      HGCalEEKapton, HGCalEESensitive, HGCalEEBasePlate,
+      HGCalEEAirGap0</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="7">
+      hgcalMaterial:HGC_EEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:WCu,
+      materials:Air</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="7">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness200], 1.40*mm,
+      0.100</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="7">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm, 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
+      0, 0, 0, 0, 1, 0, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="7"> 
+      5, 3, 4, 2, 1, 6, 0</Vector>
+    <Numeric name="NCells"           value="0"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferFullRotated">
+    <rParent name="hgcalwafer:HGCalEEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessEE]"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness300]"/>
+    <String name="WaferTag" value="LD300"/>
+    <Vector name="WaferOrient" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5 </Vector>
+    <Vector name="WaferFace" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 0, 0 </Vector>
+    <Vector name="WaferPlacementIndex" type="string" nEntries="6"> 
+      06, 07, 08, 09, 10, 11</Vector>  
+    <Vector name="LayerNames" type="string" nEntries="6">
+      HGCalEEServices, HGCalEEMotherBoard, HGCalEEEpoxy,
+      HGCalEEKapton, HGCalEESensitive, HGCalEEBasePlate</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="6">
+      hgcalMaterial:HGC_EEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="6">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness300], 1.40*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 1, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="6"> 
+      0, 1, 2, 4, 3, 5</Vector>
+    <Numeric name="NCells"           value="0"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferFullRotated">
+    <rParent name="hgcalwafer:HGCalEEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessEE]"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness300]"/>
+    <String name="WaferTag" value="LD300"/>
+    <Vector name="WaferOrient" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5 </Vector>
+    <Vector name="WaferFace" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 0, 0 </Vector>
+    <Vector name="WaferPlacementIndex" type="string" nEntries="6"> 
+      00, 01, 02, 03, 04, 05</Vector>  
+    <Vector name="LayerNames" type="string" nEntries="6">
+      HGCalEEServices, HGCalEEMotherBoard, HGCalEEEpoxy,
+      HGCalEEKapton, HGCalEESensitive, HGCalEEBasePlate</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="6">
+      hgcalMaterial:HGC_EEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="6">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness300], 1.40*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 1, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="6"> 
+      5, 3, 4, 2, 1, 0</Vector>
+    <Numeric name="NCells"           value="0"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferFullRotated">
+    <rParent name="hgcalwafer:HGCalHEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessHE]"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness120]"/>
+    <String name="WaferTag" value="HD120"/>
+    <Vector name="WaferOrient" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5 </Vector>
+    <Vector name="WaferFace" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 0, 0 </Vector>
+    <Vector name="WaferPlacementIndex" type="string" nEntries="6"> 
+      06, 07, 08, 09, 10, 11 </Vector>  
+    <Vector name="LayerNames" type="string" nEntries="6">
+      HGCalHEServices, HGCalHEMotherBoard, HGCalHEEpoxy, HGCalHEKapton,
+      HGCalHESiliconSensitive, HGCalHEBasePlate</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="6">
+      hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="6">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness120], 1.050*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="6"> 
+      0, 1, 2, 4, 3, 5</Vector>
+    <Numeric name="NCells"           value="0"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferFullRotated">
+    <rParent name="hgcalwafer:HGCalHEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessHE]"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness120]"/>
+    <String name="WaferTag" value="HD120"/>
+    <Vector name="WaferOrient" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5 </Vector>
+    <Vector name="WaferFace" type="numeric" nEntries="6"> 
+      1, 1, 1, 1, 1, 1 </Vector>
+    <Vector name="WaferPlacementIndex" type="string" nEntries="6"> 
+      00, 01, 02, 03, 04, 05 </Vector>  
+    <Vector name="LayerNames" type="string" nEntries="6">
+      HGCalHEServices, HGCalHEMotherBoard, HGCalHEEpoxy, HGCalHEKapton,
+      HGCalHESiliconSensitive, HGCalHEBasePlate</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="6">
+      hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="6">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness120], 1.050*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="6"> 
+      5, 3, 4, 2, 1, 0</Vector>
+    <Numeric name="NCells"           value="0"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferFullRotated">
+    <rParent name="hgcalwafer:HGCalHEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessHE]"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness200]"/>
+    <String name="WaferTag" value="HD200"/>
+    <Vector name="WaferOrient" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5 </Vector>
+    <Vector name="WaferFace" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 0, 0 </Vector>
+    <Vector name="WaferPlacementIndex" type="string" nEntries="6"> 
+      06, 07, 08, 09, 10, 11 </Vector>
+    <Vector name="LayerNames" type="string" nEntries="7">
+      HGCalHEServices, HGCalHEMotherBoard, HGCalHEEpoxy, HGCalHEKapton,
+      HGCalHESiliconSensitive, HGCalHEBasePlate, HGCalHEAirGap0</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="7">
+      hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium,
+      materials:Air</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="7">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness200], 1.050*mm,
+      0.100*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="7">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm, 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
+      0, 0, 0, 0, 1, 0, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="7"> 
+      0, 6, 1, 2, 4, 3, 5</Vector>
+    <Numeric name="NCells"           value="0"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferFullRotated">
+    <rParent name="hgcalwafer:HGCalHEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessHE]"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness200]"/>
+    <String name="WaferTag" value="HD200"/>
+    <Vector name="WaferOrient" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5 </Vector>
+    <Vector name="WaferFace" type="numeric" nEntries="6"> 
+      1, 1, 1, 1, 1, 1 </Vector>
+    <Vector name="WaferPlacementIndex" type="string" nEntries="6"> 
+      00, 01, 02, 03, 04, 05 </Vector>  
+    <Vector name="LayerNames" type="string" nEntries="7">
+      HGCalHEServices, HGCalHEMotherBoard, HGCalHEEpoxy, HGCalHEKapton,
+      HGCalHESiliconSensitive, HGCalHEBasePlate, HGCalHEAirGap0</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="7">
+      hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium,
+      materials:Air</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="7">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness200], 1.050*mm,
+      0.100*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="7">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm, 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
+      0, 0, 0, 0, 1, 0, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="7"> 
+      5, 3, 4, 2, 1, 6, 0</Vector>
+    <Numeric name="NCells"           value="0"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferFullRotated">
+    <rParent name="hgcalwafer:HGCalHEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessHE]"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness200]"/>
+    <String name="WaferTag" value="LD200"/>
+    <Vector name="WaferOrient" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5 </Vector>
+    <Vector name="WaferFace" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 0, 0 </Vector>
+    <Vector name="WaferPlacementIndex" type="string" nEntries="6"> 
+      06, 07, 08, 09, 10, 11 </Vector>  
+    <Vector name="LayerNames" type="string" nEntries="7">
+      HGCalHEServices, HGCalHEMotherBoard, HGCalHEEpoxy, HGCalHEKapton,
+      HGCalHESiliconSensitive, HGCalHEBasePlate, HGCalHEAirGap0</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="7">
+      hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium,
+      materials:Air</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="7">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness200], 1.050*mm,
+      0.100*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="7">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm, 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
+      0, 0, 0, 0, 1, 0, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="7"> 
+      0, 6, 1, 2, 4, 3, 5</Vector>
+    <Numeric name="NCells"           value="0"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferFullRotated">
+    <rParent name="hgcalwafer:HGCalHEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessHE]"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness200]"/>
+    <String name="WaferTag" value="LD200"/>
+    <Vector name="WaferOrient" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5 </Vector>
+    <Vector name="WaferFace" type="numeric" nEntries="6"> 
+      1, 1, 1, 1, 1, 1 </Vector>
+    <Vector name="WaferPlacementIndex" type="string" nEntries="6"> 
+      00, 01, 02, 03, 04, 05 </Vector>  
+    <Vector name="LayerNames" type="string" nEntries="7">
+      HGCalHEServices, HGCalHEMotherBoard, HGCalHEEpoxy, HGCalHEKapton,
+      HGCalHESiliconSensitive, HGCalHEBasePlate, HGCalHEAirGap0</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="7">
+      hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium,
+      materials:Air</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="7">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness200], 1.050*mm,
+      0.100*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="7">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm, 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
+      0, 0, 0, 0, 1, 0, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="7"> 
+      5, 3, 4, 2, 1, 6, 0</Vector>
+    <Numeric name="NCells"           value="0"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferFullRotated">
+    <rParent name="hgcalwafer:HGCalHEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessHE]"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness300]"/>
+    <String name="WaferTag" value="LD300"/>
+    <Vector name="WaferOrient" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5 </Vector>
+    <Vector name="WaferFace" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 0, 0 </Vector>
+    <Vector name="WaferPlacementIndex" type="string" nEntries="6"> 
+      06, 07, 08, 09, 10, 11 </Vector>
+    <Vector name="LayerNames" type="string" nEntries="6">
+      HGCalHEServices, HGCalHEMotherBoard, HGCalHEEpoxy, HGCalHEKapton,
+      HGCalHESiliconSensitive, HGCalHEBasePlate</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="6">
+      hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="6">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness300], 1.050*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 1, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="6"> 
+      0, 1, 2, 4, 3, 5</Vector>
+    <Numeric name="NCells"           value="0"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferFullRotated">
+    <rParent name="hgcalwafer:HGCalHEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessHE]"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness300]"/>
+    <String name="WaferTag" value="LD300"/>
+    <Vector name="WaferOrient" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5 </Vector>
+    <Vector name="WaferFace" type="numeric" nEntries="6"> 
+      1, 1, 1, 1, 1, 1 </Vector>
+    <Vector name="WaferPlacementIndex" type="string" nEntries="6"> 
+      00, 01, 02, 03, 04, 05 </Vector>  
+    <Vector name="LayerNames" type="string" nEntries="6">
+      HGCalHEServices, HGCalHEMotherBoard, HGCalHEEpoxy, HGCalHEKapton,
+      HGCalHESiliconSensitive, HGCalHEBasePlate</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="6">
+      hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="6">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness300], 1.050*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 1, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="6"> 
+      5, 3, 4, 2, 1, 0</Vector>
+    <Numeric name="NCells"           value="0"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferPartialRotated">
+    <rParent name="hgcalwafer:HGCalEEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessEE]"/>
+    <Numeric name="WaferMode"        value="0"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness120]"/>
+    <String name="WaferTag" value="HD120"/>
+    <Vector name="Tags" type="string" nEntries="5">
+      HD1, HD2, HD3, HD4, HD5</Vector>
+    <Vector name="PartialTypes" type="numeric" nEntries="5">
+      21, 22, 23, 24, 25</Vector>
+    <Vector name="PlacementIndex" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5</Vector>
+    <Vector name="PlacementIndexTags" type="string" nEntries="6">
+      00, 01, 02, 03, 04, 05</Vector>
+    <Vector name="LayerNames" type="string" nEntries="6">
+      HGCalEEServices, HGCalEEMotherBoard, HGCalEEEpoxy,
+      HGCalEEKapton, HGCalEESensitive, HGCalEEBasePlate</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="6">
+      hgcalMaterial:HGC_EEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="6">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness120], 1.40*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 1, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="6"> 
+      5, 3, 4, 2, 1, 0</Vector>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
+    <Numeric name="SenseType"    value="0"/>
+    <Numeric name="SenseThick"   value="[CellThickness120]"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferPartialRotated">
+    <rParent name="hgcalwafer:HGCalEEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessEE]"/>
+    <Numeric name="WaferMode"        value="0"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness120]"/>
+    <String name="WaferTag" value="HD120"/>
+    <Vector name="Tags" type="string" nEntries="5">
+      HD1, HD2, HD3, HD4, HD5</Vector>
+    <Vector name="PartialTypes" type="numeric" nEntries="5">
+      21, 22, 23, 24, 25</Vector>
+    <Vector name="PlacementIndex" type="numeric" nEntries="6">
+      6, 7, 8, 9, 10, 11</Vector>
+    <Vector name="PlacementIndexTags" type="string" nEntries="6">
+      06, 07, 08, 09, 10, 11</Vector>
+    <Vector name="LayerNames" type="string" nEntries="6">
+      HGCalEEServices, HGCalEEMotherBoard, HGCalEEEpoxy,
+      HGCalEEKapton, HGCalEESensitive, HGCalEEBasePlate</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="6">
+      hgcalMaterial:HGC_EEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="6">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness120], 1.40*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="6"> 
+      0, 0, 0, 0, 1, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="6"> 
+      0, 1, 2, 4, 3, 5</Vector>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
+    <Numeric name="SenseType"    value="0"/>
+    <Numeric name="SenseThick"   value="[CellThickness120]"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferPartialRotated">
+    <rParent name="hgcalwafer:HGCalEEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessEE]"/>
+    <Numeric name="WaferMode"        value="0"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness200]"/>
+    <String name="WaferTag" value="HD200"/>
+    <Vector name="Tags" type="string" nEntries="5">
+      HD1, HD2, HD3, HD4, HD5</Vector>
+    <Vector name="PartialTypes" type="numeric" nEntries="5">
+      21, 22, 23, 24, 25</Vector>
+    <Vector name="PlacementIndex" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5</Vector>
+    <Vector name="PlacementIndexTags" type="string" nEntries="6">
+      00, 01, 02, 03, 04, 05</Vector>
+    <Vector name="LayerNames" type="string" nEntries="7">
+      HGCalEEServices, HGCalEEMotherBoard, HGCalEEEpoxy,
+      HGCalEEKapton, HGCalEESensitive, HGCalEEBasePlate, HGCalEEAirGap0</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="7">
+      hgcalMaterial:HGC_EEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:WCu,
+      materials:Air</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="7">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness200], 1.40*mm,
+      0.100*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="7">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm, 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="7">
+      0, 0, 0, 0, 1, 0, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="7">
+      5, 3, 4, 2, 1, 6, 0</Vector>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
+    <Numeric name="SenseType"    value="0"/>
+    <Numeric name="SenseThick"   value="[CellThickness200]"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferPartialRotated">
+    <rParent name="hgcalwafer:HGCalEEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessEE]"/>
+    <Numeric name="WaferMode"        value="0"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness200]"/>
+    <String name="WaferTag" value="HD200"/>
+    <Vector name="Tags" type="string" nEntries="5">
+      HD1, HD2, HD3, HD4, HD5</Vector>
+    <Vector name="PartialTypes" type="numeric" nEntries="5">
+      21, 22, 23, 24, 25</Vector>
+    <Vector name="PlacementIndex" type="numeric" nEntries="6">
+      6, 7, 8, 9, 10, 11</Vector>
+    <Vector name="PlacementIndexTags" type="string" nEntries="6">
+      06, 07, 08, 09, 10, 11</Vector>
+    <Vector name="LayerNames" type="string" nEntries="7">
+      HGCalEEServices, HGCalEEMotherBoard, HGCalEEEpoxy,
+      HGCalEEKapton, HGCalEESensitive, HGCalEEBasePlate, HGCalEEAirGap0</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="7">
+      hgcalMaterial:HGC_EEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:WCu,
+      materials:Air</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="7">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness200], 1.40*mm,
+      0.100*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="7">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm, 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="7">
+      0, 0, 0, 0, 1, 0, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="7"> 
+      0, 6, 1, 2, 4, 3, 5</Vector>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
+    <Numeric name="SenseType"    value="0"/>
+    <Numeric name="SenseThick"   value="[CellThickness200]"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferPartialRotated">
+    <rParent name="hgcalwafer:HGCalEEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessEE]"/>
+    <Numeric name="WaferMode"        value="0"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness200]"/>
+    <String name="WaferTag" value="LD200"/>
+    <Vector name="Tags" type="string" nEntries="6">
+      LD1, LD2, LD3, LD4, LD5, LD6</Vector>
+    <Vector name="PartialTypes" type="numeric" nEntries="6">
+      11, 12, 13, 14, 15, 16</Vector>
+    <Vector name="PlacementIndex" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5</Vector>
+    <Vector name="PlacementIndexTags" type="string" nEntries="6">
+      00, 01, 02, 03, 04, 05</Vector>
+    <Vector name="LayerNames" type="string" nEntries="7">
+      HGCalEEServices, HGCalEEMotherBoard, HGCalEEEpoxy,
+      HGCalEEKapton, HGCalEESensitive, HGCalEEBasePlate, HGCalEEAirGap0</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="7">
+      hgcalMaterial:HGC_EEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:WCu,
+      materials:Air</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="7">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness200], 1.40*mm,
+      0.100*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="7">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm, 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="7">
+      0, 0, 0, 0, 1, 0, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="7"> 
+      5, 3, 4, 2, 1, 6, 0</Vector>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
+    <Numeric name="SenseType"    value="1"/>
+    <Numeric name="SenseThick"   value="[CellThickness200]"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferPartialRotated">
+    <rParent name="hgcalwafer:HGCalEEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessEE]"/>
+    <Numeric name="WaferMode"        value="0"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness200]"/>
+    <String name="WaferTag" value="LD200"/>
+    <Vector name="Tags" type="string" nEntries="6">
+      LD1, LD2, LD3, LD4, LD5, LD6</Vector>
+    <Vector name="PartialTypes" type="numeric" nEntries="6">
+      11, 12, 13, 14, 15, 16</Vector>
+    <Vector name="PlacementIndex" type="numeric" nEntries="6">
+      6, 7, 8, 9, 10, 11</Vector>
+    <Vector name="PlacementIndexTags" type="string" nEntries="6">
+      06, 07, 08, 09, 10, 11</Vector>
+    <Vector name="LayerNames" type="string" nEntries="7">
+      HGCalEEServices, HGCalEEMotherBoard, HGCalEEEpoxy,
+      HGCalEEKapton, HGCalEESensitive, HGCalEEBasePlate, HGCalEEAirGap0</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="7">
+      hgcalMaterial:HGC_EEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:WCu,
+      materials:Air</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="7">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness200], 1.40*mm,
+      0.100*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="7">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm, 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="7">
+      0, 0, 0, 0, 1, 0, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="7"> 
+      0, 6, 1, 2, 4, 3, 5</Vector>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
+    <Numeric name="SenseType"    value="1"/>
+    <Numeric name="SenseThick"   value="[CellThickness200]"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferPartialRotated">
+    <rParent name="hgcalwafer:HGCalEEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessEE]"/>
+    <Numeric name="WaferMode"        value="0"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness300]"/>
+    <String name="WaferTag" value="LD300"/>
+    <Vector name="Tags" type="string" nEntries="6">
+      LD1, LD2, LD3, LD4, LD5, LD6</Vector>
+    <Vector name="PartialTypes" type="numeric" nEntries="6">
+      11, 12, 13, 14, 15, 16</Vector>
+    <Vector name="PlacementIndex" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5</Vector>
+    <Vector name="PlacementIndexTags" type="string" nEntries="6">
+      00, 01, 02, 03, 04, 05</Vector>
+    <Vector name="LayerNames" type="string" nEntries="6">
+      HGCalEEServices, HGCalEEMotherBoard, HGCalEEEpoxy,
+      HGCalEEKapton, HGCalEESensitive, HGCalEEBasePlate</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="6">
+      hgcalMaterial:HGC_EEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="6">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness300], 1.40*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="6">
+      0, 0, 0, 0, 1, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="6"> 
+      5, 3, 4, 2, 1, 0</Vector>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
+    <Numeric name="SenseType"    value="2"/>
+    <Numeric name="SenseThick"   value="[CellThickness300]"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferPartialRotated">
+    <rParent name="hgcalwafer:HGCalEEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessEE]"/>
+    <Numeric name="WaferMode"        value="0"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness300]"/>
+    <String name="WaferTag" value="LD300"/>
+    <Vector name="Tags" type="string" nEntries="6">
+      LD1, LD2, LD3, LD4, LD5, LD6</Vector>
+    <Vector name="PartialTypes" type="numeric" nEntries="6">
+      11, 12, 13, 14, 15, 16</Vector>
+    <Vector name="PlacementIndex" type="numeric" nEntries="6">
+      6, 7, 8, 9, 10, 11</Vector>
+    <Vector name="PlacementIndexTags" type="string" nEntries="6">
+      06, 07, 08, 09, 10, 11</Vector>
+    <Vector name="LayerNames" type="string" nEntries="6">
+      HGCalEEServices, HGCalEEMotherBoard, HGCalEEEpoxy,
+      HGCalEEKapton, HGCalEESensitive, HGCalEEBasePlate</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="6">
+      hgcalMaterial:HGC_EEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="6">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness300], 1.40*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm,
+      [SensorSizeOffset], 0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="6">
+      0, 0, 0, 0, 1, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="6"> 
+      0, 1, 2, 4, 3, 5</Vector>
+    <String name="SenseName"     value="HGCalEECellSensitive"/>
+    <Numeric name="SenseType"    value="2"/>
+    <Numeric name="SenseThick"   value="[CellThickness300]"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferPartialRotated">
+    <rParent name="hgcalwafer:HGCalHEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessHE]"/>
+    <Numeric name="WaferMode"        value="0"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness120]"/>
+    <String name="WaferTag" value="HD120"/>
+    <Vector name="Tags" type="string" nEntries="5">
+      HD1, HD2, HD3, HD4, HD5</Vector>
+    <Vector name="PartialTypes" type="numeric" nEntries="5">
+      21, 22, 23, 24, 25</Vector>
+    <Vector name="PlacementIndex" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5</Vector>
+    <Vector name="PlacementIndexTags" type="string" nEntries="6">
+      00, 01, 02, 03, 04, 05</Vector>
+    <Vector name="LayerNames" type="string" nEntries="6">
+      HGCalHEServices, HGCalHEMotherBoard, HGCalHEEpoxy, HGCalHEKapton,
+      HGCalHESiliconSensitive, HGCalHEBasePlate</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="6">
+      hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="6">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness120], 1.05*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm, [SensorSizeOffset],
+      0.00*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="6">
+      0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="6">
+      5, 3, 4, 2, 1, 0 </Vector>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
+    <Numeric name="SenseType"    value="-1"/>
+    <Numeric name="SenseThick"   value="[CellThickness120]"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferPartialRotated">
+    <rParent name="hgcalwafer:HGCalHEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessHE]"/>
+    <Numeric name="WaferMode"        value="0"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness120]"/>
+    <String name="WaferTag" value="HD120"/>
+    <Vector name="Tags" type="string" nEntries="5">
+      HD1, HD2, HD3, HD4, HD5</Vector>
+    <Vector name="PartialTypes" type="numeric" nEntries="5">
+      21, 22, 23, 24, 25</Vector>
+    <Vector name="PlacementIndex" type="numeric" nEntries="6">
+      6, 7, 8, 9, 10, 11 </Vector>
+    <Vector name="PlacementIndexTags" type="string" nEntries="6"> 
+      06, 07, 08, 09, 10, 11 </Vector>
+    <Vector name="LayerNames" type="string" nEntries="6">
+      HGCalHEServices, HGCalHEMotherBoard, HGCalHEEpoxy, HGCalHEKapton,
+      HGCalHESiliconSensitive, HGCalHEBasePlate</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="6">
+      hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="6">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness120], 1.05*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm, [SensorSizeOffset],
+      0.00*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="6">
+      0, 0, 0, 0, 1, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="6">
+      0, 1, 2, 4, 3, 5</Vector>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
+    <Numeric name="SenseType"    value="-1"/>
+    <Numeric name="SenseThick"   value="[CellThickness120]"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferPartialRotated">
+    <rParent name="hgcalwafer:HGCalHEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessHE]"/>
+    <Numeric name="WaferMode"        value="0"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness200]"/>
+    <String name="WaferTag" value="HD200"/>
+    <Vector name="Tags" type="string" nEntries="5">
+      HD1, HD2, HD3, HD4, HD5</Vector>
+    <Vector name="PartialTypes" type="numeric" nEntries="5">
+      21, 22, 23, 24, 25</Vector>
+    <Vector name="PlacementIndex" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5</Vector>
+    <Vector name="PlacementIndexTags" type="string" nEntries="6">
+      00, 01, 02, 03, 04, 05</Vector>
+    <Vector name="LayerNames" type="string" nEntries="7">
+      HGCalHEServices, HGCalHEMotherBoard, HGCalHEEpoxy, HGCalHEKapton,
+      HGCalHESiliconSensitive, HGCalHEBasePlate, HGCalHEAirGap0</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="7">
+      hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium,
+      materials:Air</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="7">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness200], 1.05*mm,
+      0.100*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="7">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm, [SensorSizeOffset],
+      0.00*mm, 0.00*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="7">
+      0, 0, 0, 0, 1, 0, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="7">
+      5, 3, 4, 2, 1, 6, 0</Vector>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
+    <Numeric name="SenseType"    value="-1"/>
+    <Numeric name="SenseThick"   value="[CellThickness200]"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferPartialRotated">
+    <rParent name="hgcalwafer:HGCalHEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessHE]"/>
+    <Numeric name="WaferMode"        value="0"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness200]"/>
+    <String name="WaferTag" value="HD200"/>
+    <Vector name="Tags" type="string" nEntries="5">
+      HD1, HD2, HD3, HD4, HD5</Vector>
+    <Vector name="PartialTypes" type="numeric" nEntries="5">
+      21, 22, 23, 24, 25</Vector>
+    <Vector name="PlacementIndex" type="numeric" nEntries="6">
+      6, 7, 8, 9, 10, 11 </Vector>
+    <Vector name="PlacementIndexTags" type="string" nEntries="6"> 
+      06, 07, 08, 09, 10, 11 </Vector>  
+    <Vector name="LayerNames" type="string" nEntries="7">
+      HGCalHEServices, HGCalHEMotherBoard, HGCalHEEpoxy, HGCalHEKapton,
+      HGCalHESiliconSensitive, HGCalHEBasePlate, HGCalHEAirGap0</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="7">
+      hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium,
+      materials:Air</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="7">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness200], 1.05*mm,
+      0.100*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="7">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm, [SensorSizeOffset],
+      0.00*mm, 0.00*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="7">
+      0, 0, 0, 0, 1, 0, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="7">
+      0, 6, 1, 2, 4, 3, 5</Vector>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
+    <Numeric name="SenseType"    value="-1"/>
+    <Numeric name="SenseThick"   value="[CellThickness200]"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferPartialRotated">
+    <rParent name="hgcalwafer:HGCalHEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessHE]"/>
+    <Numeric name="WaferMode"        value="0"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness200]"/>
+    <String name="WaferTag" value="LD200"/>
+    <Vector name="Tags" type="string" nEntries="6">
+      LD1, LD2, LD3, LD4, LD5, LD6</Vector>
+    <Vector name="PartialTypes" type="numeric" nEntries="6">
+      11, 12, 13, 14, 15, 16</Vector>
+    <Vector name="PlacementIndex" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5</Vector>
+    <Vector name="PlacementIndexTags" type="string" nEntries="6">
+      00, 01, 02, 03, 04, 05</Vector>
+    <Vector name="LayerNames" type="string" nEntries="7">
+      HGCalHEServices, HGCalHEMotherBoard, HGCalHEEpoxy, HGCalHEKapton,
+      HGCalHESiliconSensitive, HGCalHEBasePlate, HGCalHEAirGap0</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="7">
+      hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium,
+      materials:Air</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="7">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness200], 1.05*mm,
+      0.100*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="7">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm, [SensorSizeOffset],
+      0.00*mm, 0.00*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="7">
+      0, 0, 0, 0, 1, 0, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="7">
+      5, 3, 4, 2, 1, 6, 0</Vector>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
+    <Numeric name="SenseType"    value="-1"/>
+    <Numeric name="SenseThick"   value="[CellThickness200]"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferPartialRotated">
+    <rParent name="hgcalwafer:HGCalHEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessHE]"/>
+    <Numeric name="WaferMode"        value="0"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness200]"/>
+    <String name="WaferTag" value="LD200"/>
+    <Vector name="Tags" type="string" nEntries="6">
+      LD1, LD2, LD3, LD4, LD5, LD6</Vector>
+    <Vector name="PartialTypes" type="numeric" nEntries="6">
+      11, 12, 13, 14, 15, 16</Vector>
+    <Vector name="PlacementIndex" type="numeric" nEntries="6">
+      6, 7, 8, 9, 10, 11 </Vector>
+    <Vector name="PlacementIndexTags" type="string" nEntries="6"> 
+      06, 07, 08, 09, 10, 11 </Vector>    
+    <Vector name="LayerNames" type="string" nEntries="7">
+      HGCalHEServices, HGCalHEMotherBoard, HGCalHEEpoxy, HGCalHEKapton,
+      HGCalHESiliconSensitive, HGCalHEBasePlate, HGCalHEAirGap0</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="7">
+      hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium,
+      materials:Air</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="7">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness200], 1.05*mm,
+      0.100*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="7">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm, [SensorSizeOffset],
+      0.00*mm, 0.00*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="7">
+      0, 0, 0, 0, 1, 0, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="7">
+      0, 6, 1, 2, 4, 3, 5</Vector>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
+    <Numeric name="SenseType"    value="-1"/>
+    <Numeric name="SenseThick"   value="[CellThickness200]"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferPartialRotated">
+    <rParent name="hgcalwafer:HGCalHEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessHE]"/>
+    <Numeric name="WaferMode"        value="0"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness300]"/>
+    <String name="WaferTag" value="LD300"/>
+    <Vector name="Tags" type="string" nEntries="6">
+      LD1, LD2, LD3, LD4, LD5, LD6</Vector>
+    <Vector name="PartialTypes" type="numeric" nEntries="6">
+      11, 12, 13, 14, 15, 16</Vector>
+    <Vector name="PlacementIndex" type="numeric" nEntries="6">
+      0, 1, 2, 3, 4, 5</Vector>
+    <Vector name="PlacementIndexTags" type="string" nEntries="6">
+      00, 01, 02, 03, 04, 05</Vector>
+    <Vector name="LayerNames" type="string" nEntries="6">
+      HGCalHEServices, HGCalHEMotherBoard, HGCalHEEpoxy, HGCalHEKapton,
+      HGCalHESiliconSensitive, HGCalHEBasePlate</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="6">
+      hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="6">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness300], 1.05*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm, [SensorSizeOffset],
+      0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="6">
+      0, 0, 0, 0, 1, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="6">
+      5, 3, 4, 2, 1, 0</Vector>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
+    <Numeric name="SenseType"    value="-1"/>
+    <Numeric name="SenseThick"   value="[CellThickness300]"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalWaferPartialRotated">
+    <rParent name="hgcalwafer:HGCalHEWafer"/>
+    <String name="ModuleMaterial"    value="materials:Air"/>
+    <Numeric name="ModuleThickness"  value="[ModuleThicknessHE]"/>
+    <Numeric name="WaferMode"        value="0"/>
+    <Numeric name="WaferSize"        value="[WaferSize]"/>
+    <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
+    <Numeric name="WaferThickness"   value="[WaferThickness300]"/>
+    <String name="WaferTag" value="LD300"/>
+    <Vector name="Tags" type="string" nEntries="6">
+      LD1, LD2, LD3, LD4, LD5, LD6</Vector>
+    <Vector name="PartialTypes" type="numeric" nEntries="6">
+      11, 12, 13, 14, 15, 16</Vector>
+    <Vector name="PlacementIndex" type="numeric" nEntries="6">
+      6, 7, 8, 9, 10, 11 </Vector>
+    <Vector name="PlacementIndexTags" type="string" nEntries="6"> 
+      06, 07, 08, 09, 10, 11 </Vector>   
+    <Vector name="LayerNames" type="string" nEntries="6">
+      HGCalHEServices, HGCalHEMotherBoard, HGCalHEEpoxy, HGCalHEKapton,
+      HGCalHESiliconSensitive, HGCalHEBasePlate</Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="6">
+      hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="6">
+      5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness300], 1.05*mm</Vector>
+    <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
+      0.00*mm, 0.00*mm, [SensorSizeOffset], 0.0*mm, [SensorSizeOffset],
+      0.00*mm</Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="6">
+      0, 0, 0, 0, 1, 0</Vector>
+    <Vector name="Layers" type="numeric" nEntries="6">
+      0, 1, 2, 4, 3, 5</Vector>
+    <String name="SenseName"     value="HGCalHESiliconCellSensitive"/>
+    <Numeric name="SenseType"    value="-1"/>
+    <Numeric name="SenseThick"   value="[CellThickness300]"/>
+  </Algorithm>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalCommonData/python/testHGCalV19nXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalV19nXML_cfi.py
index 50ba68a1b135c..8e3e0c89af42d 100644
--- a/Geometry/HGCalCommonData/python/testHGCalV19nXML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalV19nXML_cfi.py
@@ -57,7 +57,6 @@
         'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
         'Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v19/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalwafer/v19n/hgcalwafer.xml',
         'Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml',
         'Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalV19ngXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalV19ngXML_cfi.py
new file mode 100644
index 0000000000000..c567ae802e7a9
--- /dev/null
+++ b/Geometry/HGCalCommonData/python/testHGCalV19ngXML_cfi.py
@@ -0,0 +1,125 @@
+import FWCore.ParameterSet.Config as cms
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring(
+        'Geometry/CMSCommonData/data/materials/2021/v1/materials.xml',
+        'Geometry/CMSCommonData/data/rotations.xml',
+        'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
+        'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
+        'Geometry/CMSCommonData/data/cms/2030/v5/cms.xml',
+        'Geometry/CMSCommonData/data/cmsMother.xml',
+        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
+        'Geometry/CMSCommonData/data/cmsTracker.xml',
+        'Geometry/CMSCommonData/data/caloBase/2030/v8/caloBase.xml',
+        'Geometry/CMSCommonData/data/cmsCalo.xml',
+        'Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml',
+        'Geometry/CMSCommonData/data/cmsMuon.xml',
+        'Geometry/CMSCommonData/data/mgnt.xml',
+        'Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/muonMB.xml',
+        'Geometry/CMSCommonData/data/muonMagnet.xml',
+        'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
+        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
+        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml',
+        'Geometry/TrackerCommonData/data/trackermaterial.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/tracker.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixel.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerStructureTopology.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelStructureTopology.xml',
+        'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackersens.xml',
+        'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelsens.xml',
+        'Geometry/TrackerRecoData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerRecoMaterial.xml',
+        'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseII/v1/trackingMaterialGroups_ForPhaseII.xml',
+        'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml',
+        'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml',
+        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/ebalgo.xml',
+        'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
+        'Geometry/EcalCommonData/data/ebrot.xml',
+        'Geometry/HcalCommonData/data/hcalrotations.xml',
+        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+        'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
+        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+        'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
+        'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
+        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+        'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
+        'Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml',
+        'Geometry/HGCalCommonData/data/hgcal/v19ng/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v19ng/hgcalwafer.xml',
+        'Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml',
+        'Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEsil/v19/hgcalHEsil.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml',
+        'Geometry/HGCalCommonData/data/hgcalCons/v19ng/hgcalCons.xml',
+        'Geometry/HGCalCommonData/data/hgcalConsData/v19/hgcalConsData.xml',
+        'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
+        'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',
+        'Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml',
+        'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
+        'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
+        'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2030/v8/mf.xml',
+        'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml',
+        'Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml',
+        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
+        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
+        'Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml',
+        'Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml',
+        'Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml',
+        'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
+        'Geometry/ForwardCommonData/data/lumimaterials.xml',
+        'Geometry/ForwardCommonData/data/zdcrotations.xml',
+        'Geometry/ForwardCommonData/data/lumirotations.xml',
+        'Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/cmszdc.xml',
+        'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml',
+        'Geometry/MTDCommonData/data/btl/v1/btl.xml',
+        'Geometry/MTDCommonData/data/etl/v7/etl.xml',
+        'Geometry/MTDCommonData/data/mtdParameters/v3/mtdStructureTopology.xml',
+        'Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml',
+    )+
+    cms.vstring(
+        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
+        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
+        'Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml',
+        'Geometry/HcalSimData/data/hf.xml',
+        'Geometry/HcalSimData/data/hfpmt.xml',
+        'Geometry/HcalSimData/data/hffibrebundle.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml',
+        'Geometry/HGCalSimData/data/hgcsensv17n.xml',
+        'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
+        'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml',
+        'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml',
+        'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml',
+        'Geometry/ForwardSimData/data/zdcsens.xml',
+        'Geometry/MTDSimData/data/v2/mtdsens.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml',
+        'Geometry/EcalSimData/data/EcalProdCuts.xml',
+        'Geometry/HGCalSimData/data/hgcProdCutsv15.xml',
+        'Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
+        'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
+        'Geometry/CMSCommonData/data/FieldParameters.xml'
+    ),
+    rootNodeName = cms.string('cms:OCMS')
+)