diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalModule-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalModule-algorithm.xml
deleted file mode 100644
index 88aa7250c72aa..0000000000000
--- a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalModule-algorithm.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalModuleAlgo-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalModuleAlgo-algorithm.xml
deleted file mode 100644
index 8c87110738b01..0000000000000
--- a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalModuleAlgo-algorithm.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalV8-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalV8-algorithm.xml
deleted file mode 100644
index 4aa1467bbb028..0000000000000
--- a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalV8-algorithm.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/HGCalCommonData/data/hgcal/v7/hgcal.xml b/Geometry/HGCalCommonData/data/hgcal/v7/hgcal.xml
deleted file mode 100644
index 44cb54d8315c7..0000000000000
--- a/Geometry/HGCalCommonData/data/hgcal/v7/hgcal.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml b/Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml
deleted file mode 100644
index 65d0a1df52c3d..0000000000000
--- a/Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml b/Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml
deleted file mode 100644
index bc24cfee8cdba..0000000000000
--- a/Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v7/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v7/hgcalCons.xml
deleted file mode 100644
index 8766e1200a4e3..0000000000000
--- a/Geometry/HGCalCommonData/data/hgcalCons/v7/hgcalCons.xml
+++ /dev/null
@@ -1,399 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v8/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v8/hgcalCons.xml
deleted file mode 100644
index 8766e1200a4e3..0000000000000
--- a/Geometry/HGCalCommonData/data/hgcalCons/v8/hgcalCons.xml
+++ /dev/null
@@ -1,399 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml
deleted file mode 100644
index b54022e32474b..0000000000000
--- a/Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-
-
-
-
-
-
- [hgcal:radMixL0], [hgcal:radMixL1], [hgcal:radMixL2], [hgcal:radMixL3],
- [hgcal:radMixL4], [hgcal:radMixL5], [hgcal:radMixL6], [hgcal:radMixL7],
- [hgcal:radMixL8], [hgcal:radMixL9], [hgcal:radMixL10],[hgcal:radMixL11],
- [hgcal:radMixL12],[hgcal:radMixL13],[hgcal:radMixL14],[hgcal:radMixL15]
-
-
- [hgcal:zMinEE], [hgcal:zMinHEsil], [hgcal:zMinHEmix],
- [hgcal:zMaxHEmix]
-
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/HGCalCommonData/data/hgcalEE/v7/hgcalEE.xml b/Geometry/HGCalCommonData/data/hgcalEE/v7/hgcalEE.xml
deleted file mode 100644
index 9d1496b9f36c7..0000000000000
--- a/Geometry/HGCalCommonData/data/hgcalEE/v7/hgcalEE.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse
-
- materials:Carbon_fibre_str_Upgrade2, materials:Tungsten,
- materials:Tungsten, materials:Tungsten, hgcal:WCu, hgcal:WCu,
- hgcal:WCu, materials:Copper, materials:Copper, materials:Air,
- materials:M_NEMA FR4 plate, materials:Air, materials:Foam,
- materials:Aluminium, materials:Air
-
- EEModule, EEAbsorber1, EEAbsorber2, EEAbsorber3, EEAbsorber4, EEAbsorber5,
- EEAbsorber6, EECuFrame, EEHeatShield, EESensitive, EEPCB, EEAirGap,
- EEThermalScreen, EEScreenCover, EEThermalGap
-
- 0.5*mm, 2.0*mm, 2.8*mm, 4.2*mm, 0.6*mm, 1.2*mm, 2.2*mm,
- 0.5*mm, 6.0*mm, 0.1*mm, 2.0*mm, 2.0*mm, 16.0*mm, 2.0*mm, 10.0*mm
-
-
- 4, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18
-
- 30.0*mm, 19.8*mm, 19.8*mm, 19.8*mm, 19.8*mm, 19.8*mm, 21.8*mm, 21.8*mm,
- 21.8*mm, 21.8*mm, 21.8*mm, 25.2*mm, 25.2*mm, 25.2*mm, 25.2*mm
-
- 13, 12, 13, 14,
- 0, 1, 0, 7, 11, 10, 9, 9, 9, 4, 8, 4, 9, 9, 9, 10, 11, 7,
- 0, 1, 0, 7, 11, 10, 9, 9, 9, 4, 8, 4, 9, 9, 9, 10, 11, 7,
- 0, 1, 0, 7, 11, 10, 9, 9, 9, 4, 8, 4, 9, 9, 9, 10, 11, 7,
- 0, 1, 0, 7, 11, 10, 9, 9, 9, 4, 8, 4, 9, 9, 9, 10, 11, 7,
- 0, 1, 0, 7, 11, 10, 9, 9, 9, 4, 8, 4, 9, 9, 9, 10, 11, 7,
- 0, 2, 0, 7, 11, 10, 9, 9, 9, 5, 8, 5, 9, 9, 9, 10, 11, 7,
- 0, 2, 0, 7, 11, 10, 9, 9, 9, 5, 8, 5, 9, 9, 9, 10, 11, 7,
- 0, 2, 0, 7, 11, 10, 9, 9, 9, 5, 8, 5, 9, 9, 9, 10, 11, 7,
- 0, 2, 0, 7, 11, 10, 9, 9, 9, 5, 8, 5, 9, 9, 9, 10, 11, 7,
- 0, 2, 0, 7, 11, 10, 9, 9, 9, 5, 8, 5, 9, 9, 9, 10, 11, 7,
- 0, 3, 0, 7, 11, 10, 9, 9, 9, 6, 8, 6, 9, 9, 9, 10, 11, 7,
- 0, 3, 0, 7, 11, 10, 9, 9, 9, 6, 8, 6, 9, 9, 9, 10, 11, 7,
- 0, 3, 0, 7, 11, 10, 9, 9, 9, 6, 8, 6, 9, 9, 9, 10, 11, 7,
- 0, 3, 0, 7, 11, 10, 9, 9, 9, 6, 8, 6, 9, 9, 9, 10, 11, 7
-
-
- 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0
-
-
-
-
-
-
-
- [etaMax:slope], [hgcal:slope1]
-
- [hgcal:slope2], [hgcal:slope3], 0, 0
-
- [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3],
- [hgcal:zHGCal4]
-
- [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3],
- [hgcal:rMaxHGCal4]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml b/Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml
deleted file mode 100644
index c556aadb7f7d4..0000000000000
--- a/Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse
-
- materials:Carbon_fibre_str_Upgrade2, materials:Tungsten,
- materials:Tungsten, materials:Tungsten, hgcal:WCu, hgcal:WCu,
- hgcal:WCu, materials:Copper, materials:Copper, materials:Silicon,
- materials:M_NEMA FR4 plate, materials:Air, materials:Foam,
- materials:Aluminium, materials:Air
-
- EEModule, EEAbsorber1, EEAbsorber2, EEAbsorber3, EEAbsorber4, EEAbsorber5,
- EEAbsorber6, EECuFrame, EEHeatShield, EESensitive, EEPCB, EEAirGap,
- EEThermalScreen, EEScreenCover, EEThermalGap
-
- 0.5*mm, 2.0*mm, 2.8*mm, 4.2*mm, 0.6*mm, 1.2*mm, 2.2*mm,
- 0.5*mm, 6.0*mm, 0.1*mm, 2.0*mm, 2.0*mm, 16.0*mm, 2.0*mm, 10.0*mm
-
-
- 4, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18
-
- 30.0*mm, 19.8*mm, 19.8*mm, 19.8*mm, 19.8*mm, 19.8*mm, 21.8*mm, 21.8*mm,
- 21.8*mm, 21.8*mm, 21.8*mm, 25.2*mm, 25.2*mm, 25.2*mm, 25.2*mm
-
- 13, 12, 13, 14,
- 0, 1, 0, 7, 11, 10, 9, 9, 9, 4, 8, 4, 9, 9, 9, 10, 11, 7,
- 0, 1, 0, 7, 11, 10, 9, 9, 9, 4, 8, 4, 9, 9, 9, 10, 11, 7,
- 0, 1, 0, 7, 11, 10, 9, 9, 9, 4, 8, 4, 9, 9, 9, 10, 11, 7,
- 0, 1, 0, 7, 11, 10, 9, 9, 9, 4, 8, 4, 9, 9, 9, 10, 11, 7,
- 0, 1, 0, 7, 11, 10, 9, 9, 9, 4, 8, 4, 9, 9, 9, 10, 11, 7,
- 0, 2, 0, 7, 11, 10, 9, 9, 9, 5, 8, 5, 9, 9, 9, 10, 11, 7,
- 0, 2, 0, 7, 11, 10, 9, 9, 9, 5, 8, 5, 9, 9, 9, 10, 11, 7,
- 0, 2, 0, 7, 11, 10, 9, 9, 9, 5, 8, 5, 9, 9, 9, 10, 11, 7,
- 0, 2, 0, 7, 11, 10, 9, 9, 9, 5, 8, 5, 9, 9, 9, 10, 11, 7,
- 0, 2, 0, 7, 11, 10, 9, 9, 9, 5, 8, 5, 9, 9, 9, 10, 11, 7,
- 0, 3, 0, 7, 11, 10, 9, 9, 9, 6, 8, 6, 9, 9, 9, 10, 11, 7,
- 0, 3, 0, 7, 11, 10, 9, 9, 9, 6, 8, 6, 9, 9, 9, 10, 11, 7,
- 0, 3, 0, 7, 11, 10, 9, 9, 9, 6, 8, 6, 9, 9, 9, 10, 11, 7,
- 0, 3, 0, 7, 11, 10, 9, 9, 9, 6, 8, 6, 9, 9, 9, 10, 11, 7
-
-
- 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0
-
-
-
-
-
-
- [etaMax:slope], [etaMax:slope]
-
- [hgcal:slope2], [hgcal:slope3], 0, 0
-
- [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3],
- [hgcal:zHGCal4]
-
- [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3],
- [hgcal:rMaxHGCal4]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/HGCalCommonData/data/hgcalHEmix/v16/hgcalHEmix.xml b/Geometry/HGCalCommonData/data/hgcalHEmix/v16/hgcalHEmix.xml
index 63429ac591647..dd9287da587ed 100644
--- a/Geometry/HGCalCommonData/data/hgcalHEmix/v16/hgcalHEmix.xml
+++ b/Geometry/HGCalCommonData/data/hgcalHEmix/v16/hgcalHEmix.xml
@@ -119,9 +119,9 @@
hgcalwafer:HGCalHEWafer0Coarse2bm4, hgcalwafer:HGCalHEWafer0Coarse2bm5
materials:StainlessSteel, materials:StainlessSteel, materials:Air,
- materials:Copper, materials:Air, materials:Copper
+ materials:StainlessSteel, materials:Air, materials:Copper
- HGCalHEAbsorber1, HGCalHEAbsorber2, HGCalHEAirGap1, HGCalHECopperCover,
+ HGCalHEAbsorber1, HGCalHEAbsorber2, HGCalHEAirGap1, HGCalHESteelCover,
HGCalHESiliconLayer, HGCalHECoolingPlate
41.5*mm, 60.7*mm, 4.0*mm, 2.5*mm, [hgcal:ModuleThicknessHE], 6.35*mm
diff --git a/Geometry/HGCalCommonData/data/hgcalHEsil/v16/hgcalHEsil.xml b/Geometry/HGCalCommonData/data/hgcalHEsil/v16/hgcalHEsil.xml
index 5a59d1e56e1be..794ad6debe78d 100644
--- a/Geometry/HGCalCommonData/data/hgcalHEsil/v16/hgcalHEsil.xml
+++ b/Geometry/HGCalCommonData/data/hgcalHEsil/v16/hgcalHEsil.xml
@@ -103,10 +103,11 @@
hgcalwafer:HGCalHEWafer0Coarse2bm4, hgcalwafer:HGCalHEWafer0Coarse2bm5
materials:StainlessSteel, materials:StainlessSteel, materials:Air,
- materials:Air, materials:Copper, materials:Copper, materials:Air
+ materials:Air, materials:StainlessSteel, materials:Copper,
+ materials:Air
HGCalHEAbsorber1, HGCalHEAbsorber2, HGCalHEAirGap0, HGCalHEAirGap1,
- HGCalHECopperCover, HGCalHECoolingPlate, HGCalHESiliconLayer
+ HGCalHESteelCover, HGCalHECoolingPlate, HGCalHESiliconLayer
45.0*mm, 41.5*mm, 1.25*mm, 4.00*mm, 2.50*mm, 6.35*mm,
[hgcal:ModuleThicknessHE]
diff --git a/Geometry/HGCalCommonData/data/hgcalHEsil/v7/hgcalHEsil.xml b/Geometry/HGCalCommonData/data/hgcalHEsil/v7/hgcalHEsil.xml
deleted file mode 100644
index 7a84abb651049..0000000000000
--- a/Geometry/HGCalCommonData/data/hgcalHEsil/v7/hgcalHEsil.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- hgcalwafer:HGCalHEWaferFine, hgcalwafer:HGCalHEWaferCoarse
-
- materials:H_Brass, materials:Carbon_fibre_str_Upgrade2, materials:Copper,
- materials:Copper, materials:Air, materials:M_NEMA FR4 plate,
- materials:Air, materials:StainlessSteel, materials:Foam,
- materials:Aluminium, materials:Air
-
- HESiliconAbsorber1, HESiliconAbsorber2, HESiliconShield,
- HESiliconHeatShield, HESiliconSensitive, HESiliconPCB, HESiliconAirGap,
- HESiliconSupport, HEThermalScreen, HEScreenCover, HEThermalGap
-
- 35.0*mm, 1.0*mm, 0.5*mm, 6.0*mm, 0.1*mm, 2.0*mm, 2.0*mm, 15*mm, 16.0*mm,
- 2.0*mm, 10.0*mm
-
- 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 4
-
- 15.0*mm, 46.8*mm, 46.8*mm, 46.8*mm, 46.8*mm, 46.8*mm, 46.8*mm, 46.8*mm,
- 46.8*mm, 46.8*mm, 46.8*mm, 46.8*mm, 46.8*mm, 30.0*mm
-
- 7,
- 0, 2, 6, 5, 4, 4, 4, 1, 3, 0, 2, 6, 5, 4, 4, 4, 1, 3,
- 0, 2, 6, 5, 4, 4, 4, 1, 3, 0, 2, 6, 5, 4, 4, 4, 1, 3,
- 0, 2, 6, 5, 4, 4, 4, 1, 3, 0, 2, 6, 5, 4, 4, 4, 1, 3,
- 0, 2, 6, 5, 4, 4, 4, 1, 3, 0, 2, 6, 5, 4, 4, 4, 1, 3,
- 0, 2, 6, 5, 4, 4, 4, 1, 3, 0, 2, 6, 5, 4, 4, 4, 1, 3,
- 0, 2, 6, 5, 4, 4, 4, 1, 3, 0, 2, 6, 5, 4, 4, 4, 1, 3,
- 10, 9, 8, 9
-
-
- 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0
-
-
-
-
-
-
-
- [etaMax:slope], [hgcal:slope1]
-
- [hgcal:slope2], 0, 0, 0
-
- [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3],
- [hgcal:zHGCal4]
-
- [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal2],
- [hgcal:rMaxHGCal4]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/HGCalCommonData/data/hgcalHEsil/v7SS/hgcalHEsil.xml b/Geometry/HGCalCommonData/data/hgcalHEsil/v7SS/hgcalHEsil.xml
deleted file mode 100644
index 465c3e6917998..0000000000000
--- a/Geometry/HGCalCommonData/data/hgcalHEsil/v7SS/hgcalHEsil.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- hgcalwafer:HGCalHEWaferFine, hgcalwafer:HGCalHEWaferCoarse
-
- materials:StainlessSteel, materials:Carbon_fibre_str_Upgrade2,
- materials:Copper, materials:Copper, materials:Air,
- materials:M_NEMA FR4 plate, materials:Air, materials:StainlessSteel,
- materials:Foam, materials:Aluminium, materials:Air
-
- HESiliconAbsorber1, HESiliconAbsorber2, HESiliconShield,
- HESiliconHeatShield, HESiliconSensitive, HESiliconPCB, HESiliconAirGap,
- HESiliconSupport, HEThermalScreen, HEScreenCover, HEThermalGap
-
- 35.0*mm, 1.0*mm, 0.5*mm, 6.0*mm, 0.1*mm, 2.0*mm, 2.0*mm, 15*mm, 16.0*mm,
- 2.0*mm, 10.0*mm
-
- 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 4
-
- 15.0*mm, 46.8*mm, 46.8*mm, 46.8*mm, 46.8*mm, 46.8*mm, 46.8*mm, 46.8*mm,
- 46.8*mm, 46.8*mm, 46.8*mm, 46.8*mm, 46.8*mm, 30.0*mm
-
- 7,
- 0, 2, 6, 5, 4, 4, 4, 1, 3, 0, 2, 6, 5, 4, 4, 4, 1, 3,
- 0, 2, 6, 5, 4, 4, 4, 1, 3, 0, 2, 6, 5, 4, 4, 4, 1, 3,
- 0, 2, 6, 5, 4, 4, 4, 1, 3, 0, 2, 6, 5, 4, 4, 4, 1, 3,
- 0, 2, 6, 5, 4, 4, 4, 1, 3, 0, 2, 6, 5, 4, 4, 4, 1, 3,
- 0, 2, 6, 5, 4, 4, 4, 1, 3, 0, 2, 6, 5, 4, 4, 4, 1, 3,
- 0, 2, 6, 5, 4, 4, 4, 1, 3, 0, 2, 6, 5, 4, 4, 4, 1, 3,
- 10, 9, 8, 9
-
-
- 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0
-
-
-
-
-
-
-
- [etaMax:slope], [hgcal:slope1]
-
- [hgcal:slope2], 0, 0, 0
-
- [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3],
- [hgcal:zHGCal4]
-
- [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal2],
- [hgcal:rMaxHGCal4]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/HGCalCommonData/data/hgcalHEsil/v8/hgcalHEsil.xml b/Geometry/HGCalCommonData/data/hgcalHEsil/v8/hgcalHEsil.xml
deleted file mode 100644
index 4605c14da566c..0000000000000
--- a/Geometry/HGCalCommonData/data/hgcalHEsil/v8/hgcalHEsil.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- hgcalwafer:HGCalHEWaferFine, hgcalwafer:HGCalHEWaferCoarse
-
- materials:StainlessSteel, materials:Carbon_fibre_str_Upgrade2,
- materials:Copper, materials:Copper, materials:Silicon,
- materials:M_NEMA FR4 plate, materials:Air, materials:StainlessSteel,
- materials:Foam, materials:Aluminium, materials:Air
-
- HESiliconAbsorber1, HESiliconAbsorber2, HESiliconShield,
- HESiliconHeatShield, HESiliconSensitive, HESiliconPCB, HESiliconAirGap,
- HESiliconSupport, HEThermalScreen, HEScreenCover, HEThermalGap
-
- 35.0*mm, 1.0*mm, 0.5*mm, 6.0*mm, 0.1*mm, 2.0*mm, 2.0*mm, 15*mm, 16.0*mm,
- 2.0*mm, 10.0*mm
-
- 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 4
-
- 15.0*mm, 46.8*mm, 46.8*mm, 46.8*mm, 46.8*mm, 46.8*mm, 46.8*mm, 46.8*mm,
- 46.8*mm, 46.8*mm, 46.8*mm, 46.8*mm, 46.8*mm, 30.0*mm
-
- 7,
- 0, 2, 6, 5, 4, 4, 4, 1, 3, 0, 2, 6, 5, 4, 4, 4, 1, 3,
- 0, 2, 6, 5, 4, 4, 4, 1, 3, 0, 2, 6, 5, 4, 4, 4, 1, 3,
- 0, 2, 6, 5, 4, 4, 4, 1, 3, 0, 2, 6, 5, 4, 4, 4, 1, 3,
- 0, 2, 6, 5, 4, 4, 4, 1, 3, 0, 2, 6, 5, 4, 4, 4, 1, 3,
- 0, 2, 6, 5, 4, 4, 4, 1, 3, 0, 2, 6, 5, 4, 4, 4, 1, 3,
- 0, 2, 6, 5, 4, 4, 4, 1, 3, 0, 2, 6, 5, 4, 4, 4, 1, 3,
- 10, 9, 8, 9
-
-
- 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0
-
-
-
-
-
-
- [etaMax:slope], [etaMax:slope]
-
- [hgcal:slope2], 0, 0, 0
-
- [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3],
- [hgcal:zHGCal4]
-
- [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal2],
- [hgcal:rMaxHGCal4]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/HGCalCommonData/python/ecalhcalPhaseIIGeometryXML_cfi.py b/Geometry/HGCalCommonData/python/ecalhcalPhaseIIGeometryXML_cfi.py
deleted file mode 100644
index 2b939210087d0..0000000000000
--- a/Geometry/HGCalCommonData/python/ecalhcalPhaseIIGeometryXML_cfi.py
+++ /dev/null
@@ -1,58 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
- geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
- 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
- 'Geometry/TrackerCommonData/data/trackermaterial.xml',
- 'Geometry/CMSCommonData/data/rotations.xml',
- "Geometry/HcalCommonData/data/hcalrotations.xml",
- 'Geometry/CMSCommonData/data/normal/cmsextent.xml',
- 'Geometry/CMSCommonData/data/cms.xml',
- 'Geometry/CMSCommonData/data/cmsMother.xml',
- 'Geometry/CMSCommonData/data/eta3/etaMax.xml',
- 'Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml',
- 'Geometry/CMSCommonData/data/cmsCalo.xml',
- 'Geometry/CMSCommonData/data/muonBase.xml',
- 'Geometry/CMSCommonData/data/cmsMuon.xml',
- 'Geometry/CMSCommonData/data/mgnt.xml',
- 'Geometry/CMSCommonData/data/muonMB.xml',
- 'Geometry/CMSCommonData/data/muonMagnet.xml',
- 'Geometry/EcalCommonData/data/ectkcable.xml',
- 'Geometry/EcalCommonData/data/eregalgo/2026/v1/eregalgo.xml',
- 'Geometry/EcalCommonData/data/ebalgo.xml',
- 'Geometry/EcalCommonData/data/ebcon.xml',
- 'Geometry/EcalCommonData/data/ebrot.xml',
- 'Geometry/EcalCommonData/data/eecon.xml',
- 'Geometry/EcalCommonData/data/escon/2026/v1/escon.xml',
- 'Geometry/EcalCommonData/data/esalgo/2026/v1/esalgo.xml',
- 'Geometry/HcalCommonData/data/hcalrotations.xml',
- 'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml',
- 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
- 'Geometry/HcalCommonData/data/hcalendcap/SSAbsorber/hcalendcapalgo.xml',
- 'Geometry/HcalCommonData/data/hcalouteralgo.xml',
- 'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
- 'Geometry/HcalCommonData/data/hcalSimNumbering/2026/hcalSimNumbering.xml',
- 'Geometry/HcalCommonData/data/hcalRecNumbering/2026/hcalRecNumbering.xml',
- 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
- 'Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml',
- 'Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/hgcalHEsil/v8/hgcalHEsil.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/hgcalCons/v8/hgcalCons.xml',
- 'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
- 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
- 'Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml',
- 'Geometry/HcalSimData/data/hf.xml',
- 'Geometry/HcalSimData/data/hfpmt.xml',
- 'Geometry/HcalSimData/data/hffibrebundle.xml',
- 'Geometry/HcalSimData/data/CaloUtil.xml',
- 'Geometry/HGCalSimData/data/hgcsensv8.xml',
- 'Geometry/HGCalSimData/data/hgccons.xml',
- 'Geometry/HGCalSimData/data/hgcProdCuts.xml',
- 'Geometry/HcalSimData/data/HcalProdCuts.xml',
- 'Geometry/EcalSimData/data/EcalProdCuts.xml',
- 'Geometry/CMSCommonData/data/FieldParameters.xml'),
- rootNodeName = cms.string('cms:OCMS')
-)
-
-
diff --git a/Geometry/HGCalCommonData/python/testFastTimeXML_cfi.py b/Geometry/HGCalCommonData/python/testFastTimeXML_cfi.py
deleted file mode 100644
index 0795bdc5a9684..0000000000000
--- a/Geometry/HGCalCommonData/python/testFastTimeXML_cfi.py
+++ /dev/null
@@ -1,122 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.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.xml',
- 'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/CMSCommonData/data/extend/cmsextent.xml',
- 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml',
- 'Geometry/CMSCommonData/data/eta3/etaMax.xml',
- 'Geometry/CMSCommonData/data/cmsMother.xml',
- 'Geometry/CMSCommonData/data/cmsTracker.xml',
- 'Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml',
- 'Geometry/CMSCommonData/data/cmsCalo.xml',
- 'Geometry/CMSCommonData/data/muonBase/2026/v1/muonBase.xml',
- 'Geometry/CMSCommonData/data/cmsMuon.xml',
- 'Geometry/CMSCommonData/data/mgnt.xml',
- 'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
- 'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
- 'Geometry/CMSCommonData/data/muonMB.xml',
- 'Geometry/CMSCommonData/data/muonMagnet.xml',
- 'Geometry/CMSCommonData/data/cavern.xml',
- 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
- 'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
- 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixfwd.xml',
- 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixbar.xml',
- 'Geometry/TrackerCommonData/data/trackermaterial.xml',
- 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/tracker.xml',
- 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixel.xml',
- 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerbar.xml',
- 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerfwd.xml',
- 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerStructureTopology.xml',
- 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixelStructureTopology.xml',
- 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackersens.xml',
- 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelsens.xml',
- 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4026/trackerRecoMaterial.xml',
- 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackerProdCuts.xml',
- 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelProdCuts.xml',
- 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
- 'Geometry/EcalCommonData/data/ectkcable.xml',
- 'Geometry/EcalCommonData/data/eregalgo/2026/v1/eregalgo.xml',
- 'Geometry/EcalCommonData/data/ebalgo.xml',
- 'Geometry/EcalCommonData/data/ebcon.xml',
- 'Geometry/EcalCommonData/data/ebrot.xml',
- 'Geometry/EcalCommonData/data/eecon.xml',
- 'Geometry/EcalCommonData/data/escon/2026/v1/escon.xml',
- 'Geometry/EcalCommonData/data/esalgo/2026/v1/esalgo.xml',
- 'Geometry/HcalCommonData/data/hcalrotations.xml',
- 'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml',
- 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
- 'Geometry/HcalCommonData/data/hcalendcap/HGCal/hcalendcapalgo.xml',
- 'Geometry/HcalCommonData/data/hcalouteralgo.xml',
- 'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
- 'Geometry/HcalCommonData/data/hcalSimNumbering/2026/hcalSimNumbering.xml',
- 'Geometry/HcalCommonData/data/hcalRecNumbering/2026/hcalRecNumbering.xml',
- 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
- 'Geometry/HGCalCommonData/data/hgcal/v7/hgcal.xml',
- 'Geometry/HGCalCommonData/data/hgcalEE/v7/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/hgcalHEsil/v7/hgcalHEsil.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/hgcalCons/v7/hgcalCons.xml',
- 'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
- 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
- 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
- 'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
- 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
- 'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
- 'Geometry/MuonCommonData/data/mf/2026/v1/mf.xml',
- 'Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml',
- 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
- 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
- 'Geometry/MuonCommonData/data/gem21/TDR_BaseLine/gem21.xml',
- 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
- 'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
- 'Geometry/MuonCommonData/data/me0/TDR_BaseLine/me0.xml',
- 'Geometry/ForwardCommonData/data/forwardshield/2015/v1/forwardshield.xml',
- 'Geometry/ForwardCommonData/data/brmrotations.xml',
- 'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
- 'Geometry/ForwardCommonData/data/zdcmaterials.xml',
- 'Geometry/ForwardCommonData/data/lumimaterials.xml',
- 'Geometry/ForwardCommonData/data/zdcrotations.xml',
- 'Geometry/ForwardCommonData/data/lumirotations.xml',
- 'Geometry/ForwardCommonData/data/zdc.xml',
- 'Geometry/ForwardCommonData/data/zdclumi.xml',
- 'Geometry/ForwardCommonData/data/cmszdc.xml',
- 'Geometry/HGCalCommonData/data/fastTimingBarrel.xml',
- 'Geometry/HGCalCommonData/data/fastTimingEndcap.xml',
- 'Geometry/HGCalCommonData/data/fastTimingElement.xml',
- )+
- cms.vstring(
- 'Geometry/MuonCommonData/data/muonNumbering/TDR_BaseLine/muonNumbering.xml',
- 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
- 'Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml',
- 'Geometry/HcalSimData/data/hf.xml',
- 'Geometry/HcalSimData/data/hfpmt.xml',
- 'Geometry/HcalSimData/data/hffibrebundle.xml',
- 'Geometry/HcalSimData/data/CaloUtil.xml',
- 'Geometry/HGCalSimData/data/hgcsensv6.xml',
- 'Geometry/HGCalSimData/data/hgccons.xml',
- 'Geometry/HGCalSimData/data/hgcProdCuts.xml',
- 'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
- 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
- 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
- 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
- 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml',
- 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
- 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
- 'Geometry/ForwardCommonData/data/brmsens.xml',
- 'Geometry/ForwardSimData/data/zdcsens.xml',
- 'Geometry/HGCalSimData/data/fasttimesens.xml',
- 'Geometry/HcalSimData/data/HcalProdCuts.xml',
- 'Geometry/EcalSimData/data/EcalProdCuts.xml',
- 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
- 'Geometry/ForwardSimData/data/zdcProdCuts.xml',
- 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
- 'Geometry/HGCalSimData/data/fasttimeProdCuts.xml',
- 'Geometry/CMSCommonData/data/FieldParameters.xml',
- ),
- rootNodeName = cms.string('cms:OCMS')
-)
diff --git a/Geometry/HGCalCommonData/python/testHGCV8_cff.py b/Geometry/HGCalCommonData/python/testHGCV8_cff.py
deleted file mode 100644
index c53d03755ec60..0000000000000
--- a/Geometry/HGCalCommonData/python/testHGCV8_cff.py
+++ /dev/null
@@ -1,53 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from Geometry.HGCalCommonData.testHGCV8XML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
-from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import *
-from Geometry.HcalCommonData.hcalDDConstants_cff import *
-from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import *
-from Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi import *
-
-# tracker
-from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
-from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
-from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
-from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
-
-# calo
-from Geometry.CaloEventSetup.HGCalV6Topology_cfi import *
-from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_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"
- )
-)
-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_cfi import *
-from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
-from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
-from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
-
-# forward
-from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
-from Geometry.HGCalCommonData.fastTimeNumberingInitialization_cfi import *
-from Geometry.HGCalCommonData.fastTimeParametersInitialization_cfi import *
diff --git a/Geometry/HGCalCommonData/python/testHGCV9XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCV9XML_cfi.py
deleted file mode 100644
index 696624068b895..0000000000000
--- a/Geometry/HGCalCommonData/python/testHGCV9XML_cfi.py
+++ /dev/null
@@ -1,29 +0,0 @@
-
-import FWCore.ParameterSet.Config as cms
-
-XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
- geomXMLFiles = cms.vstring(
- 'Geometry/CMSCommonData/data/materials.xml',
- 'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/CMSCommonData/data/extend/cmsextent.xml',
- 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml',
- 'Geometry/CMSCommonData/data/eta3/etaMax.xml',
- 'Geometry/CMSCommonData/data/cmsMother.xml',
- 'Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml',
- 'Geometry/CMSCommonData/data/cmsCalo.xml',
- 'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
- 'Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml',
- 'Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml',
- 'Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
- 'Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml',
- 'Geometry/HGCalSimData/data/hgcsensv9.xml',
- 'Geometry/HGCalSimData/data/hgcProdCutsv9.xml',
- 'Geometry/CMSCommonData/data/FieldParameters.xml',
- ),
- rootNodeName = cms.string('cms:OCMS')
-)
-
-
diff --git a/Geometry/HGCalCommonData/python/testHGCalModuleAlgoXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalModuleAlgoXML_cfi.py
deleted file mode 100644
index 3b117c37b626c..0000000000000
--- a/Geometry/HGCalCommonData/python/testHGCalModuleAlgoXML_cfi.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
- geomXMLFiles = cms.vstring(
- 'Geometry/CMSCommonData/data/materials.xml',
- 'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/CMSCommonData/data/extend/cmsextent.xml',
- 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml',
- 'Geometry/CMSCommonData/data/eta3/etaMax.xml',
- 'Geometry/CMSCommonData/data/cmsMother.xml',
- 'Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml',
- 'Geometry/CMSCommonData/data/cmsCalo.xml',
- 'Geometry/HGCalCommonData/data/hgcal/v7/hgcal.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/hgcalEE/v7/hgcalEE.xml',
- ),
- rootNodeName = cms.string('cms:OCMS')
-)
diff --git a/Geometry/HGCalCommonData/python/testHGCalModuleXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalModuleXML_cfi.py
deleted file mode 100644
index 3cf8deab87550..0000000000000
--- a/Geometry/HGCalCommonData/python/testHGCalModuleXML_cfi.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
- geomXMLFiles = cms.vstring(
- 'Geometry/CMSCommonData/data/materials.xml',
- 'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/CMSCommonData/data/extend/cmsextent.xml',
- 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml',
- 'Geometry/CMSCommonData/data/eta3/etaMax.xml',
- 'Geometry/CMSCommonData/data/cmsMother.xml',
- 'Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml',
- 'Geometry/CMSCommonData/data/cmsCalo.xml',
- 'Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v8/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml',
- ),
- rootNodeName = cms.string('cms:OCMS')
-)
diff --git a/Geometry/HGCalCommonData/python/testHGCalXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalXML_cfi.py
deleted file mode 100644
index a1affc140313f..0000000000000
--- a/Geometry/HGCalCommonData/python/testHGCalXML_cfi.py
+++ /dev/null
@@ -1,117 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.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.xml',
- 'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/CMSCommonData/data/extend/cmsextent.xml',
- 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml',
- 'Geometry/CMSCommonData/data/eta3/etaMax.xml',
- 'Geometry/CMSCommonData/data/cmsMother.xml',
- 'Geometry/CMSCommonData/data/cmsTracker.xml',
- 'Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml',
- 'Geometry/CMSCommonData/data/cmsCalo.xml',
- 'Geometry/CMSCommonData/data/muonBase/2026/v1/muonBase.xml',
- 'Geometry/CMSCommonData/data/cmsMuon.xml',
- 'Geometry/CMSCommonData/data/mgnt.xml',
- 'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
- 'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
- 'Geometry/CMSCommonData/data/muonMB.xml',
- 'Geometry/CMSCommonData/data/muonMagnet.xml',
- 'Geometry/CMSCommonData/data/cavern.xml',
- 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
- 'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
- 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixfwd.xml',
- 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixbar.xml',
- 'Geometry/TrackerCommonData/data/trackermaterial.xml',
- 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/tracker.xml',
- 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixel.xml',
- 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerbar.xml',
- 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerfwd.xml',
- 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerStructureTopology.xml',
- 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixelStructureTopology.xml',
- 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackersens.xml',
- 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelsens.xml',
- 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4026/trackerRecoMaterial.xml',
- 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackerProdCuts.xml',
- 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelProdCuts.xml',
- 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
- 'Geometry/EcalCommonData/data/ectkcable.xml',
- 'Geometry/EcalCommonData/data/eregalgo/2026/v1/eregalgo.xml',
- 'Geometry/EcalCommonData/data/ebalgo.xml',
- 'Geometry/EcalCommonData/data/ebcon.xml',
- 'Geometry/EcalCommonData/data/ebrot.xml',
- 'Geometry/EcalCommonData/data/eecon.xml',
- 'Geometry/EcalCommonData/data/escon/2026/v1/escon.xml',
- 'Geometry/EcalCommonData/data/esalgo/2026/v1/esalgo.xml',
- 'Geometry/HcalCommonData/data/hcalrotations.xml',
- 'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml',
- 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
- 'Geometry/HcalCommonData/data/hcalendcap/HGCal/hcalendcapalgo.xml',
- 'Geometry/HcalCommonData/data/hcalouteralgo.xml',
- 'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
- 'Geometry/HcalCommonData/data/hcalSimNumbering/2026/hcalSimNumbering.xml',
- 'Geometry/HcalCommonData/data/hcalRecNumbering/2026/hcalRecNumbering.xml',
- 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
- 'Geometry/HGCalCommonData/data/hgcal/v7/hgcal.xml',
- 'Geometry/HGCalCommonData/data/hgcalEE/v7/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/hgcalHEsil/v7/hgcalHEsil.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/hgcalCons/v7/hgcalCons.xml',
- 'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
- 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
- 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
- 'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
- 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
- 'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
- 'Geometry/MuonCommonData/data/mf/2026/v1/mf.xml',
- 'Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml',
- 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
- 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
- 'Geometry/MuonCommonData/data/gem21/TDR_BaseLine/gem21.xml',
- 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
- 'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
- 'Geometry/MuonCommonData/data/me0/TDR_BaseLine/me0.xml',
- 'Geometry/ForwardCommonData/data/forwardshield/2015/v1/forwardshield.xml',
- 'Geometry/ForwardCommonData/data/brmrotations.xml',
- 'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
- 'Geometry/ForwardCommonData/data/zdcmaterials.xml',
- 'Geometry/ForwardCommonData/data/lumimaterials.xml',
- 'Geometry/ForwardCommonData/data/zdcrotations.xml',
- 'Geometry/ForwardCommonData/data/lumirotations.xml',
- 'Geometry/ForwardCommonData/data/zdc.xml',
- 'Geometry/ForwardCommonData/data/zdclumi.xml',
- 'Geometry/ForwardCommonData/data/cmszdc.xml',
- )+
- cms.vstring(
- 'Geometry/MuonCommonData/data/muonNumbering/TDR_BaseLine/muonNumbering.xml',
- 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
- 'Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml',
- 'Geometry/HcalSimData/data/hf.xml',
- 'Geometry/HcalSimData/data/hfpmt.xml',
- 'Geometry/HcalSimData/data/hffibrebundle.xml',
- 'Geometry/HcalSimData/data/CaloUtil.xml',
- 'Geometry/HGCalSimData/data/hgcsensv6.xml',
- 'Geometry/HGCalSimData/data/hgccons.xml',
- 'Geometry/HGCalSimData/data/hgcProdCuts.xml',
- 'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
- 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
- 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
- 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
- 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml',
- 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
- 'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
- 'Geometry/ForwardCommonData/data/brmsens.xml',
- 'Geometry/ForwardSimData/data/zdcsens.xml',
- 'Geometry/HcalSimData/data/HcalProdCuts.xml',
- 'Geometry/EcalSimData/data/EcalProdCuts.xml',
- 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
- 'Geometry/ForwardSimData/data/zdcProdCuts.xml',
- 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
- 'Geometry/CMSCommonData/data/FieldParameters.xml',
- ),
- rootNodeName = cms.string('cms:OCMS')
-)
diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDDD_cfg.py
deleted file mode 100644
index bf94e9b959d3a..0000000000000
--- a/Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDDD_cfg.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-process = cms.Process("DUMP")
-process.load("Geometry.HGCalCommonData.testHGCalModuleAlgoXML_cfi")
-process.load('FWCore.MessageService.MessageLogger_cfi')
-
-if 'MessageLogger' in process.__dict__:
- process.MessageLogger.G4cerr=dict()
- process.MessageLogger.G4cout=dict()
- process.MessageLogger.HGCalGeom=dict()
-
-process.source = cms.Source("EmptySource")
-
-process.maxEvents = cms.untracked.PSet(
- input = cms.untracked.int32(1)
-)
-
-process.add_(cms.ESProducer("TGeoMgrFromDdd",
- verbose = cms.untracked.bool(False),
- level = cms.untracked.int32(14)
-))
-
-process.dump = cms.EDAnalyzer("DumpSimGeometry",
- outputFileName = cms.untracked.string('hgcalModuleAlgoDDD.root'))
-
-process.p = cms.Path(process.dump)
diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalModuleDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalModuleDDD_cfg.py
deleted file mode 100644
index 8f5158b24dd60..0000000000000
--- a/Geometry/HGCalCommonData/test/python/dumpHGCalModuleDDD_cfg.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-process = cms.Process("DUMP")
-process.load("Geometry.HGCalCommonData.testHGCalModuleXML_cfi")
-process.load('FWCore.MessageService.MessageLogger_cfi')
-
-if 'MessageLogger' in process.__dict__:
- process.MessageLogger.G4cerr=dict()
- process.MessageLogger.G4cout=dict()
- process.MessageLogger.HGCalGeom=dict()
-
-process.source = cms.Source("EmptySource")
-
-process.maxEvents = cms.untracked.PSet(
- input = cms.untracked.int32(1)
-)
-
-process.add_(cms.ESProducer("TGeoMgrFromDdd",
- verbose = cms.untracked.bool(False),
- level = cms.untracked.int32(14)
-))
-
-process.dump = cms.EDAnalyzer("DumpSimGeometry",
- outputFileName = cms.untracked.string('hgcalModuleDDD.root'))
-
-process.p = cms.Path(process.dump)
diff --git a/Geometry/HGCalCommonData/test/python/testFastTimeNumbering_cfg.py b/Geometry/HGCalCommonData/test/python/testFastTimeNumbering_cfg.py
deleted file mode 100644
index 06c610fdb3db7..0000000000000
--- a/Geometry/HGCalCommonData/test/python/testFastTimeNumbering_cfg.py
+++ /dev/null
@@ -1,52 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-process = cms.Process("PROD")
-process.load("SimGeneral.HepPDTESSource.pdt_cfi")
-process.load("Geometry.HGCalCommonData.testFastTimeXML_cfi")
-process.load("Geometry.HGCalCommonData.fastTimeParametersInitialization_cfi")
-process.load("Geometry.HGCalCommonData.fastTimeNumberingInitialization_cfi")
-
-process.MessageLogger = cms.Service("MessageLogger",
- cerr = cms.untracked.PSet(
- enable = cms.untracked.bool(False)
- ),
- cout = cms.untracked.PSet(
- HGCalGeom = cms.untracked.PSet(
- limit = cms.untracked.int32(0)
- ),
- default = cms.untracked.PSet(
- limit = cms.untracked.int32(0)
- ),
- enable = cms.untracked.bool(True),
- threshold = cms.untracked.string('DEBUG')
- ),
- debugModules = cms.untracked.vstring('*')
-)
-
-process.load("IOMC.RandomEngine.IOMC_cff")
-process.RandomNumberGeneratorService.generator.initialSeed = 456789
-
-process.source = cms.Source("EmptySource")
-
-process.generator = cms.EDProducer("FlatRandomEGunProducer",
- PGunParameters = cms.PSet(
- PartID = cms.vint32(14),
- MinEta = cms.double(-3.5),
- MaxEta = cms.double(3.5),
- MinPhi = cms.double(-3.14159265359),
- MaxPhi = cms.double(3.14159265359),
- MinE = cms.double(9.99),
- MaxE = cms.double(10.01)
- ),
- AddAntiParticle = cms.bool(False),
- Verbosity = cms.untracked.int32(0),
- firstRun = cms.untracked.uint32(1)
-)
-
-process.maxEvents = cms.untracked.PSet(
- input = cms.untracked.int32(1)
-)
-
-process.prod = cms.EDAnalyzer("FastTimeNumberingTester")
-
-process.p1 = cms.Path(process.generator*process.prod)
diff --git a/Geometry/HGCalGeometry/test/python/testFastTimeGeometry_cfg.py b/Geometry/HGCalGeometry/test/python/testFastTimeGeometry_cfg.py
deleted file mode 100644
index 2bf7448c1d8a6..0000000000000
--- a/Geometry/HGCalGeometry/test/python/testFastTimeGeometry_cfg.py
+++ /dev/null
@@ -1,61 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-process = cms.Process("PROD")
-process.load("SimGeneral.HepPDTESSource.pdt_cfi")
-
-process.load("Geometry.HGCalCommonData.testFastTimeXML_cfi")
-process.load("Geometry.HGCalCommonData.fastTimeParametersInitialization_cfi")
-process.load("Geometry.HGCalCommonData.fastTimeNumberingInitialization_cfi")
-process.load("Geometry.CaloEventSetup.FastTimeTopology_cfi")
-process.load("Geometry.HGCalGeometry.FastTimeGeometryESProducer_cfi")
-
-process.MessageLogger = cms.Service("MessageLogger",
- cerr = cms.untracked.PSet(
- enable = cms.untracked.bool(False)
- ),
- cout = cms.untracked.PSet(
- HGCalGeom = cms.untracked.PSet(
- limit = cms.untracked.int32(0)
- ),
- default = cms.untracked.PSet(
- limit = cms.untracked.int32(0)
- ),
- enable = cms.untracked.bool(True),
- threshold = cms.untracked.string('DEBUG')
- ),
- debugModules = cms.untracked.vstring('*')
-)
-
-process.load("IOMC.RandomEngine.IOMC_cff")
-process.RandomNumberGeneratorService.generator.initialSeed = 456789
-
-process.source = cms.Source("EmptySource")
-
-process.generator = cms.EDProducer("FlatRandomEGunProducer",
- PGunParameters = cms.PSet(
- PartID = cms.vint32(14),
- MinEta = cms.double(-3.5),
- MaxEta = cms.double(3.5),
- MinPhi = cms.double(-3.14159265359),
- MaxPhi = cms.double(3.14159265359),
- MinE = cms.double(9.99),
- MaxE = cms.double(10.01)
- ),
- AddAntiParticle = cms.bool(False),
- Verbosity = cms.untracked.int32(0),
- firstRun = cms.untracked.uint32(1)
-)
-
-process.maxEvents = cms.untracked.PSet(
- input = cms.untracked.int32(1)
-)
-
-process.prodBar = cms.EDAnalyzer("FastTimeGeometryTester",
- Detector = cms.string("FastTimeBarrel"),
-)
-
-process.prodEnd = process.prodBar.clone(
- Detector = "SFBX",
-)
-
-process.p1 = cms.Path(process.generator*process.prodBar*process.prodEnd)
diff --git a/Geometry/HGCalSimData/data/hgcProdCuts.xml b/Geometry/HGCalSimData/data/hgcProdCuts.xml
deleted file mode 100644
index 4f5557aa006d4..0000000000000
--- a/Geometry/HGCalSimData/data/hgcProdCuts.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/HGCalSimData/data/hgccons.xml b/Geometry/HGCalSimData/data/hgccons.xml
deleted file mode 100644
index 8758e324969e7..0000000000000
--- a/Geometry/HGCalSimData/data/hgccons.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/HGCalSimData/data/hgcsens.xml b/Geometry/HGCalSimData/data/hgcsens.xml
deleted file mode 100644
index 5199c9a868896..0000000000000
--- a/Geometry/HGCalSimData/data/hgcsens.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/HGCalSimData/data/hgcsensv6.xml b/Geometry/HGCalSimData/data/hgcsensv6.xml
deleted file mode 100644
index c5f4fdb86c5b6..0000000000000
--- a/Geometry/HGCalSimData/data/hgcsensv6.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Geometry/HGCalSimData/data/hgcsensv8.xml b/Geometry/HGCalSimData/data/hgcsensv8.xml
deleted file mode 100644
index 0312b1d77421c..0000000000000
--- a/Geometry/HGCalSimData/data/hgcsensv8.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-