diff --git a/Geometry/HGCalTBCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml b/Geometry/HGCalTBCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml
new file mode 100644
index 0000000000000..40d884895c45f
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/HGCalTBCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml b/Geometry/HGCalTBCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml
new file mode 100644
index 0000000000000..80569eaf44585
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcal.xml b/Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcal.xml
new file mode 100644
index 0000000000000..4b684744fbde2
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcal.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalpos.xml b/Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalpos.xml
new file mode 100644
index 0000000000000..56426aa1e5b03
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalpos.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml b/Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml
new file mode 100644
index 0000000000000..a77f4e007af2c
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml
@@ -0,0 +1,366 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3, 6, 9, 12, 15, 16, 15, 16, 15, 16, 15, 16, 15, 16, 15, 14, 11, 8, 5, 2
+
+
+ 2, 5, 8, 11, 12, 11, 12, 11, 12, 11, 12, 11, 8, 5, 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HGCalEECellCoarse, HGCalEECellCoarseHalf
+
+ -1,1,-4,-2,0,2,4,
+ -7,-5,-3,-1,1,3,5,7,
+ -10,-8,-6,-4,-2,0,2,4,6,8,10,
+ -11,-9,-7,-5,-3,-1,1,3,5,7,9,11,
+ -10,-8,-6,-4,-2,0,2,4,6,8,10,
+ -11,-9,-7,-5,-3,-1,1,3,5,7,9,11,
+ -10,-8,-6,-4,-2,0,2,4,6,8,10,
+ -11,-9,-7,-5,-3,-1,1,3,5,7,9,11,
+ -10,-8,-6,-4,-2,0,2,4,6,8,10,
+ -11,-9,-7,-5,-3,-1,1,3,5,7,9,11,
+ -10,-8,-6,-4,-2,0,2,4,6,8,10,
+ -7,-5,-3,-1,1,3,5,7,
+ -4,-2,0,2,4,-1,1
+
+
+ -42,-42,-36,-36,-36,-36,-36,
+ -30,-30,-30,-30,-30,-30,-30,-30,
+ -24,-24,-24,-24,-24,-24,-24,-24,-24,-24,-24,
+ -18,-18,-18,-18,-18,-18,-18,-18,-18,-18,-18,-18,
+ -12,-12,-12,-12,-12,-12,-12,-12,-12,-12,-12,
+ -6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,
+ 0,0,0,0,0,0,0,0,0,0,0,
+ 6,6,6,6,6,6,6,6,6,6,6,6,
+ 12,12,12,12,12,12,12,12,12,12,12,
+ 18,18,18,18,18,18,18,18,18,18,18,18,
+ 24,24,24,24,24,24,24,24,24,24,24,
+ 30,30,30,30,30,30,30,30,
+ 36,36,36,36,36,42,42
+
+
+ 240,300,240,0,0,0,300,240,0,0,0,0,0,0,300,240,0,0,0,0,0,0,0,0,0,300,
+ 180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 180,0,0,0,0,0,0,0,0,0,0,0,120,0,0,0,0,0,0,0,0,0,60,
+ 120,0,0,0,0,0,0,60,120,0,0,0,60,120,60
+
+
+ 1,1,1,0,0,0,1,1,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,
+ 1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+ 1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+ 1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+ 1,0,0,0,0,0,0,0,0,0,0,1,
+ 1,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,1,1,0,0,0,1,1,1
+
+
+
+
+
+
+
+
+ HGCalEECellFine, HGCalEECellFineHalf
+
+ -2,0,2,-5,-3,-1,1,3,5,
+ -8,-6,-4,-2,0,2,4,6,8,
+ -11,-9,-7,-5,-3,-1,1,3,5,7,9,11,
+ -14,-12,-10,-8,-6,-4,-2,0,2,4,6,8,10,12,14,
+ -15,-13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,15,
+ -14,-12,-10,-8,-6,-4,-2,0,2,4,6,8,10,12,14,
+ -15,-13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,15,
+ -14,-12,-10,-8,-6,-4,-2,0,2,4,6,8,10,12,14,
+ -15,-13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,15,
+ -14,-12,-10,-8,-6,-4,-2,0,2,4,6,8,10,12,14,
+ -15,-13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,15,
+ -14,-12,-10,-8,-6,-4,-2,0,2,4,6,8,10,12,14,
+ -15,-13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,15,
+ -14,-12,-10,-8,-6,-4,-2,0,2,4,6,8,10,12,14,
+ -13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,
+ -10,-8,-6,-4,-2,0,2,4,6,8,10,
+ -7,-5,-3,-1,1,3,5,7,
+ -4,-2,0,2,4,-1,1
+
+
+ -56,-56,-56,-50,-50,-50,-50,-50,-50,
+ -44,-44,-44,-44,-44,-44,-44,-44,-44,
+ -38,-38,-38,-38,-38,-38,-38,-38,-38,-38,-38,-38,
+ -32,-32,-32,-32,-32,-32,-32,-32,-32,-32,-32,-32,-32,-32,-32,
+ -26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,
+ -20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,
+ -14,-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,
+ -8,-8,-8,-8,-8,-8,-8,-8,-8,-8,-8,-8,-8,-8,-8,
+ -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
+ 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,
+ 28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,
+ 34,34,34,34,34,34,34,34,34,34,34,34,34,34,
+ 40,40,40,40,40,40,40,40,40,40,40,
+ 46,46,46,46,46,46,46,46,
+ 52,52,52,52,52,58,58
+
+
+ 240,0,300,240,0,0,0,0,300,240,0,0,0,0,0,0,0,300,
+ 240,0,0,0,0,0,0,0,0,0,0,300,240,0,0,0,0,0,0,0,0,0,0,0,0,0,300,
+ 180,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,
+ 180,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,
+ 180,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,
+ 180,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,
+ 180,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,
+ 120,0,0,0,0,0,0,0,0,0,0,0,0,60,120,0,0,0,0,0,0,0,0,0,60,
+ 120,0,0,0,0,0,0,60,120,0,0,0,60,120,60
+
+
+ 1,0,1,1,0,0,0,0,1,1,0,0,0,0,0,0,0,1,
+ 1,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,
+ 1,0,0,0,0,0,0,1,1,0,0,0,1,1,1
+
+
+
+
+
+
+
+
+ HGCalHECellCoarse, HGCalHECellCoarseHalf
+
+ -1,1,-4,-2,0,2,4,
+ -7,-5,-3,-1,1,3,5,7,
+ -10,-8,-6,-4,-2,0,2,4,6,8,10,
+ -11,-9,-7,-5,-3,-1,1,3,5,7,9,11,
+ -10,-8,-6,-4,-2,0,2,4,6,8,10,
+ -11,-9,-7,-5,-3,-1,1,3,5,7,9,11,
+ -10,-8,-6,-4,-2,0,2,4,6,8,10,
+ -11,-9,-7,-5,-3,-1,1,3,5,7,9,11,
+ -10,-8,-6,-4,-2,0,2,4,6,8,10,
+ -11,-9,-7,-5,-3,-1,1,3,5,7,9,11,
+ -10,-8,-6,-4,-2,0,2,4,6,8,10,
+ -7,-5,-3,-1,1,3,5,7,
+ -4,-2,0,2,4,-1,1
+
+
+ -42,-42,-36,-36,-36,-36,-36,
+ -30,-30,-30,-30,-30,-30,-30,-30,
+ -24,-24,-24,-24,-24,-24,-24,-24,-24,-24,-24,
+ -18,-18,-18,-18,-18,-18,-18,-18,-18,-18,-18,-18,
+ -12,-12,-12,-12,-12,-12,-12,-12,-12,-12,-12,
+ -6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,
+ 0,0,0,0,0,0,0,0,0,0,0,
+ 6,6,6,6,6,6,6,6,6,6,6,6,
+ 12,12,12,12,12,12,12,12,12,12,12,
+ 18,18,18,18,18,18,18,18,18,18,18,18,
+ 24,24,24,24,24,24,24,24,24,24,24,
+ 30,30,30,30,30,30,30,30,
+ 36,36,36,36,36,42,42
+
+
+ 240,300,240,0,0,0,300,240,0,0,0,0,0,0,300,240,0,0,0,0,0,0,0,0,0,300,
+ 180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 180,0,0,0,0,0,0,0,0,0,0,0,120,0,0,0,0,0,0,0,0,0,60,
+ 120,0,0,0,0,0,0,60,120,0,0,0,60,120,60
+
+
+ 1,1,1,0,0,0,1,1,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,
+ 1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+ 1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+ 1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+ 1,0,0,0,0,0,0,0,0,0,0,1,
+ 1,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,1,1,0,0,0,1,1,1
+
+
+
+
+
+
+
+
+ HGCalHECellFine, HGCalHECellFineHalf
+
+ -2,0,2,-5,-3,-1,1,3,5,
+ -8,-6,-4,-2,0,2,4,6,8,
+ -11,-9,-7,-5,-3,-1,1,3,5,7,9,11,
+ -14,-12,-10,-8,-6,-4,-2,0,2,4,6,8,10,12,14,
+ -15,-13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,15,
+ -14,-12,-10,-8,-6,-4,-2,0,2,4,6,8,10,12,14,
+ -15,-13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,15,
+ -14,-12,-10,-8,-6,-4,-2,0,2,4,6,8,10,12,14,
+ -15,-13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,15,
+ -14,-12,-10,-8,-6,-4,-2,0,2,4,6,8,10,12,14,
+ -15,-13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,15,
+ -14,-12,-10,-8,-6,-4,-2,0,2,4,6,8,10,12,14,
+ -15,-13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,15,
+ -14,-12,-10,-8,-6,-4,-2,0,2,4,6,8,10,12,14,
+ -13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,
+ -10,-8,-6,-4,-2,0,2,4,6,8,10,
+ -7,-5,-3,-1,1,3,5,7,
+ -4,-2,0,2,4,-1,1
+
+
+ -56,-56,-56,-50,-50,-50,-50,-50,-50,
+ -44,-44,-44,-44,-44,-44,-44,-44,-44,
+ -38,-38,-38,-38,-38,-38,-38,-38,-38,-38,-38,-38,
+ -32,-32,-32,-32,-32,-32,-32,-32,-32,-32,-32,-32,-32,-32,-32,
+ -26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,
+ -20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,
+ -14,-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,
+ -8,-8,-8,-8,-8,-8,-8,-8,-8,-8,-8,-8,-8,-8,-8,
+ -2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
+ 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+ 22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,
+ 28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,
+ 34,34,34,34,34,34,34,34,34,34,34,34,34,34,
+ 40,40,40,40,40,40,40,40,40,40,40,
+ 46,46,46,46,46,46,46,46,
+ 52,52,52,52,52,58,58
+
+
+ 240,0,300,240,0,0,0,0,300,240,0,0,0,0,0,0,0,300,
+ 240,0,0,0,0,0,0,0,0,0,0,300,240,0,0,0,0,0,0,0,0,0,0,0,0,0,300,
+ 180,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,
+ 180,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,
+ 180,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,
+ 180,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,
+ 180,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,
+ 120,0,0,0,0,0,0,0,0,0,0,0,0,60,120,0,0,0,0,0,0,0,0,0,60,
+ 120,0,0,0,0,0,0,60,120,0,0,0,60,120,60
+
+
+ 1,0,1,1,0,0,0,0,1,1,0,0,0,0,0,0,0,1,
+ 1,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,
+ 1,0,0,0,0,0,0,1,1,0,0,0,1,1,1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB160Module16XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB160Module16XML_cfi.py
index 9f69978e8e075..b6f3a557ff444 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB160Module16XML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB160Module16XML_cfi.py
@@ -3,14 +3,14 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/TB160/cms.xml',
- 'Geometry/HGCalCommonData/data/TB160/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB160/16Module/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB160/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/TB160/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB160/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB160/16Module/hgcalCons.xml'),
+ 'Geometry/HGCalTBCommonData/data/TB160/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB160/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB160/16Module/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB160/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/TB160/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB160/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB160/16Module/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB160Module4XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB160Module4XML_cfi.py
index d248eaaa056b2..f926cd2c3279e 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB160Module4XML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB160Module4XML_cfi.py
@@ -3,14 +3,14 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/TB160/cms.xml',
- 'Geometry/HGCalCommonData/data/TB160/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB160/4Module/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB160/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/TB160/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB160/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB160/4Module/hgcalCons.xml'),
+ 'Geometry/HGCalTBCommonData/data/TB160/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB160/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB160/4Module/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB160/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/TB160/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB160/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB160/4Module/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB160XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB160XML_cfi.py
index bc9eeef793b6d..c3d5e78972762 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB160XML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB160XML_cfi.py
@@ -3,14 +3,14 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/TB160/cms.xml',
- 'Geometry/HGCalCommonData/data/TB160/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB160/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB160/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/TB160/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB160/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB160/hgcalCons.xml'),
+ 'Geometry/HGCalTBCommonData/data/TB160/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB160/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB160/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB160/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/TB160/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB160/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB160/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB161Module1XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB161Module1XML_cfi.py
index 6c0ee4a27c1e0..dc30dfeb6ffe7 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB161Module1XML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB161Module1XML_cfi.py
@@ -3,14 +3,14 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/TB161/cms.xml',
- 'Geometry/HGCalCommonData/data/TB161/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB161/1Module/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB161/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/TB161/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB161/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB161/1Module/hgcalCons.xml'),
+ 'Geometry/HGCalTBCommonData/data/TB161/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/1Module/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/1Module/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB161Module8V2XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB161Module8V2XML_cfi.py
index 48768c929a6a2..c0ab86fa8a208 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB161Module8V2XML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB161Module8V2XML_cfi.py
@@ -3,14 +3,14 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/TB161/cms.xml',
- 'Geometry/HGCalCommonData/data/TB161/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB161/8ModuleV2/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB161/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/TB161/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB161/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB161/8Module/hgcalCons.xml'),
+ 'Geometry/HGCalTBCommonData/data/TB161/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/8ModuleV2/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/8Module/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB161Module8XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB161Module8XML_cfi.py
index 1824ec9e12399..4fa108b5d7d4d 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB161Module8XML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB161Module8XML_cfi.py
@@ -3,14 +3,14 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/TB161/cms.xml',
- 'Geometry/HGCalCommonData/data/TB161/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB161/8Module/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB161/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/TB161/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB161/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB161/8Module/hgcalCons.xml'),
+ 'Geometry/HGCalTBCommonData/data/TB161/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/8Module/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/8Module/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB161TimingLayerXML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB161TimingLayerXML_cfi.py
index 89cfbaa2c8799..d88b4a26ad70a 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB161TimingLayerXML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB161TimingLayerXML_cfi.py
@@ -3,14 +3,14 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/TB161/cms.xml',
- 'Geometry/HGCalCommonData/data/TB161/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB161/TimingLayer/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB161/TimingLayer/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/TB161/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB161/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB161/TimingLayer/hgcalCons.xml'),
+ 'Geometry/HGCalTBCommonData/data/TB161/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/TimingLayer/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/TimingLayer/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB161/TimingLayer/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB170FH6SqueezeXML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB170FH6SqueezeXML_cfi.py
index f350a81e6b6d3..534abb04a6c61 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB170FH6SqueezeXML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB170FH6SqueezeXML_cfi.py
@@ -3,16 +3,16 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/TB170/cms.xml',
- 'Geometry/HGCalCommonData/data/TB170/6Module/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/TB170/6Module/hgcalHE.xml',
- 'Geometry/HGCalCommonData/data/TB170/ahcal.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalCons.xml'),
+ 'Geometry/HGCalTBCommonData/data/TB170/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/6Module/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/6Module/hgcalHE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/ahcal.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB170FH6XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB170FH6XML_cfi.py
index 014ea7e595319..7602fca65755d 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB170FH6XML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB170FH6XML_cfi.py
@@ -3,16 +3,16 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/TB170/cms.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/TB170/6Module/hgcalHE.xml',
- 'Geometry/HGCalCommonData/data/TB170/ahcal.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalCons.xml'),
+ 'Geometry/HGCalTBCommonData/data/TB170/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/6Module/hgcalHE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/ahcal.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB170JulyXML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB170JulyXML_cfi.py
index fe069a3ef1cbc..34c936e0fb89d 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB170JulyXML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB170JulyXML_cfi.py
@@ -3,16 +3,16 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/TB170/cms.xml',
- 'Geometry/HGCalCommonData/data/TB170/July17/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB170/July17/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/TB170/July17/hgcalHE.xml',
- 'Geometry/HGCalCommonData/data/TB170/July17/ahcal.xml',
- 'Geometry/HGCalCommonData/data/TB170/July17/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB170/July17/hgcalCons.xml'
+ 'Geometry/HGCalTBCommonData/data/TB170/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/July17/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/July17/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/July17/hgcalHE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/July17/ahcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/July17/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/July17/hgcalCons.xml'
),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB170SepXML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB170SepXML_cfi.py
index 40acbc92e9225..6bae8e073cfe6 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB170SepXML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB170SepXML_cfi.py
@@ -3,16 +3,16 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/TB170/cms.xml',
- 'Geometry/HGCalCommonData/data/TB170/Sep17/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB170/Sep17/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/TB170/Sep17/hgcalHE.xml',
- 'Geometry/HGCalCommonData/data/TB170/July17/ahcal.xml',
- 'Geometry/HGCalCommonData/data/TB170/July17/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB170/Sep17/hgcalCons.xml'
+ 'Geometry/HGCalTBCommonData/data/TB170/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcalHE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/July17/ahcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/July17/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcalCons.xml'
),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB170ShiftedXML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB170ShiftedXML_cfi.py
index 0d1e91aeacc02..ca8d2bc9199dc 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB170ShiftedXML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB170ShiftedXML_cfi.py
@@ -3,16 +3,16 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/TB170/cms.xml',
- 'Geometry/HGCalCommonData/data/TB170/Shifted/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalHE.xml',
- 'Geometry/HGCalCommonData/data/TB170/ahcal.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalCons.xml'),
+ 'Geometry/HGCalTBCommonData/data/TB170/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/Shifted/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalHE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/ahcal.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB170XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB170XML_cfi.py
index c326893e645a1..adaabeabf7c63 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB170XML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB170XML_cfi.py
@@ -3,16 +3,16 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/TB170/cms.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalHE.xml',
- 'Geometry/HGCalCommonData/data/TB170/ahcal.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB170/hgcalCons.xml'),
+ 'Geometry/HGCalTBCommonData/data/TB170/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalHE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/ahcal.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB170/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB180A12XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB180A12XML_cfi.py
index b10acf45e097a..63519fefd1543 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB180A12XML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB180A12XML_cfi.py
@@ -3,14 +3,14 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/TB180/cms.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/TB180/Absorb12/hgcalAbsorber.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcalCons.xml'),
+ 'Geometry/HGCalTBCommonData/data/TB180/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/Absorb12/hgcalAbsorber.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB180A16XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB180A16XML_cfi.py
index 4720258aa4f8f..e4fee1c627ed0 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB180A16XML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB180A16XML_cfi.py
@@ -3,14 +3,14 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/TB180/cms.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/TB180/Absorb16/hgcalAbsorber.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcalCons.xml'),
+ 'Geometry/HGCalTBCommonData/data/TB180/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/Absorb16/hgcalAbsorber.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB180A20XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB180A20XML_cfi.py
index 9fb66f6e010be..ac5681a312327 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB180A20XML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB180A20XML_cfi.py
@@ -3,14 +3,14 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/TB180/cms.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/TB180/Absorb20/hgcalAbsorber.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcalCons.xml'),
+ 'Geometry/HGCalTBCommonData/data/TB180/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/Absorb20/hgcalAbsorber.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB180A22XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB180A22XML_cfi.py
index 3f135f6f344c6..f7b0f46b43ea8 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB180A22XML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB180A22XML_cfi.py
@@ -3,14 +3,14 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/TB180/cms.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/TB180/Absorb22/hgcalAbsorber.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB180/hgcalCons.xml'),
+ 'Geometry/HGCalTBCommonData/data/TB180/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/Absorb22/hgcalAbsorber.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB180/hgcalCons.xml'),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB181JuneXML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB181JuneXML_cfi.py
index 8bcae7eacd89f..dc27d6d8ac63f 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB181JuneXML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB181JuneXML_cfi.py
@@ -4,15 +4,15 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
- 'Geometry/HGCalCommonData/data/TB181/cms.xml',
- 'Geometry/HGCalCommonData/data/TB181/June18/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB181/June18/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/TB181/June18/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB181/June18/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB181/June18/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB181/June18/hgcalCons.xml'
+ 'Geometry/HGCalTBCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/June18/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/June18/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/June18/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/June18/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/June18/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/June18/hgcalCons.xml'
),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct0XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct0XML_cfi.py
index ba8b18caaa203..2ced6119fe87f 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct0XML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct0XML_cfi.py
@@ -3,17 +3,17 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
- 'Geometry/HGCalCommonData/data/TB181/cms.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalHE.xml',
- 'Geometry/HGCalCommonData/data/TB181/ahcal.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct180/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB181/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml'
+ 'Geometry/HGCalTBCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalHE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/ahcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct180/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml'
),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct1PC1mmXML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct1PC1mmXML_cfi.py
index 98c808dd36fef..a41d4b576c2be 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct1PC1mmXML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct1PC1mmXML_cfi.py
@@ -3,17 +3,17 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/cms.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalHE.xml',
- 'Geometry/HGCalCommonData/data/TB181/ahcal.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml'
+ 'Geometry/HGCalTBCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalHE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/ahcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml'
),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct1XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct1XML_cfi.py
index bc242186b2635..a599279a86423 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct1XML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct1XML_cfi.py
@@ -3,17 +3,17 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/cms.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalHE.xml',
- 'Geometry/HGCalCommonData/data/TB181/ahcal.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB181/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml'
+ 'Geometry/HGCalTBCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalHE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/ahcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml'
),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct2XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct2XML_cfi.py
index 4554ff27ccda9..30bc0580de6b3 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct2XML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct2XML_cfi.py
@@ -3,17 +3,17 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/cms.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct182/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct182/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct182/hgcalHE.xml',
- 'Geometry/HGCalCommonData/data/TB181/ahcal.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct182/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB181/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml'
+ 'Geometry/HGCalTBCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcalHE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/ahcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml'
),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct3XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct3XML_cfi.py
index b37cf29acb7aa..3a061d82dfa93 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct3XML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct3XML_cfi.py
@@ -3,17 +3,17 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/cms.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct183/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct183/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct183/hgcalHE.xml',
- 'Geometry/HGCalCommonData/data/TB181/ahcal.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct183/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB181/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml'
+ 'Geometry/HGCalTBCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcalHE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/ahcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml'
),
rootNodeName = cms.string('cms:OCMS')
)
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct4XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct4XML_cfi.py
index c1d2ed9842265..0f11e3975b178 100644
--- a/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct4XML_cfi.py
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct4XML_cfi.py
@@ -3,17 +3,17 @@
XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
- 'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/cms.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct184/hgcal.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct184/hgcalEE.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalHE.xml',
- 'Geometry/HGCalCommonData/data/TB181/ahcal.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalBeam.xml',
- 'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalsense.xml',
- 'Geometry/HGCalCommonData/data/TB181/hgcProdCuts.xml',
- 'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml'
+ 'Geometry/HGCalTBCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/cms.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct184/hgcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct184/hgcalEE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalHE.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/ahcal.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalBeam.xml',
+ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml',
+ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml'
),
rootNodeName = cms.string('cms:OCMS')
)