diff --git a/Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml b/Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml
index af12104d3c274..87764cadba8e0 100644
--- a/Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml
+++ b/Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml
@@ -139,6 +139,7 @@
+
@@ -146,6 +147,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/HGCalCommonData/data/hgcalEE/v18/hgcalEE.xml b/Geometry/HGCalCommonData/data/hgcalEE/v18/hgcalEE.xml
index c113e3cebd41f..33a8bdab9d6f9 100644
--- a/Geometry/HGCalCommonData/data/hgcalEE/v18/hgcalEE.xml
+++ b/Geometry/HGCalCommonData/data/hgcalEE/v18/hgcalEE.xml
@@ -13,6 +13,7 @@
+
diff --git a/Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml b/Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml
index 2813eb04ad5d2..4fbdc2c7f7c17 100644
--- a/Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml
+++ b/Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml
@@ -13,6 +13,7 @@
+
@@ -141,210 +142,88 @@
hgcalwafer:HGCalEEWafer06Coarse2LD6, hgcalwafer:HGCalEEWafer07Coarse2LD6,
hgcalwafer:HGCalEEWafer08Coarse2LD6, hgcalwafer:HGCalEEWafer09Coarse2LD6,
hgcalwafer:HGCalEEWafer10Coarse2LD6, hgcalwafer:HGCalEEWafer11Coarse2LD6
-
- hgcalPassive:HGCalEEPassive1, hgcalPassive:HGCalEEPassive2,
- hgcalPassive:HGCalEEPassive3
-
- hgcalPassive:HGCalEEPassive100HD1, hgcalPassive:HGCalEEPassive101HD1,
- hgcalPassive:HGCalEEPassive102HD1, hgcalPassive:HGCalEEPassive103HD1,
- hgcalPassive:HGCalEEPassive104HD1, hgcalPassive:HGCalEEPassive105HD1,
- hgcalPassive:HGCalEEPassive106HD1, hgcalPassive:HGCalEEPassive107HD1,
- hgcalPassive:HGCalEEPassive108HD1, hgcalPassive:HGCalEEPassive109HD1,
- hgcalPassive:HGCalEEPassive110HD1, hgcalPassive:HGCalEEPassive111HD1,
- hgcalPassive:HGCalEEPassive100HD2, hgcalPassive:HGCalEEPassive101HD2,
- hgcalPassive:HGCalEEPassive102HD2, hgcalPassive:HGCalEEPassive103HD2,
- hgcalPassive:HGCalEEPassive104HD2, hgcalPassive:HGCalEEPassive105HD2,
- hgcalPassive:HGCalEEPassive106HD2, hgcalPassive:HGCalEEPassive107HD2,
- hgcalPassive:HGCalEEPassive108HD2, hgcalPassive:HGCalEEPassive109HD2,
- hgcalPassive:HGCalEEPassive110HD2, hgcalPassive:HGCalEEPassive111HD2,
- hgcalPassive:HGCalEEPassive100HD3, hgcalPassive:HGCalEEPassive101HD3,
- hgcalPassive:HGCalEEPassive102HD3, hgcalPassive:HGCalEEPassive103HD3,
- hgcalPassive:HGCalEEPassive104HD3, hgcalPassive:HGCalEEPassive105HD3,
- hgcalPassive:HGCalEEPassive106HD3, hgcalPassive:HGCalEEPassive107HD3,
- hgcalPassive:HGCalEEPassive108HD3, hgcalPassive:HGCalEEPassive109HD3,
- hgcalPassive:HGCalEEPassive110HD3, hgcalPassive:HGCalEEPassive111HD3,
- hgcalPassive:HGCalEEPassive100HD4, hgcalPassive:HGCalEEPassive101HD4,
- hgcalPassive:HGCalEEPassive102HD4, hgcalPassive:HGCalEEPassive103HD4,
- hgcalPassive:HGCalEEPassive104HD4, hgcalPassive:HGCalEEPassive105HD4,
- hgcalPassive:HGCalEEPassive106HD4, hgcalPassive:HGCalEEPassive107HD4,
- hgcalPassive:HGCalEEPassive108HD4, hgcalPassive:HGCalEEPassive109HD4,
- hgcalPassive:HGCalEEPassive110HD4, hgcalPassive:HGCalEEPassive111HD4,
- hgcalPassive:HGCalEEPassive100HD5, hgcalPassive:HGCalEEPassive101HD5,
- hgcalPassive:HGCalEEPassive102HD5, hgcalPassive:HGCalEEPassive103HD5,
- hgcalPassive:HGCalEEPassive104HD5, hgcalPassive:HGCalEEPassive105HD5,
- hgcalPassive:HGCalEEPassive106HD5, hgcalPassive:HGCalEEPassive107HD5,
- hgcalPassive:HGCalEEPassive108HD5, hgcalPassive:HGCalEEPassive109HD5,
- hgcalPassive:HGCalEEPassive110HD5, hgcalPassive:HGCalEEPassive111HD5,
- hgcalPassive:HGCalEEPassive100LD1, hgcalPassive:HGCalEEPassive101LD1,
- hgcalPassive:HGCalEEPassive102LD1, hgcalPassive:HGCalEEPassive103LD1,
- hgcalPassive:HGCalEEPassive104LD1, hgcalPassive:HGCalEEPassive105LD1,
- hgcalPassive:HGCalEEPassive106LD1, hgcalPassive:HGCalEEPassive107LD1,
- hgcalPassive:HGCalEEPassive108LD1, hgcalPassive:HGCalEEPassive109LD1,
- hgcalPassive:HGCalEEPassive110LD1, hgcalPassive:HGCalEEPassive111LD1,
- hgcalPassive:HGCalEEPassive100LD2, hgcalPassive:HGCalEEPassive101LD2,
- hgcalPassive:HGCalEEPassive102LD2, hgcalPassive:HGCalEEPassive103LD2,
- hgcalPassive:HGCalEEPassive104LD2, hgcalPassive:HGCalEEPassive105LD2,
- hgcalPassive:HGCalEEPassive106LD2, hgcalPassive:HGCalEEPassive107LD2,
- hgcalPassive:HGCalEEPassive108LD2, hgcalPassive:HGCalEEPassive109LD2,
- hgcalPassive:HGCalEEPassive110LD2, hgcalPassive:HGCalEEPassive111LD2,
- hgcalPassive:HGCalEEPassive100LD3, hgcalPassive:HGCalEEPassive101LD3,
- hgcalPassive:HGCalEEPassive102LD3, hgcalPassive:HGCalEEPassive103LD3,
- hgcalPassive:HGCalEEPassive104LD3, hgcalPassive:HGCalEEPassive105LD3,
- hgcalPassive:HGCalEEPassive106LD3, hgcalPassive:HGCalEEPassive107LD3,
- hgcalPassive:HGCalEEPassive108LD3, hgcalPassive:HGCalEEPassive109LD3,
- hgcalPassive:HGCalEEPassive110LD3, hgcalPassive:HGCalEEPassive111LD3,
- hgcalPassive:HGCalEEPassive100LD4, hgcalPassive:HGCalEEPassive101LD4,
- hgcalPassive:HGCalEEPassive102LD4, hgcalPassive:HGCalEEPassive103LD4,
- hgcalPassive:HGCalEEPassive104LD4, hgcalPassive:HGCalEEPassive105LD4,
- hgcalPassive:HGCalEEPassive106LD4, hgcalPassive:HGCalEEPassive107LD4,
- hgcalPassive:HGCalEEPassive108LD4, hgcalPassive:HGCalEEPassive109LD4,
- hgcalPassive:HGCalEEPassive110LD4, hgcalPassive:HGCalEEPassive111LD4,
- hgcalPassive:HGCalEEPassive100LD5, hgcalPassive:HGCalEEPassive101LD5,
- hgcalPassive:HGCalEEPassive102LD5, hgcalPassive:HGCalEEPassive103LD5,
- hgcalPassive:HGCalEEPassive104LD5, hgcalPassive:HGCalEEPassive105LD5,
- hgcalPassive:HGCalEEPassive106LD5, hgcalPassive:HGCalEEPassive107LD5,
- hgcalPassive:HGCalEEPassive108LD5, hgcalPassive:HGCalEEPassive109LD5,
- hgcalPassive:HGCalEEPassive110LD5, hgcalPassive:HGCalEEPassive111LD5,
- hgcalPassive:HGCalEEPassive100LD6, hgcalPassive:HGCalEEPassive101LD6,
- hgcalPassive:HGCalEEPassive102LD6, hgcalPassive:HGCalEEPassive103LD6,
- hgcalPassive:HGCalEEPassive104LD6, hgcalPassive:HGCalEEPassive105LD6,
- hgcalPassive:HGCalEEPassive106LD6, hgcalPassive:HGCalEEPassive107LD6,
- hgcalPassive:HGCalEEPassive108LD6, hgcalPassive:HGCalEEPassive109LD6,
- hgcalPassive:HGCalEEPassive110LD6, hgcalPassive:HGCalEEPassive111LD6,
- hgcalPassive:HGCalEEPassive200HD1, hgcalPassive:HGCalEEPassive201HD1,
- hgcalPassive:HGCalEEPassive202HD1, hgcalPassive:HGCalEEPassive203HD1,
- hgcalPassive:HGCalEEPassive204HD1, hgcalPassive:HGCalEEPassive205HD1,
- hgcalPassive:HGCalEEPassive206HD1, hgcalPassive:HGCalEEPassive207HD1,
- hgcalPassive:HGCalEEPassive208HD1, hgcalPassive:HGCalEEPassive209HD1,
- hgcalPassive:HGCalEEPassive210HD1, hgcalPassive:HGCalEEPassive211HD1,
- hgcalPassive:HGCalEEPassive200HD2, hgcalPassive:HGCalEEPassive201HD2,
- hgcalPassive:HGCalEEPassive202HD2, hgcalPassive:HGCalEEPassive203HD2,
- hgcalPassive:HGCalEEPassive204HD2, hgcalPassive:HGCalEEPassive205HD2,
- hgcalPassive:HGCalEEPassive206HD2, hgcalPassive:HGCalEEPassive207HD2,
- hgcalPassive:HGCalEEPassive208HD2, hgcalPassive:HGCalEEPassive209HD2,
- hgcalPassive:HGCalEEPassive210HD2, hgcalPassive:HGCalEEPassive211HD2,
- hgcalPassive:HGCalEEPassive200HD3, hgcalPassive:HGCalEEPassive201HD3,
- hgcalPassive:HGCalEEPassive202HD3, hgcalPassive:HGCalEEPassive203HD3,
- hgcalPassive:HGCalEEPassive204HD3, hgcalPassive:HGCalEEPassive205HD3,
- hgcalPassive:HGCalEEPassive206HD3, hgcalPassive:HGCalEEPassive207HD3,
- hgcalPassive:HGCalEEPassive208HD3, hgcalPassive:HGCalEEPassive209HD3,
- hgcalPassive:HGCalEEPassive210HD3, hgcalPassive:HGCalEEPassive211HD3,
- hgcalPassive:HGCalEEPassive200HD4, hgcalPassive:HGCalEEPassive201HD4,
- hgcalPassive:HGCalEEPassive202HD4, hgcalPassive:HGCalEEPassive203HD4,
- hgcalPassive:HGCalEEPassive204HD4, hgcalPassive:HGCalEEPassive205HD4,
- hgcalPassive:HGCalEEPassive206HD4, hgcalPassive:HGCalEEPassive207HD4,
- hgcalPassive:HGCalEEPassive208HD4, hgcalPassive:HGCalEEPassive209HD4,
- hgcalPassive:HGCalEEPassive210HD4, hgcalPassive:HGCalEEPassive211HD4,
- hgcalPassive:HGCalEEPassive200HD5, hgcalPassive:HGCalEEPassive201HD5,
- hgcalPassive:HGCalEEPassive202HD5, hgcalPassive:HGCalEEPassive203HD5,
- hgcalPassive:HGCalEEPassive204HD5, hgcalPassive:HGCalEEPassive205HD5,
- hgcalPassive:HGCalEEPassive206HD5, hgcalPassive:HGCalEEPassive207HD5,
- hgcalPassive:HGCalEEPassive208HD5, hgcalPassive:HGCalEEPassive209HD5,
- hgcalPassive:HGCalEEPassive210HD5, hgcalPassive:HGCalEEPassive211HD5,
- hgcalPassive:HGCalEEPassive200LD1, hgcalPassive:HGCalEEPassive201LD1,
- hgcalPassive:HGCalEEPassive202LD1, hgcalPassive:HGCalEEPassive203LD1,
- hgcalPassive:HGCalEEPassive204LD1, hgcalPassive:HGCalEEPassive205LD1,
- hgcalPassive:HGCalEEPassive206LD1, hgcalPassive:HGCalEEPassive207LD1,
- hgcalPassive:HGCalEEPassive208LD1, hgcalPassive:HGCalEEPassive209LD1,
- hgcalPassive:HGCalEEPassive210LD1, hgcalPassive:HGCalEEPassive211LD1,
- hgcalPassive:HGCalEEPassive200LD2, hgcalPassive:HGCalEEPassive201LD2,
- hgcalPassive:HGCalEEPassive202LD2, hgcalPassive:HGCalEEPassive203LD2,
- hgcalPassive:HGCalEEPassive204LD2, hgcalPassive:HGCalEEPassive205LD2,
- hgcalPassive:HGCalEEPassive206LD2, hgcalPassive:HGCalEEPassive207LD2,
- hgcalPassive:HGCalEEPassive208LD2, hgcalPassive:HGCalEEPassive209LD2,
- hgcalPassive:HGCalEEPassive210LD2, hgcalPassive:HGCalEEPassive211LD2,
- hgcalPassive:HGCalEEPassive200LD3, hgcalPassive:HGCalEEPassive201LD3,
- hgcalPassive:HGCalEEPassive202LD3, hgcalPassive:HGCalEEPassive203LD3,
- hgcalPassive:HGCalEEPassive204LD3, hgcalPassive:HGCalEEPassive205LD3,
- hgcalPassive:HGCalEEPassive206LD3, hgcalPassive:HGCalEEPassive207LD3,
- hgcalPassive:HGCalEEPassive208LD3, hgcalPassive:HGCalEEPassive209LD3,
- hgcalPassive:HGCalEEPassive210LD3, hgcalPassive:HGCalEEPassive211LD3,
- hgcalPassive:HGCalEEPassive200LD4, hgcalPassive:HGCalEEPassive201LD4,
- hgcalPassive:HGCalEEPassive202LD4, hgcalPassive:HGCalEEPassive203LD4,
- hgcalPassive:HGCalEEPassive204LD4, hgcalPassive:HGCalEEPassive205LD4,
- hgcalPassive:HGCalEEPassive206LD4, hgcalPassive:HGCalEEPassive207LD4,
- hgcalPassive:HGCalEEPassive208LD4, hgcalPassive:HGCalEEPassive209LD4,
- hgcalPassive:HGCalEEPassive210LD4, hgcalPassive:HGCalEEPassive211LD4,
- hgcalPassive:HGCalEEPassive200LD5, hgcalPassive:HGCalEEPassive201LD5,
- hgcalPassive:HGCalEEPassive202LD5, hgcalPassive:HGCalEEPassive203LD5,
- hgcalPassive:HGCalEEPassive204LD5, hgcalPassive:HGCalEEPassive205LD5,
- hgcalPassive:HGCalEEPassive206LD5, hgcalPassive:HGCalEEPassive207LD5,
- hgcalPassive:HGCalEEPassive208LD5, hgcalPassive:HGCalEEPassive209LD5,
- hgcalPassive:HGCalEEPassive210LD5, hgcalPassive:HGCalEEPassive211LD5,
- hgcalPassive:HGCalEEPassive200LD6, hgcalPassive:HGCalEEPassive201LD6,
- hgcalPassive:HGCalEEPassive202LD6, hgcalPassive:HGCalEEPassive203LD6,
- hgcalPassive:HGCalEEPassive204LD6, hgcalPassive:HGCalEEPassive205LD6,
- hgcalPassive:HGCalEEPassive206LD6, hgcalPassive:HGCalEEPassive207LD6,
- hgcalPassive:HGCalEEPassive208LD6, hgcalPassive:HGCalEEPassive209LD6,
- hgcalPassive:HGCalEEPassive210LD6, hgcalPassive:HGCalEEPassive211LD6,
- hgcalPassive:HGCalEEPassive300HD1, hgcalPassive:HGCalEEPassive301HD1,
- hgcalPassive:HGCalEEPassive302HD1, hgcalPassive:HGCalEEPassive303HD1,
- hgcalPassive:HGCalEEPassive304HD1, hgcalPassive:HGCalEEPassive305HD1,
- hgcalPassive:HGCalEEPassive306HD1, hgcalPassive:HGCalEEPassive307HD1,
- hgcalPassive:HGCalEEPassive308HD1, hgcalPassive:HGCalEEPassive309HD1,
- hgcalPassive:HGCalEEPassive310HD1, hgcalPassive:HGCalEEPassive311HD1,
- hgcalPassive:HGCalEEPassive300HD2, hgcalPassive:HGCalEEPassive301HD2,
- hgcalPassive:HGCalEEPassive302HD2, hgcalPassive:HGCalEEPassive303HD2,
- hgcalPassive:HGCalEEPassive304HD2, hgcalPassive:HGCalEEPassive305HD2,
- hgcalPassive:HGCalEEPassive306HD2, hgcalPassive:HGCalEEPassive307HD2,
- hgcalPassive:HGCalEEPassive308HD2, hgcalPassive:HGCalEEPassive309HD2,
- hgcalPassive:HGCalEEPassive310HD2, hgcalPassive:HGCalEEPassive311HD2,
- hgcalPassive:HGCalEEPassive300HD3, hgcalPassive:HGCalEEPassive301HD3,
- hgcalPassive:HGCalEEPassive302HD3, hgcalPassive:HGCalEEPassive303HD3,
- hgcalPassive:HGCalEEPassive304HD3, hgcalPassive:HGCalEEPassive305HD3,
- hgcalPassive:HGCalEEPassive306HD3, hgcalPassive:HGCalEEPassive307HD3,
- hgcalPassive:HGCalEEPassive308HD3, hgcalPassive:HGCalEEPassive309HD3,
- hgcalPassive:HGCalEEPassive310HD3, hgcalPassive:HGCalEEPassive311HD3,
- hgcalPassive:HGCalEEPassive300HD4, hgcalPassive:HGCalEEPassive301HD4,
- hgcalPassive:HGCalEEPassive302HD4, hgcalPassive:HGCalEEPassive303HD4,
- hgcalPassive:HGCalEEPassive304HD4, hgcalPassive:HGCalEEPassive305HD4,
- hgcalPassive:HGCalEEPassive306HD4, hgcalPassive:HGCalEEPassive307HD4,
- hgcalPassive:HGCalEEPassive308HD4, hgcalPassive:HGCalEEPassive309HD4,
- hgcalPassive:HGCalEEPassive310HD4, hgcalPassive:HGCalEEPassive311HD4,
- hgcalPassive:HGCalEEPassive300HD5, hgcalPassive:HGCalEEPassive301HD5,
- hgcalPassive:HGCalEEPassive302HD5, hgcalPassive:HGCalEEPassive303HD5,
- hgcalPassive:HGCalEEPassive304HD5, hgcalPassive:HGCalEEPassive305HD5,
- hgcalPassive:HGCalEEPassive306HD5, hgcalPassive:HGCalEEPassive307HD5,
- hgcalPassive:HGCalEEPassive308HD5, hgcalPassive:HGCalEEPassive309HD5,
- hgcalPassive:HGCalEEPassive310HD5, hgcalPassive:HGCalEEPassive311HD5,
- hgcalPassive:HGCalEEPassive300LD1, hgcalPassive:HGCalEEPassive301LD1,
- hgcalPassive:HGCalEEPassive302LD1, hgcalPassive:HGCalEEPassive303LD1,
- hgcalPassive:HGCalEEPassive304LD1, hgcalPassive:HGCalEEPassive305LD1,
- hgcalPassive:HGCalEEPassive306LD1, hgcalPassive:HGCalEEPassive307LD1,
- hgcalPassive:HGCalEEPassive308LD1, hgcalPassive:HGCalEEPassive309LD1,
- hgcalPassive:HGCalEEPassive310LD1, hgcalPassive:HGCalEEPassive311LD1,
- hgcalPassive:HGCalEEPassive300LD2, hgcalPassive:HGCalEEPassive301LD2,
- hgcalPassive:HGCalEEPassive302LD2, hgcalPassive:HGCalEEPassive303LD2,
- hgcalPassive:HGCalEEPassive304LD2, hgcalPassive:HGCalEEPassive305LD2,
- hgcalPassive:HGCalEEPassive306LD2, hgcalPassive:HGCalEEPassive307LD2,
- hgcalPassive:HGCalEEPassive308LD2, hgcalPassive:HGCalEEPassive309LD2,
- hgcalPassive:HGCalEEPassive310LD2, hgcalPassive:HGCalEEPassive311LD2,
- hgcalPassive:HGCalEEPassive300LD3, hgcalPassive:HGCalEEPassive301LD3,
- hgcalPassive:HGCalEEPassive302LD3, hgcalPassive:HGCalEEPassive303LD3,
- hgcalPassive:HGCalEEPassive304LD3, hgcalPassive:HGCalEEPassive305LD3,
- hgcalPassive:HGCalEEPassive306LD3, hgcalPassive:HGCalEEPassive307LD3,
- hgcalPassive:HGCalEEPassive308LD3, hgcalPassive:HGCalEEPassive309LD3,
- hgcalPassive:HGCalEEPassive310LD3, hgcalPassive:HGCalEEPassive311LD3,
- hgcalPassive:HGCalEEPassive300LD4, hgcalPassive:HGCalEEPassive301LD4,
- hgcalPassive:HGCalEEPassive302LD4, hgcalPassive:HGCalEEPassive303LD4,
- hgcalPassive:HGCalEEPassive304LD4, hgcalPassive:HGCalEEPassive305LD4,
- hgcalPassive:HGCalEEPassive306LD4, hgcalPassive:HGCalEEPassive307LD4,
- hgcalPassive:HGCalEEPassive308LD4, hgcalPassive:HGCalEEPassive309LD4,
- hgcalPassive:HGCalEEPassive310LD4, hgcalPassive:HGCalEEPassive311LD4,
- hgcalPassive:HGCalEEPassive300LD5, hgcalPassive:HGCalEEPassive301LD5,
- hgcalPassive:HGCalEEPassive302LD5, hgcalPassive:HGCalEEPassive303LD5,
- hgcalPassive:HGCalEEPassive304LD5, hgcalPassive:HGCalEEPassive305LD5,
- hgcalPassive:HGCalEEPassive306LD5, hgcalPassive:HGCalEEPassive307LD5,
- hgcalPassive:HGCalEEPassive308LD5, hgcalPassive:HGCalEEPassive309LD5,
- hgcalPassive:HGCalEEPassive310LD5, hgcalPassive:HGCalEEPassive311LD5,
- hgcalPassive:HGCalEEPassive300LD6, hgcalPassive:HGCalEEPassive301LD6,
- hgcalPassive:HGCalEEPassive302LD6, hgcalPassive:HGCalEEPassive303LD6,
- hgcalPassive:HGCalEEPassive304LD6, hgcalPassive:HGCalEEPassive305LD6,
- hgcalPassive:HGCalEEPassive306LD6, hgcalPassive:HGCalEEPassive307LD6,
- hgcalPassive:HGCalEEPassive308LD6, hgcalPassive:HGCalEEPassive309LD6,
- hgcalPassive:HGCalEEPassive310LD6, hgcalPassive:HGCalEEPassive311LD6
+
+ hgcalPassive:HGCalEEPassiveL01F00, hgcalPassive:HGCalEEPassiveL01F01,
+ hgcalPassive:HGCalEEPassiveL01F02, hgcalPassive:HGCalEEPassiveL01F03,
+ hgcalPassive:HGCalEEPassiveL01F04, hgcalPassive:HGCalEEPassiveL01F05,
+ hgcalPassive:HGCalEEPassiveL02F00, hgcalPassive:HGCalEEPassiveL02F01,
+ hgcalPassive:HGCalEEPassiveL02F02, hgcalPassive:HGCalEEPassiveL02F03,
+ hgcalPassive:HGCalEEPassiveL02F04, hgcalPassive:HGCalEEPassiveL02F05,
+ hgcalPassive:HGCalEEPassiveL03F00, hgcalPassive:HGCalEEPassiveL03F01,
+ hgcalPassive:HGCalEEPassiveL03F02, hgcalPassive:HGCalEEPassiveL03F03,
+ hgcalPassive:HGCalEEPassiveL03F04, hgcalPassive:HGCalEEPassiveL03F05,
+ hgcalPassive:HGCalEEPassiveL04F00, hgcalPassive:HGCalEEPassiveL04F01,
+ hgcalPassive:HGCalEEPassiveL04F02, hgcalPassive:HGCalEEPassiveL04F03,
+ hgcalPassive:HGCalEEPassiveL04F04, hgcalPassive:HGCalEEPassiveL04F05,
+ hgcalPassive:HGCalEEPassiveL05F00, hgcalPassive:HGCalEEPassiveL05F01,
+ hgcalPassive:HGCalEEPassiveL05F02, hgcalPassive:HGCalEEPassiveL05F03,
+ hgcalPassive:HGCalEEPassiveL05F04, hgcalPassive:HGCalEEPassiveL05F05,
+ hgcalPassive:HGCalEEPassiveL06F00, hgcalPassive:HGCalEEPassiveL06F01,
+ hgcalPassive:HGCalEEPassiveL06F02, hgcalPassive:HGCalEEPassiveL06F03,
+ hgcalPassive:HGCalEEPassiveL06F04, hgcalPassive:HGCalEEPassiveL06F05,
+ hgcalPassive:HGCalEEPassiveL07F00, hgcalPassive:HGCalEEPassiveL07F01,
+ hgcalPassive:HGCalEEPassiveL07F02, hgcalPassive:HGCalEEPassiveL07F03,
+ hgcalPassive:HGCalEEPassiveL07F04, hgcalPassive:HGCalEEPassiveL07F05,
+ hgcalPassive:HGCalEEPassiveL08F00, hgcalPassive:HGCalEEPassiveL08F01,
+ hgcalPassive:HGCalEEPassiveL08F02, hgcalPassive:HGCalEEPassiveL08F03,
+ hgcalPassive:HGCalEEPassiveL08F04, hgcalPassive:HGCalEEPassiveL08F05,
+ hgcalPassive:HGCalEEPassiveL09F00, hgcalPassive:HGCalEEPassiveL09F01,
+ hgcalPassive:HGCalEEPassiveL09F02, hgcalPassive:HGCalEEPassiveL09F03,
+ hgcalPassive:HGCalEEPassiveL09F04, hgcalPassive:HGCalEEPassiveL09F05,
+ hgcalPassive:HGCalEEPassiveL10F00, hgcalPassive:HGCalEEPassiveL10F01,
+ hgcalPassive:HGCalEEPassiveL10F02, hgcalPassive:HGCalEEPassiveL10F03,
+ hgcalPassive:HGCalEEPassiveL10F04, hgcalPassive:HGCalEEPassiveL10F05,
+ hgcalPassive:HGCalEEPassiveL11F00, hgcalPassive:HGCalEEPassiveL11F01,
+ hgcalPassive:HGCalEEPassiveL11F02, hgcalPassive:HGCalEEPassiveL11F03,
+ hgcalPassive:HGCalEEPassiveL11F04, hgcalPassive:HGCalEEPassiveL11F05,
+ hgcalPassive:HGCalEEPassiveL12F00, hgcalPassive:HGCalEEPassiveL12F01,
+ hgcalPassive:HGCalEEPassiveL12F02, hgcalPassive:HGCalEEPassiveL12F03,
+ hgcalPassive:HGCalEEPassiveL12F04, hgcalPassive:HGCalEEPassiveL12F05,
+ hgcalPassive:HGCalEEPassiveL13F00, hgcalPassive:HGCalEEPassiveL13F01,
+ hgcalPassive:HGCalEEPassiveL13F02, hgcalPassive:HGCalEEPassiveL13F03,
+ hgcalPassive:HGCalEEPassiveL13F04, hgcalPassive:HGCalEEPassiveL13F05
+
+ hgcalPassive:HGCalEECoolingPlateL01F00, hgcalPassive:HGCalEECoolingPlateL01F01,
+ hgcalPassive:HGCalEECoolingPlateL01F02, hgcalPassive:HGCalEECoolingPlateL01F03,
+ hgcalPassive:HGCalEECoolingPlateL01F04, hgcalPassive:HGCalEECoolingPlateL01F05,
+ hgcalPassive:HGCalEECoolingPlateL02F00, hgcalPassive:HGCalEECoolingPlateL02F01,
+ hgcalPassive:HGCalEECoolingPlateL02F02, hgcalPassive:HGCalEECoolingPlateL02F03,
+ hgcalPassive:HGCalEECoolingPlateL02F04, hgcalPassive:HGCalEECoolingPlateL02F05,
+ hgcalPassive:HGCalEECoolingPlateL03F00, hgcalPassive:HGCalEECoolingPlateL03F01,
+ hgcalPassive:HGCalEECoolingPlateL03F02, hgcalPassive:HGCalEECoolingPlateL03F03,
+ hgcalPassive:HGCalEECoolingPlateL03F04, hgcalPassive:HGCalEECoolingPlateL03F05,
+ hgcalPassive:HGCalEECoolingPlateL04F00, hgcalPassive:HGCalEECoolingPlateL04F01,
+ hgcalPassive:HGCalEECoolingPlateL04F02, hgcalPassive:HGCalEECoolingPlateL04F03,
+ hgcalPassive:HGCalEECoolingPlateL04F04, hgcalPassive:HGCalEECoolingPlateL04F05,
+ hgcalPassive:HGCalEECoolingPlateL05F00, hgcalPassive:HGCalEECoolingPlateL05F01,
+ hgcalPassive:HGCalEECoolingPlateL05F02, hgcalPassive:HGCalEECoolingPlateL05F03,
+ hgcalPassive:HGCalEECoolingPlateL05F04, hgcalPassive:HGCalEECoolingPlateL05F05,
+ hgcalPassive:HGCalEECoolingPlateL06F00, hgcalPassive:HGCalEECoolingPlateL06F01,
+ hgcalPassive:HGCalEECoolingPlateL06F02, hgcalPassive:HGCalEECoolingPlateL06F03,
+ hgcalPassive:HGCalEECoolingPlateL06F04, hgcalPassive:HGCalEECoolingPlateL06F05,
+ hgcalPassive:HGCalEECoolingPlateL07F00, hgcalPassive:HGCalEECoolingPlateL07F01,
+ hgcalPassive:HGCalEECoolingPlateL07F02, hgcalPassive:HGCalEECoolingPlateL07F03,
+ hgcalPassive:HGCalEECoolingPlateL07F04, hgcalPassive:HGCalEECoolingPlateL07F05,
+ hgcalPassive:HGCalEECoolingPlateL08F00, hgcalPassive:HGCalEECoolingPlateL08F01,
+ hgcalPassive:HGCalEECoolingPlateL08F02, hgcalPassive:HGCalEECoolingPlateL08F03,
+ hgcalPassive:HGCalEECoolingPlateL08F04, hgcalPassive:HGCalEECoolingPlateL08F05,
+ hgcalPassive:HGCalEECoolingPlateL09F00, hgcalPassive:HGCalEECoolingPlateL09F01,
+ hgcalPassive:HGCalEECoolingPlateL09F02, hgcalPassive:HGCalEECoolingPlateL09F03,
+ hgcalPassive:HGCalEECoolingPlateL09F04, hgcalPassive:HGCalEECoolingPlateL09F05,
+ hgcalPassive:HGCalEECoolingPlateL10F00, hgcalPassive:HGCalEECoolingPlateL10F01,
+ hgcalPassive:HGCalEECoolingPlateL10F02, hgcalPassive:HGCalEECoolingPlateL10F03,
+ hgcalPassive:HGCalEECoolingPlateL10F04, hgcalPassive:HGCalEECoolingPlateL10F05,
+ hgcalPassive:HGCalEECoolingPlateL11F00, hgcalPassive:HGCalEECoolingPlateL11F01,
+ hgcalPassive:HGCalEECoolingPlateL11F02, hgcalPassive:HGCalEECoolingPlateL11F03,
+ hgcalPassive:HGCalEECoolingPlateL11F04, hgcalPassive:HGCalEECoolingPlateL11F05,
+ hgcalPassive:HGCalEECoolingPlateL12F00, hgcalPassive:HGCalEECoolingPlateL12F01,
+ hgcalPassive:HGCalEECoolingPlateL12F02, hgcalPassive:HGCalEECoolingPlateL12F03,
+ hgcalPassive:HGCalEECoolingPlateL12F04, hgcalPassive:HGCalEECoolingPlateL12F05,
+ hgcalPassive:HGCalEECoolingPlateL13F00, hgcalPassive:HGCalEECoolingPlateL13F01,
+ hgcalPassive:HGCalEECoolingPlateL13F02, hgcalPassive:HGCalEECoolingPlateL13F03,
+ hgcalPassive:HGCalEECoolingPlateL13F04, hgcalPassive:HGCalEECoolingPlateL13F05
- materials:Air, materials:Air, materials:Air, materials:Copper,
+ materials:Air, materials:Air, materials:Air, materials:Air,
materials:StainlessSteel, materials:Air, materials:Air
HGCalEEAbsorber1, HGCalEEAbsorber2, HGCalEEAbsorber3,
@@ -357,8 +236,11 @@
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5
- 28.37*mm, 30.57*mm, 30.57*mm, 30.57*mm, 30.57*mm, 30.57*mm, 30.57*mm,
- 30.57*mm, 30.57*mm, 33.82*mm, 33.82*mm, 33.82*mm, 34.82*mm
+ [hgcal:thickEEModule1], [hgcal:thickEEModule2], [hgcal:thickEEModule2],
+ [hgcal:thickEEModule2], [hgcal:thickEEModule2], [hgcal:thickEEModule2],
+ [hgcal:thickEEModule2], [hgcal:thickEEModule2], [hgcal:thickEEModule2],
+ [hgcal:thickEEModule3], [hgcal:thickEEModule3], [hgcal:thickEEModule3],
+ [hgcal:thickEEModule4]
0, 5, 3, 6,
1, 5, 3, 6,
@@ -375,19 +257,19 @@
2, 5, 3, 6, 4
- -1, 1, 0, 2,
- -2, 1, 0, 2,
- -2, 1, 0, 2,
- -2, 1, 0, 2,
- -2, 1, 0, 2,
- -2, 1, 0, 2,
- -2, 1, 0, 2,
- -2, 1, 0, 2,
- -2, 1, 0, 2,
- -3, 1, 0, 2,
- -3, 1, 0, 2,
- -3, 1, 0, 2,
- -3, 1, 0, 2, 0
+ -1, 1, -4, 2,
+ -2, 1, -4, 2,
+ -2, 1, -4, 2,
+ -2, 1, -4, 2,
+ -2, 1, -4, 2,
+ -2, 1, -4, 2,
+ -2, 1, -4, 2,
+ -2, 1, -4, 2,
+ -2, 1, -4, 2,
+ -3, 1, -4, 2,
+ -3, 1, -4, 2,
+ -3, 1, -4, 2,
+ -3, 1, -4, 2, 0
0, 0, 0, 0
diff --git a/Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml b/Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml
index 485f25e9909a8..2bd70e78f8710 100644
--- a/Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml
+++ b/Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml
@@ -4,7 +4,7 @@
-
+
@@ -15,6 +15,7 @@
+
@@ -98,57 +99,278 @@
hgcalwafer:HGCalHEWafer06Coarse2LD6, hgcalwafer:HGCalHEWafer07Coarse2LD6,
hgcalwafer:HGCalHEWafer08Coarse2LD6, hgcalwafer:HGCalHEWafer09Coarse2LD6,
hgcalwafer:HGCalHEWafer10Coarse2LD6, hgcalwafer:HGCalHEWafer11Coarse2LD6
-
- hgcalPassive:HGCalHEPassive
-
- hgcalPassive:HGCalHEPassive06HD1, hgcalPassive:HGCalHEPassive07HD1,
- hgcalPassive:HGCalHEPassive08HD1, hgcalPassive:HGCalHEPassive09HD1,
- hgcalPassive:HGCalHEPassive10HD1, hgcalPassive:HGCalHEPassive11HD1,
- hgcalPassive:HGCalHEPassive06HD2, hgcalPassive:HGCalHEPassive07HD2,
- hgcalPassive:HGCalHEPassive08HD2, hgcalPassive:HGCalHEPassive09HD2,
- hgcalPassive:HGCalHEPassive10HD2, hgcalPassive:HGCalHEPassive11HD2,
- hgcalPassive:HGCalHEPassive06HD3, hgcalPassive:HGCalHEPassive07HD3,
- hgcalPassive:HGCalHEPassive08HD3, hgcalPassive:HGCalHEPassive09HD3,
- hgcalPassive:HGCalHEPassive10HD3, hgcalPassive:HGCalHEPassive11HD3,
- hgcalPassive:HGCalHEPassive06HD4, hgcalPassive:HGCalHEPassive07HD4,
- hgcalPassive:HGCalHEPassive08HD4, hgcalPassive:HGCalHEPassive09HD4,
- hgcalPassive:HGCalHEPassive10HD4, hgcalPassive:HGCalHEPassive11HD4,
- hgcalPassive:HGCalHEPassive06HD5, hgcalPassive:HGCalHEPassive07HD5,
- hgcalPassive:HGCalHEPassive08HD5, hgcalPassive:HGCalHEPassive09HD5,
- hgcalPassive:HGCalHEPassive10HD5, hgcalPassive:HGCalHEPassive11HD5,
- hgcalPassive:HGCalHEPassive06LD1, hgcalPassive:HGCalHEPassive07LD1,
- hgcalPassive:HGCalHEPassive08LD1, hgcalPassive:HGCalHEPassive09LD1,
- hgcalPassive:HGCalHEPassive10LD1, hgcalPassive:HGCalHEPassive11LD1,
- hgcalPassive:HGCalHEPassive06LD2, hgcalPassive:HGCalHEPassive07LD2,
- hgcalPassive:HGCalHEPassive08LD2, hgcalPassive:HGCalHEPassive09LD2,
- hgcalPassive:HGCalHEPassive10LD2, hgcalPassive:HGCalHEPassive11LD2,
- hgcalPassive:HGCalHEPassive06LD3, hgcalPassive:HGCalHEPassive07LD3,
- hgcalPassive:HGCalHEPassive08LD3, hgcalPassive:HGCalHEPassive09LD3,
- hgcalPassive:HGCalHEPassive10LD3, hgcalPassive:HGCalHEPassive11LD3,
- hgcalPassive:HGCalHEPassive06LD4, hgcalPassive:HGCalHEPassive07LD4,
- hgcalPassive:HGCalHEPassive08LD4, hgcalPassive:HGCalHEPassive09LD4,
- hgcalPassive:HGCalHEPassive10LD4, hgcalPassive:HGCalHEPassive11LD4,
- hgcalPassive:HGCalHEPassive06LD5, hgcalPassive:HGCalHEPassive07LD5,
- hgcalPassive:HGCalHEPassive08LD5, hgcalPassive:HGCalHEPassive09LD5,
- hgcalPassive:HGCalHEPassive10LD5, hgcalPassive:HGCalHEPassive11LD5,
- hgcalPassive:HGCalHEPassive06LD6, hgcalPassive:HGCalHEPassive07LD6,
- hgcalPassive:HGCalHEPassive08LD6, hgcalPassive:HGCalHEPassive09LD6,
- hgcalPassive:HGCalHEPassive10LD6, hgcalPassive:HGCalHEPassive11LD6
+
+ hgcalPassive:HGCalHEPassiveL01F00, hgcalPassive:HGCalHEPassiveL01F01,
+ hgcalPassive:HGCalHEPassiveL01F02, hgcalPassive:HGCalHEPassiveL01F03,
+ hgcalPassive:HGCalHEPassiveL01F04, hgcalPassive:HGCalHEPassiveL01F05,
+ hgcalPassive:HGCalHEPassiveL01F06, hgcalPassive:HGCalHEPassiveL01F07,
+ hgcalPassive:HGCalHEPassiveL01F08, hgcalPassive:HGCalHEPassiveL01F09,
+ hgcalPassive:HGCalHEPassiveL01F10, hgcalPassive:HGCalHEPassiveL01F11,
+ hgcalPassive:HGCalHEPassiveL02F00, hgcalPassive:HGCalHEPassiveL02F01,
+ hgcalPassive:HGCalHEPassiveL02F02, hgcalPassive:HGCalHEPassiveL02F03,
+ hgcalPassive:HGCalHEPassiveL02F04, hgcalPassive:HGCalHEPassiveL02F05,
+ hgcalPassive:HGCalHEPassiveL02F06, hgcalPassive:HGCalHEPassiveL02F07,
+ hgcalPassive:HGCalHEPassiveL02F08, hgcalPassive:HGCalHEPassiveL02F09,
+ hgcalPassive:HGCalHEPassiveL02F10, hgcalPassive:HGCalHEPassiveL02F11,
+ hgcalPassive:HGCalHEPassiveL03F00, hgcalPassive:HGCalHEPassiveL03F01,
+ hgcalPassive:HGCalHEPassiveL03F02, hgcalPassive:HGCalHEPassiveL03F03,
+ hgcalPassive:HGCalHEPassiveL03F04, hgcalPassive:HGCalHEPassiveL03F05,
+ hgcalPassive:HGCalHEPassiveL03F06, hgcalPassive:HGCalHEPassiveL03F07,
+ hgcalPassive:HGCalHEPassiveL03F08, hgcalPassive:HGCalHEPassiveL03F09,
+ hgcalPassive:HGCalHEPassiveL03F10, hgcalPassive:HGCalHEPassiveL03F11,
+ hgcalPassive:HGCalHEPassiveL04F00, hgcalPassive:HGCalHEPassiveL04F01,
+ hgcalPassive:HGCalHEPassiveL04F02, hgcalPassive:HGCalHEPassiveL04F03,
+ hgcalPassive:HGCalHEPassiveL04F04, hgcalPassive:HGCalHEPassiveL04F05,
+ hgcalPassive:HGCalHEPassiveL04F06, hgcalPassive:HGCalHEPassiveL04F07,
+ hgcalPassive:HGCalHEPassiveL04F08, hgcalPassive:HGCalHEPassiveL04F09,
+ hgcalPassive:HGCalHEPassiveL04F10, hgcalPassive:HGCalHEPassiveL04F11,
+ hgcalPassive:HGCalHEPassiveL05F00, hgcalPassive:HGCalHEPassiveL05F01,
+ hgcalPassive:HGCalHEPassiveL05F02, hgcalPassive:HGCalHEPassiveL05F03,
+ hgcalPassive:HGCalHEPassiveL05F04, hgcalPassive:HGCalHEPassiveL05F05,
+ hgcalPassive:HGCalHEPassiveL05F06, hgcalPassive:HGCalHEPassiveL05F07,
+ hgcalPassive:HGCalHEPassiveL05F08, hgcalPassive:HGCalHEPassiveL05F09,
+ hgcalPassive:HGCalHEPassiveL05F10, hgcalPassive:HGCalHEPassiveL05F11,
+ hgcalPassive:HGCalHEPassiveL06F00, hgcalPassive:HGCalHEPassiveL06F01,
+ hgcalPassive:HGCalHEPassiveL06F02, hgcalPassive:HGCalHEPassiveL06F03,
+ hgcalPassive:HGCalHEPassiveL06F04, hgcalPassive:HGCalHEPassiveL06F05,
+ hgcalPassive:HGCalHEPassiveL06F06, hgcalPassive:HGCalHEPassiveL06F07,
+ hgcalPassive:HGCalHEPassiveL06F08, hgcalPassive:HGCalHEPassiveL06F09,
+ hgcalPassive:HGCalHEPassiveL06F10, hgcalPassive:HGCalHEPassiveL06F11,
+ hgcalPassive:HGCalHEPassiveL07F00, hgcalPassive:HGCalHEPassiveL07F01,
+ hgcalPassive:HGCalHEPassiveL07F02, hgcalPassive:HGCalHEPassiveL07F03,
+ hgcalPassive:HGCalHEPassiveL07F04, hgcalPassive:HGCalHEPassiveL07F05,
+ hgcalPassive:HGCalHEPassiveL07F06, hgcalPassive:HGCalHEPassiveL07F07,
+ hgcalPassive:HGCalHEPassiveL07F08, hgcalPassive:HGCalHEPassiveL07F09,
+ hgcalPassive:HGCalHEPassiveL07F10, hgcalPassive:HGCalHEPassiveL07F11,
+ hgcalPassive:HGCalHEPassiveL08F00, hgcalPassive:HGCalHEPassiveL08F01,
+ hgcalPassive:HGCalHEPassiveL08F02, hgcalPassive:HGCalHEPassiveL08F03,
+ hgcalPassive:HGCalHEPassiveL08F04, hgcalPassive:HGCalHEPassiveL08F05,
+ hgcalPassive:HGCalHEPassiveL08F06, hgcalPassive:HGCalHEPassiveL08F07,
+ hgcalPassive:HGCalHEPassiveL08F08, hgcalPassive:HGCalHEPassiveL08F09,
+ hgcalPassive:HGCalHEPassiveL08F10, hgcalPassive:HGCalHEPassiveL08F11,
+ hgcalPassive:HGCalHEPassiveL09F00, hgcalPassive:HGCalHEPassiveL09F01,
+ hgcalPassive:HGCalHEPassiveL09F02, hgcalPassive:HGCalHEPassiveL09F03,
+ hgcalPassive:HGCalHEPassiveL09F04, hgcalPassive:HGCalHEPassiveL09F05,
+ hgcalPassive:HGCalHEPassiveL09F06, hgcalPassive:HGCalHEPassiveL09F07,
+ hgcalPassive:HGCalHEPassiveL09F08, hgcalPassive:HGCalHEPassiveL09F09,
+ hgcalPassive:HGCalHEPassiveL09F10, hgcalPassive:HGCalHEPassiveL09F11,
+ hgcalPassive:HGCalHEPassiveL10F00, hgcalPassive:HGCalHEPassiveL10F01,
+ hgcalPassive:HGCalHEPassiveL10F02, hgcalPassive:HGCalHEPassiveL10F03,
+ hgcalPassive:HGCalHEPassiveL10F04, hgcalPassive:HGCalHEPassiveL10F05,
+ hgcalPassive:HGCalHEPassiveL10F06, hgcalPassive:HGCalHEPassiveL10F07,
+ hgcalPassive:HGCalHEPassiveL10F08, hgcalPassive:HGCalHEPassiveL10F09,
+ hgcalPassive:HGCalHEPassiveL10F10, hgcalPassive:HGCalHEPassiveL10F11,
+ hgcalPassive:HGCalHEPassiveL11F00, hgcalPassive:HGCalHEPassiveL11F01,
+ hgcalPassive:HGCalHEPassiveL11F02, hgcalPassive:HGCalHEPassiveL11F03,
+ hgcalPassive:HGCalHEPassiveL11F04, hgcalPassive:HGCalHEPassiveL11F05,
+ hgcalPassive:HGCalHEPassiveL11F06, hgcalPassive:HGCalHEPassiveL11F07,
+ hgcalPassive:HGCalHEPassiveL11F08, hgcalPassive:HGCalHEPassiveL11F09,
+ hgcalPassive:HGCalHEPassiveL11F10, hgcalPassive:HGCalHEPassiveL11F11,
+ hgcalPassive:HGCalHEPassiveL12F00, hgcalPassive:HGCalHEPassiveL12F01,
+ hgcalPassive:HGCalHEPassiveL12F02, hgcalPassive:HGCalHEPassiveL12F03,
+ hgcalPassive:HGCalHEPassiveL12F04, hgcalPassive:HGCalHEPassiveL12F05,
+ hgcalPassive:HGCalHEPassiveL12F06, hgcalPassive:HGCalHEPassiveL12F07,
+ hgcalPassive:HGCalHEPassiveL12F08, hgcalPassive:HGCalHEPassiveL12F09,
+ hgcalPassive:HGCalHEPassiveL12F10, hgcalPassive:HGCalHEPassiveL12F11,
+ hgcalPassive:HGCalHEPassiveL13F00, hgcalPassive:HGCalHEPassiveL13F01,
+ hgcalPassive:HGCalHEPassiveL13F02, hgcalPassive:HGCalHEPassiveL13F03,
+ hgcalPassive:HGCalHEPassiveL13F04, hgcalPassive:HGCalHEPassiveL13F05,
+ hgcalPassive:HGCalHEPassiveL13F06, hgcalPassive:HGCalHEPassiveL13F07,
+ hgcalPassive:HGCalHEPassiveL13F08, hgcalPassive:HGCalHEPassiveL13F09,
+ hgcalPassive:HGCalHEPassiveL13F10, hgcalPassive:HGCalHEPassiveL13F11,
+ hgcalPassive:HGCalHEPassiveL14F00, hgcalPassive:HGCalHEPassiveL14F01,
+ hgcalPassive:HGCalHEPassiveL14F02, hgcalPassive:HGCalHEPassiveL14F03,
+ hgcalPassive:HGCalHEPassiveL14F04, hgcalPassive:HGCalHEPassiveL14F05,
+ hgcalPassive:HGCalHEPassiveL14F06, hgcalPassive:HGCalHEPassiveL14F07,
+ hgcalPassive:HGCalHEPassiveL14F08, hgcalPassive:HGCalHEPassiveL14F09,
+ hgcalPassive:HGCalHEPassiveL14F10, hgcalPassive:HGCalHEPassiveL14F11,
+ hgcalPassive:HGCalHEPassiveL15F00, hgcalPassive:HGCalHEPassiveL15F01,
+ hgcalPassive:HGCalHEPassiveL15F02, hgcalPassive:HGCalHEPassiveL15F03,
+ hgcalPassive:HGCalHEPassiveL15F04, hgcalPassive:HGCalHEPassiveL15F05,
+ hgcalPassive:HGCalHEPassiveL15F06, hgcalPassive:HGCalHEPassiveL15F07,
+ hgcalPassive:HGCalHEPassiveL15F08, hgcalPassive:HGCalHEPassiveL15F09,
+ hgcalPassive:HGCalHEPassiveL15F10, hgcalPassive:HGCalHEPassiveL15F11,
+ hgcalPassive:HGCalHEPassiveL16F00, hgcalPassive:HGCalHEPassiveL16F01,
+ hgcalPassive:HGCalHEPassiveL16F02, hgcalPassive:HGCalHEPassiveL16F03,
+ hgcalPassive:HGCalHEPassiveL16F04, hgcalPassive:HGCalHEPassiveL16F05,
+ hgcalPassive:HGCalHEPassiveL16F06, hgcalPassive:HGCalHEPassiveL16F07,
+ hgcalPassive:HGCalHEPassiveL16F08, hgcalPassive:HGCalHEPassiveL16F09,
+ hgcalPassive:HGCalHEPassiveL16F10, hgcalPassive:HGCalHEPassiveL16F11,
+ hgcalPassive:HGCalHEPassiveL17F00, hgcalPassive:HGCalHEPassiveL17F01,
+ hgcalPassive:HGCalHEPassiveL17F02, hgcalPassive:HGCalHEPassiveL17F03,
+ hgcalPassive:HGCalHEPassiveL17F04, hgcalPassive:HGCalHEPassiveL17F05,
+ hgcalPassive:HGCalHEPassiveL17F06, hgcalPassive:HGCalHEPassiveL17F07,
+ hgcalPassive:HGCalHEPassiveL17F08, hgcalPassive:HGCalHEPassiveL17F09,
+ hgcalPassive:HGCalHEPassiveL17F10, hgcalPassive:HGCalHEPassiveL17F11,
+ hgcalPassive:HGCalHEPassiveL18F00, hgcalPassive:HGCalHEPassiveL18F01,
+ hgcalPassive:HGCalHEPassiveL18F02, hgcalPassive:HGCalHEPassiveL18F03,
+ hgcalPassive:HGCalHEPassiveL18F04, hgcalPassive:HGCalHEPassiveL18F05,
+ hgcalPassive:HGCalHEPassiveL18F06, hgcalPassive:HGCalHEPassiveL18F07,
+ hgcalPassive:HGCalHEPassiveL18F08, hgcalPassive:HGCalHEPassiveL18F09,
+ hgcalPassive:HGCalHEPassiveL18F10, hgcalPassive:HGCalHEPassiveL18F11,
+ hgcalPassive:HGCalHEPassiveL19F00, hgcalPassive:HGCalHEPassiveL19F01,
+ hgcalPassive:HGCalHEPassiveL19F02, hgcalPassive:HGCalHEPassiveL19F03,
+ hgcalPassive:HGCalHEPassiveL19F04, hgcalPassive:HGCalHEPassiveL19F05,
+ hgcalPassive:HGCalHEPassiveL19F06, hgcalPassive:HGCalHEPassiveL19F07,
+ hgcalPassive:HGCalHEPassiveL19F08, hgcalPassive:HGCalHEPassiveL19F09,
+ hgcalPassive:HGCalHEPassiveL19F10, hgcalPassive:HGCalHEPassiveL19F11,
+ hgcalPassive:HGCalHEPassiveL20F00, hgcalPassive:HGCalHEPassiveL20F01,
+ hgcalPassive:HGCalHEPassiveL20F02, hgcalPassive:HGCalHEPassiveL20F03,
+ hgcalPassive:HGCalHEPassiveL20F04, hgcalPassive:HGCalHEPassiveL20F05,
+ hgcalPassive:HGCalHEPassiveL20F06, hgcalPassive:HGCalHEPassiveL20F07,
+ hgcalPassive:HGCalHEPassiveL20F08, hgcalPassive:HGCalHEPassiveL20F09,
+ hgcalPassive:HGCalHEPassiveL20F10, hgcalPassive:HGCalHEPassiveL20F11,
+ hgcalPassive:HGCalHEPassiveL21F00, hgcalPassive:HGCalHEPassiveL21F01,
+ hgcalPassive:HGCalHEPassiveL21F02, hgcalPassive:HGCalHEPassiveL21F03,
+ hgcalPassive:HGCalHEPassiveL21F04, hgcalPassive:HGCalHEPassiveL21F05,
+ hgcalPassive:HGCalHEPassiveL21F06, hgcalPassive:HGCalHEPassiveL21F07,
+ hgcalPassive:HGCalHEPassiveL21F08, hgcalPassive:HGCalHEPassiveL21F09,
+ hgcalPassive:HGCalHEPassiveL21F10, hgcalPassive:HGCalHEPassiveL21F11
+
+ hgcalPassive:HGCalHECoolingPlateL01F00, hgcalPassive:HGCalHECoolingPlateL01F01,
+ hgcalPassive:HGCalHECoolingPlateL01F02, hgcalPassive:HGCalHECoolingPlateL01F03,
+ hgcalPassive:HGCalHECoolingPlateL01F04, hgcalPassive:HGCalHECoolingPlateL01F05,
+ hgcalPassive:HGCalHECoolingPlateL01F06, hgcalPassive:HGCalHECoolingPlateL01F07,
+ hgcalPassive:HGCalHECoolingPlateL01F08, hgcalPassive:HGCalHECoolingPlateL01F09,
+ hgcalPassive:HGCalHECoolingPlateL01F10, hgcalPassive:HGCalHECoolingPlateL01F11,
+ hgcalPassive:HGCalHECoolingPlateL02F00, hgcalPassive:HGCalHECoolingPlateL02F01,
+ hgcalPassive:HGCalHECoolingPlateL02F02, hgcalPassive:HGCalHECoolingPlateL02F03,
+ hgcalPassive:HGCalHECoolingPlateL02F04, hgcalPassive:HGCalHECoolingPlateL02F05,
+ hgcalPassive:HGCalHECoolingPlateL02F06, hgcalPassive:HGCalHECoolingPlateL02F07,
+ hgcalPassive:HGCalHECoolingPlateL02F08, hgcalPassive:HGCalHECoolingPlateL02F09,
+ hgcalPassive:HGCalHECoolingPlateL02F10, hgcalPassive:HGCalHECoolingPlateL02F11,
+ hgcalPassive:HGCalHECoolingPlateL03F00, hgcalPassive:HGCalHECoolingPlateL03F01,
+ hgcalPassive:HGCalHECoolingPlateL03F02, hgcalPassive:HGCalHECoolingPlateL03F03,
+ hgcalPassive:HGCalHECoolingPlateL03F04, hgcalPassive:HGCalHECoolingPlateL03F05,
+ hgcalPassive:HGCalHECoolingPlateL03F06, hgcalPassive:HGCalHECoolingPlateL03F07,
+ hgcalPassive:HGCalHECoolingPlateL03F08, hgcalPassive:HGCalHECoolingPlateL03F09,
+ hgcalPassive:HGCalHECoolingPlateL03F10, hgcalPassive:HGCalHECoolingPlateL03F11,
+ hgcalPassive:HGCalHECoolingPlateL04F00, hgcalPassive:HGCalHECoolingPlateL04F01,
+ hgcalPassive:HGCalHECoolingPlateL04F02, hgcalPassive:HGCalHECoolingPlateL04F03,
+ hgcalPassive:HGCalHECoolingPlateL04F04, hgcalPassive:HGCalHECoolingPlateL04F05,
+ hgcalPassive:HGCalHECoolingPlateL04F06, hgcalPassive:HGCalHECoolingPlateL04F07,
+ hgcalPassive:HGCalHECoolingPlateL04F08, hgcalPassive:HGCalHECoolingPlateL04F09,
+ hgcalPassive:HGCalHECoolingPlateL04F10, hgcalPassive:HGCalHECoolingPlateL04F11,
+ hgcalPassive:HGCalHECoolingPlateL05F00, hgcalPassive:HGCalHECoolingPlateL05F01,
+ hgcalPassive:HGCalHECoolingPlateL05F02, hgcalPassive:HGCalHECoolingPlateL05F03,
+ hgcalPassive:HGCalHECoolingPlateL05F04, hgcalPassive:HGCalHECoolingPlateL05F05,
+ hgcalPassive:HGCalHECoolingPlateL05F06, hgcalPassive:HGCalHECoolingPlateL05F07,
+ hgcalPassive:HGCalHECoolingPlateL05F08, hgcalPassive:HGCalHECoolingPlateL05F09,
+ hgcalPassive:HGCalHECoolingPlateL05F10, hgcalPassive:HGCalHECoolingPlateL05F11,
+ hgcalPassive:HGCalHECoolingPlateL06F00, hgcalPassive:HGCalHECoolingPlateL06F01,
+ hgcalPassive:HGCalHECoolingPlateL06F02, hgcalPassive:HGCalHECoolingPlateL06F03,
+ hgcalPassive:HGCalHECoolingPlateL06F04, hgcalPassive:HGCalHECoolingPlateL06F05,
+ hgcalPassive:HGCalHECoolingPlateL06F06, hgcalPassive:HGCalHECoolingPlateL06F07,
+ hgcalPassive:HGCalHECoolingPlateL06F08, hgcalPassive:HGCalHECoolingPlateL06F09,
+ hgcalPassive:HGCalHECoolingPlateL06F10, hgcalPassive:HGCalHECoolingPlateL06F11,
+ hgcalPassive:HGCalHECoolingPlateL07F00, hgcalPassive:HGCalHECoolingPlateL07F01,
+ hgcalPassive:HGCalHECoolingPlateL07F02, hgcalPassive:HGCalHECoolingPlateL07F03,
+ hgcalPassive:HGCalHECoolingPlateL07F04, hgcalPassive:HGCalHECoolingPlateL07F05,
+ hgcalPassive:HGCalHECoolingPlateL07F06, hgcalPassive:HGCalHECoolingPlateL07F07,
+ hgcalPassive:HGCalHECoolingPlateL07F08, hgcalPassive:HGCalHECoolingPlateL07F09,
+ hgcalPassive:HGCalHECoolingPlateL07F10, hgcalPassive:HGCalHECoolingPlateL07F11,
+ hgcalPassive:HGCalHECoolingPlateL08F00, hgcalPassive:HGCalHECoolingPlateL08F01,
+ hgcalPassive:HGCalHECoolingPlateL08F02, hgcalPassive:HGCalHECoolingPlateL08F03,
+ hgcalPassive:HGCalHECoolingPlateL08F04, hgcalPassive:HGCalHECoolingPlateL08F05,
+ hgcalPassive:HGCalHECoolingPlateL08F06, hgcalPassive:HGCalHECoolingPlateL08F07,
+ hgcalPassive:HGCalHECoolingPlateL08F08, hgcalPassive:HGCalHECoolingPlateL08F09,
+ hgcalPassive:HGCalHECoolingPlateL08F10, hgcalPassive:HGCalHECoolingPlateL08F11,
+ hgcalPassive:HGCalHECoolingPlateL09F00, hgcalPassive:HGCalHECoolingPlateL09F01,
+ hgcalPassive:HGCalHECoolingPlateL09F02, hgcalPassive:HGCalHECoolingPlateL09F03,
+ hgcalPassive:HGCalHECoolingPlateL09F04, hgcalPassive:HGCalHECoolingPlateL09F05,
+ hgcalPassive:HGCalHECoolingPlateL09F06, hgcalPassive:HGCalHECoolingPlateL09F07,
+ hgcalPassive:HGCalHECoolingPlateL09F08, hgcalPassive:HGCalHECoolingPlateL09F09,
+ hgcalPassive:HGCalHECoolingPlateL09F10, hgcalPassive:HGCalHECoolingPlateL09F11,
+ hgcalPassive:HGCalHECoolingPlateL10F00, hgcalPassive:HGCalHECoolingPlateL10F01,
+ hgcalPassive:HGCalHECoolingPlateL10F02, hgcalPassive:HGCalHECoolingPlateL10F03,
+ hgcalPassive:HGCalHECoolingPlateL10F04, hgcalPassive:HGCalHECoolingPlateL10F05,
+ hgcalPassive:HGCalHECoolingPlateL10F06, hgcalPassive:HGCalHECoolingPlateL10F07,
+ hgcalPassive:HGCalHECoolingPlateL10F08, hgcalPassive:HGCalHECoolingPlateL10F09,
+ hgcalPassive:HGCalHECoolingPlateL10F10, hgcalPassive:HGCalHECoolingPlateL10F11,
+ hgcalPassive:HGCalHECoolingPlateL11F00, hgcalPassive:HGCalHECoolingPlateL11F01,
+ hgcalPassive:HGCalHECoolingPlateL11F02, hgcalPassive:HGCalHECoolingPlateL11F03,
+ hgcalPassive:HGCalHECoolingPlateL11F04, hgcalPassive:HGCalHECoolingPlateL11F05,
+ hgcalPassive:HGCalHECoolingPlateL11F06, hgcalPassive:HGCalHECoolingPlateL11F07,
+ hgcalPassive:HGCalHECoolingPlateL11F08, hgcalPassive:HGCalHECoolingPlateL11F09,
+ hgcalPassive:HGCalHECoolingPlateL11F10, hgcalPassive:HGCalHECoolingPlateL11F11,
+ hgcalPassive:HGCalHECoolingPlateL12F00, hgcalPassive:HGCalHECoolingPlateL12F01,
+ hgcalPassive:HGCalHECoolingPlateL12F02, hgcalPassive:HGCalHECoolingPlateL12F03,
+ hgcalPassive:HGCalHECoolingPlateL12F04, hgcalPassive:HGCalHECoolingPlateL12F05,
+ hgcalPassive:HGCalHECoolingPlateL12F06, hgcalPassive:HGCalHECoolingPlateL12F07,
+ hgcalPassive:HGCalHECoolingPlateL12F08, hgcalPassive:HGCalHECoolingPlateL12F09,
+ hgcalPassive:HGCalHECoolingPlateL12F10, hgcalPassive:HGCalHECoolingPlateL12F11,
+ hgcalPassive:HGCalHECoolingPlateL13F00, hgcalPassive:HGCalHECoolingPlateL13F01,
+ hgcalPassive:HGCalHECoolingPlateL13F02, hgcalPassive:HGCalHECoolingPlateL13F03,
+ hgcalPassive:HGCalHECoolingPlateL13F04, hgcalPassive:HGCalHECoolingPlateL13F05,
+ hgcalPassive:HGCalHECoolingPlateL13F06, hgcalPassive:HGCalHECoolingPlateL13F07,
+ hgcalPassive:HGCalHECoolingPlateL13F08, hgcalPassive:HGCalHECoolingPlateL13F09,
+ hgcalPassive:HGCalHECoolingPlateL13F10, hgcalPassive:HGCalHECoolingPlateL13F11,
+ hgcalPassive:HGCalHECoolingPlateL14F00, hgcalPassive:HGCalHECoolingPlateL14F01,
+ hgcalPassive:HGCalHECoolingPlateL14F02, hgcalPassive:HGCalHECoolingPlateL14F03,
+ hgcalPassive:HGCalHECoolingPlateL14F04, hgcalPassive:HGCalHECoolingPlateL14F05,
+ hgcalPassive:HGCalHECoolingPlateL14F06, hgcalPassive:HGCalHECoolingPlateL14F07,
+ hgcalPassive:HGCalHECoolingPlateL14F08, hgcalPassive:HGCalHECoolingPlateL14F09,
+ hgcalPassive:HGCalHECoolingPlateL14F10, hgcalPassive:HGCalHECoolingPlateL14F11,
+ hgcalPassive:HGCalHECoolingPlateL15F00, hgcalPassive:HGCalHECoolingPlateL15F01,
+ hgcalPassive:HGCalHECoolingPlateL15F02, hgcalPassive:HGCalHECoolingPlateL15F03,
+ hgcalPassive:HGCalHECoolingPlateL15F04, hgcalPassive:HGCalHECoolingPlateL15F05,
+ hgcalPassive:HGCalHECoolingPlateL15F06, hgcalPassive:HGCalHECoolingPlateL15F07,
+ hgcalPassive:HGCalHECoolingPlateL15F08, hgcalPassive:HGCalHECoolingPlateL15F09,
+ hgcalPassive:HGCalHECoolingPlateL15F10, hgcalPassive:HGCalHECoolingPlateL15F11,
+ hgcalPassive:HGCalHECoolingPlateL16F00, hgcalPassive:HGCalHECoolingPlateL16F01,
+ hgcalPassive:HGCalHECoolingPlateL16F02, gcalPassive:HGCalHECoolingPlateL16F03,
+ hgcalPassive:HGCalHECoolingPlateL16F04, hgcalPassive:HGCalHECoolingPlateL16F05,
+ hgcalPassive:HGCalHECoolingPlateL16F06, hgcalPassive:HGCalHECoolingPlateL16F07,
+ hgcalPassive:HGCalHECoolingPlateL16F08, hgcalPassive:HGCalHECoolingPlateL16F09,
+ hgcalPassive:HGCalHECoolingPlateL16F10, hgcalPassive:HGCalHECoolingPlateL16F11,
+ hgcalPassive:HGCalHECoolingPlateL17F00, hgcalPassive:HGCalHECoolingPlateL17F01,
+ hgcalPassive:HGCalHECoolingPlateL17F02, hgcalPassive:HGCalHECoolingPlateL17F03,
+ hgcalPassive:HGCalHECoolingPlateL17F04, hgcalPassive:HGCalHECoolingPlateL17F05,
+ hgcalPassive:HGCalHECoolingPlateL17F06, hgcalPassive:HGCalHECoolingPlateL17F07,
+ hgcalPassive:HGCalHECoolingPlateL17F08, hgcalPassive:HGCalHECoolingPlateL17F09,
+ hgcalPassive:HGCalHECoolingPlateL17F10, hgcalPassive:HGCalHECoolingPlateL17F11,
+ hgcalPassive:HGCalHECoolingPlateL18F00, hgcalPassive:HGCalHECoolingPlateL18F01,
+ hgcalPassive:HGCalHECoolingPlateL18F02, hgcalPassive:HGCalHECoolingPlateL18F03,
+ hgcalPassive:HGCalHECoolingPlateL18F04, hgcalPassive:HGCalHECoolingPlateL18F05,
+ hgcalPassive:HGCalHECoolingPlateL18F06, hgcalPassive:HGCalHECoolingPlateL18F07,
+ hgcalPassive:HGCalHECoolingPlateL18F08, hgcalPassive:HGCalHECoolingPlateL18F09,
+ hgcalPassive:HGCalHECoolingPlateL18F10, hgcalPassive:HGCalHECoolingPlateL18F11,
+ hgcalPassive:HGCalHECoolingPlateL19F00, hgcalPassive:HGCalHECoolingPlateL19F01,
+ hgcalPassive:HGCalHECoolingPlateL19F02, hgcalPassive:HGCalHECoolingPlateL19F03,
+ hgcalPassive:HGCalHECoolingPlateL19F04, hgcalPassive:HGCalHECoolingPlateL19F05,
+ hgcalPassive:HGCalHECoolingPlateL19F06, hgcalPassive:HGCalHECoolingPlateL19F07,
+ hgcalPassive:HGCalHECoolingPlateL19F08, hgcalPassive:HGCalHECoolingPlateL19F09,
+ hgcalPassive:HGCalHECoolingPlateL19F10, hgcalPassive:HGCalHECoolingPlateL19F11,
+ hgcalPassive:HGCalHECoolingPlateL20F00, hgcalPassive:HGCalHECoolingPlateL20F01,
+ hgcalPassive:HGCalHECoolingPlateL20F02, hgcalPassive:HGCalHECoolingPlateL20F03,
+ hgcalPassive:HGCalHECoolingPlateL20F04, hgcalPassive:HGCalHECoolingPlateL20F05,
+ hgcalPassive:HGCalHECoolingPlateL20F06, hgcalPassive:HGCalHECoolingPlateL20F07,
+ hgcalPassive:HGCalHECoolingPlateL20F08, hgcalPassive:HGCalHECoolingPlateL20F09,
+ hgcalPassive:HGCalHECoolingPlateL20F10, hgcalPassive:HGCalHECoolingPlateL20F11,
+ hgcalPassive:HGCalHECoolingPlateL21F00, hgcalPassive:HGCalHECoolingPlateL21F01,
+ hgcalPassive:HGCalHECoolingPlateL21F02, hgcalPassive:HGCalHECoolingPlateL21F03,
+ hgcalPassive:HGCalHECoolingPlateL21F04, hgcalPassive:HGCalHECoolingPlateL21F05,
+ hgcalPassive:HGCalHECoolingPlateL21F06, hgcalPassive:HGCalHECoolingPlateL21F07,
+ hgcalPassive:HGCalHECoolingPlateL21F08, hgcalPassive:HGCalHECoolingPlateL21F09,
+ hgcalPassive:HGCalHECoolingPlateL21F10, hgcalPassive:HGCalHECoolingPlateL21F11
materials:StainlessSteel, materials:StainlessSteel, materials:Air,
- materials:Air, materials:Air, materials:Copper
+ materials:Air, materials:Air, materials:Air
HGCalHEAbsorber1, HGCalHEAbsorber2, HGCalHEAirGap1, HGCalHECover,
HGCalHESiliconLayer, HGCalHECoolingPlate
- 41.5*mm, 60.7*mm, 4.0*mm, 2.5*mm, [hgcal:ModuleThicknessHE], 6.35*mm
+ [hgcal:thickHEAbsorber2], [hgcal:thickHEAbsorber3], [hgcal:thickHEService],
+ [hgcal:thickHESteelCover], [hgcal:ModuleThicknessHE], [hgcal:thickHECooling]
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5
- 63.05*mm, 63.05*mm, 63.05*mm, 63.05*mm, 82.25*mm, 82.25*mm,
- 82.25*mm, 82.25*mm, 82.25*mm, 82.25*mm, 82.25*mm, 82.25*mm,
- 82.25*mm, 82.25*mm
+ [hgcal:thickHEModule2], [hgcal:thickHEModule2], [hgcal:thickHEModule2],
+ [hgcal:thickHEModule2], [hgcal:thickHEModule3], [hgcal:thickHEModule3],
+ [hgcal:thickHEModule3], [hgcal:thickHEModule3], [hgcal:thickHEModule3],
+ [hgcal:thickHEModule3], [hgcal:thickHEModule3], [hgcal:thickHEModule3],
+ [hgcal:thickHEModule3], [hgcal:thickHEModule3]
0, 2, 3, 4, 5, 0, 2, 3, 4, 5, 0, 2, 3, 4, 5,
0, 2, 3, 4, 5, 1, 2, 3, 4, 5, 1, 2, 3, 4, 5,
@@ -156,11 +378,11 @@
1, 2, 3, 4, 5, 1, 2, 3, 4, 5, 1, 2, 3, 4, 5,
1, 2, 3, 4, 5, 1, 2, 3, 4, 5
- 0, 0, -1, 1, 0, 0, 0, -1, 1, 0, 0, 0, -1, 1, 0,
- 0, 0, -1, 1, 0, 0, 0, -1, 1, 0, 0, 0, -1, 1, 0,
- 0, 0, -1, 1, 0, 0, 0, -1, 1, 0, 0, 0, -1, 1, 0,
- 0, 0, -1, 1, 0, 0, 0, -1, 1, 0, 0, 0, -1, 1, 0,
- 0, 0, -1, 1, 0, 0, 0, -1, 1, 0
+ 0, 0, -1, 1, -2, 0, 0, -1, 1, -2, 0, 0, -1, 1, -2,
+ 0, 0, -1, 1, -2, 0, 0, -1, 1, -2, 0, 0, -1, 1, -2,
+ 0, 0, -1, 1, -2, 0, 0, -1, 1, -2, 0, 0, -1, 1, -2,
+ 0, 0, -1, 1, -2, 0, 0, -1, 1, -2, 0, 0, -1, 1, -2,
+ 0, 0, -1, 1, -2, 0, 0, -1, 1, -2
materials:Air, hgcalMaterial:HGC_Cables, hgcalMaterial:HGC_G10-FR4,
materials:Polystyrene, materials:H_Scintillator, materials:Polystyrene,
diff --git a/Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml b/Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml
index 7c0a2153a5e34..3c3f2cd3b8f2f 100644
--- a/Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml
+++ b/Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml
@@ -13,6 +13,7 @@
+
diff --git a/Geometry/HGCalCommonData/data/hgcalHEsil/v19/hgcalHEsil.xml b/Geometry/HGCalCommonData/data/hgcalHEsil/v19/hgcalHEsil.xml
index 559343b5a574e..6f5eb2633d91c 100644
--- a/Geometry/HGCalCommonData/data/hgcalHEsil/v19/hgcalHEsil.xml
+++ b/Geometry/HGCalCommonData/data/hgcalHEsil/v19/hgcalHEsil.xml
@@ -13,6 +13,7 @@
+
@@ -81,56 +82,276 @@
hgcalwafer:HGCalHEWafer06Coarse2LD6, hgcalwafer:HGCalHEWafer07Coarse2LD6,
hgcalwafer:HGCalHEWafer08Coarse2LD6, hgcalwafer:HGCalHEWafer09Coarse2LD6,
hgcalwafer:HGCalHEWafer10Coarse2LD6, hgcalwafer:HGCalHEWafer11Coarse2LD6
-
- hgcalPassive:HGCalHEPassive
-
- hgcalPassive:HGCalHEPassive06HD1, hgcalPassive:HGCalHEPassive07HD1,
- hgcalPassive:HGCalHEPassive08HD1, hgcalPassive:HGCalHEPassive09HD1,
- hgcalPassive:HGCalHEPassive10HD1, hgcalPassive:HGCalHEPassive11HD1,
- hgcalPassive:HGCalHEPassive06HD2, hgcalPassive:HGCalHEPassive07HD2,
- hgcalPassive:HGCalHEPassive08HD2, hgcalPassive:HGCalHEPassive09HD2,
- hgcalPassive:HGCalHEPassive10HD2, hgcalPassive:HGCalHEPassive11HD2,
- hgcalPassive:HGCalHEPassive06HD3, hgcalPassive:HGCalHEPassive07HD3,
- hgcalPassive:HGCalHEPassive08HD3, hgcalPassive:HGCalHEPassive09HD3,
- hgcalPassive:HGCalHEPassive10HD3, hgcalPassive:HGCalHEPassive11HD3,
- hgcalPassive:HGCalHEPassive06HD4, hgcalPassive:HGCalHEPassive07HD4,
- hgcalPassive:HGCalHEPassive08HD4, hgcalPassive:HGCalHEPassive09HD4,
- hgcalPassive:HGCalHEPassive10HD4, hgcalPassive:HGCalHEPassive11HD4,
- hgcalPassive:HGCalHEPassive06HD5, hgcalPassive:HGCalHEPassive07HD5,
- hgcalPassive:HGCalHEPassive08HD5, hgcalPassive:HGCalHEPassive09HD5,
- hgcalPassive:HGCalHEPassive10HD5, hgcalPassive:HGCalHEPassive11HD5,
- hgcalPassive:HGCalHEPassive06LD1, hgcalPassive:HGCalHEPassive07LD1,
- hgcalPassive:HGCalHEPassive08LD1, hgcalPassive:HGCalHEPassive09LD1,
- hgcalPassive:HGCalHEPassive10LD1, hgcalPassive:HGCalHEPassive11LD1,
- hgcalPassive:HGCalHEPassive06LD2, hgcalPassive:HGCalHEPassive07LD2,
- hgcalPassive:HGCalHEPassive08LD2, hgcalPassive:HGCalHEPassive09LD2,
- hgcalPassive:HGCalHEPassive10LD2, hgcalPassive:HGCalHEPassive11LD2,
- hgcalPassive:HGCalHEPassive06LD3, hgcalPassive:HGCalHEPassive07LD3,
- hgcalPassive:HGCalHEPassive08LD3, hgcalPassive:HGCalHEPassive09LD3,
- hgcalPassive:HGCalHEPassive10LD3, hgcalPassive:HGCalHEPassive11LD3,
- hgcalPassive:HGCalHEPassive06LD4, hgcalPassive:HGCalHEPassive07LD4,
- hgcalPassive:HGCalHEPassive08LD4, hgcalPassive:HGCalHEPassive09LD4,
- hgcalPassive:HGCalHEPassive10LD4, hgcalPassive:HGCalHEPassive11LD4,
- hgcalPassive:HGCalHEPassive06LD5, hgcalPassive:HGCalHEPassive07LD5,
- hgcalPassive:HGCalHEPassive08LD5, hgcalPassive:HGCalHEPassive09LD5,
- hgcalPassive:HGCalHEPassive10LD5, hgcalPassive:HGCalHEPassive11LD5,
- hgcalPassive:HGCalHEPassive06LD6, hgcalPassive:HGCalHEPassive07LD6,
- hgcalPassive:HGCalHEPassive08LD6, hgcalPassive:HGCalHEPassive09LD6,
- hgcalPassive:HGCalHEPassive10LD6, hgcalPassive:HGCalHEPassive11LD6
+
+ hgcalPassive:HGCalHEPassiveL01F00, hgcalPassive:HGCalHEPassiveL01F01,
+ hgcalPassive:HGCalHEPassiveL01F02, hgcalPassive:HGCalHEPassiveL01F03,
+ hgcalPassive:HGCalHEPassiveL01F04, hgcalPassive:HGCalHEPassiveL01F05,
+ hgcalPassive:HGCalHEPassiveL01F06, hgcalPassive:HGCalHEPassiveL01F07,
+ hgcalPassive:HGCalHEPassiveL01F08, hgcalPassive:HGCalHEPassiveL01F09,
+ hgcalPassive:HGCalHEPassiveL01F10, hgcalPassive:HGCalHEPassiveL01F11,
+ hgcalPassive:HGCalHEPassiveL02F00, hgcalPassive:HGCalHEPassiveL02F01,
+ hgcalPassive:HGCalHEPassiveL02F02, hgcalPassive:HGCalHEPassiveL02F03,
+ hgcalPassive:HGCalHEPassiveL02F04, hgcalPassive:HGCalHEPassiveL02F05,
+ hgcalPassive:HGCalHEPassiveL02F06, hgcalPassive:HGCalHEPassiveL02F07,
+ hgcalPassive:HGCalHEPassiveL02F08, hgcalPassive:HGCalHEPassiveL02F09,
+ hgcalPassive:HGCalHEPassiveL02F10, hgcalPassive:HGCalHEPassiveL02F11,
+ hgcalPassive:HGCalHEPassiveL03F00, hgcalPassive:HGCalHEPassiveL03F01,
+ hgcalPassive:HGCalHEPassiveL03F02, hgcalPassive:HGCalHEPassiveL03F03,
+ hgcalPassive:HGCalHEPassiveL03F04, hgcalPassive:HGCalHEPassiveL03F05,
+ hgcalPassive:HGCalHEPassiveL03F06, hgcalPassive:HGCalHEPassiveL03F07,
+ hgcalPassive:HGCalHEPassiveL03F08, hgcalPassive:HGCalHEPassiveL03F09,
+ hgcalPassive:HGCalHEPassiveL03F10, hgcalPassive:HGCalHEPassiveL03F11,
+ hgcalPassive:HGCalHEPassiveL04F00, hgcalPassive:HGCalHEPassiveL04F01,
+ hgcalPassive:HGCalHEPassiveL04F02, hgcalPassive:HGCalHEPassiveL04F03,
+ hgcalPassive:HGCalHEPassiveL04F04, hgcalPassive:HGCalHEPassiveL04F05,
+ hgcalPassive:HGCalHEPassiveL04F06, hgcalPassive:HGCalHEPassiveL04F07,
+ hgcalPassive:HGCalHEPassiveL04F08, hgcalPassive:HGCalHEPassiveL04F09,
+ hgcalPassive:HGCalHEPassiveL04F10, hgcalPassive:HGCalHEPassiveL04F11,
+ hgcalPassive:HGCalHEPassiveL05F00, hgcalPassive:HGCalHEPassiveL05F01,
+ hgcalPassive:HGCalHEPassiveL05F02, hgcalPassive:HGCalHEPassiveL05F03,
+ hgcalPassive:HGCalHEPassiveL05F04, hgcalPassive:HGCalHEPassiveL05F05,
+ hgcalPassive:HGCalHEPassiveL05F06, hgcalPassive:HGCalHEPassiveL05F07,
+ hgcalPassive:HGCalHEPassiveL05F08, hgcalPassive:HGCalHEPassiveL05F09,
+ hgcalPassive:HGCalHEPassiveL05F10, hgcalPassive:HGCalHEPassiveL05F11,
+ hgcalPassive:HGCalHEPassiveL06F00, hgcalPassive:HGCalHEPassiveL06F01,
+ hgcalPassive:HGCalHEPassiveL06F02, hgcalPassive:HGCalHEPassiveL06F03,
+ hgcalPassive:HGCalHEPassiveL06F04, hgcalPassive:HGCalHEPassiveL06F05,
+ hgcalPassive:HGCalHEPassiveL06F06, hgcalPassive:HGCalHEPassiveL06F07,
+ hgcalPassive:HGCalHEPassiveL06F08, hgcalPassive:HGCalHEPassiveL06F09,
+ hgcalPassive:HGCalHEPassiveL06F10, hgcalPassive:HGCalHEPassiveL06F11,
+ hgcalPassive:HGCalHEPassiveL07F00, hgcalPassive:HGCalHEPassiveL07F01,
+ hgcalPassive:HGCalHEPassiveL07F02, hgcalPassive:HGCalHEPassiveL07F03,
+ hgcalPassive:HGCalHEPassiveL07F04, hgcalPassive:HGCalHEPassiveL07F05,
+ hgcalPassive:HGCalHEPassiveL07F06, hgcalPassive:HGCalHEPassiveL07F07,
+ hgcalPassive:HGCalHEPassiveL07F08, hgcalPassive:HGCalHEPassiveL07F09,
+ hgcalPassive:HGCalHEPassiveL07F10, hgcalPassive:HGCalHEPassiveL07F11,
+ hgcalPassive:HGCalHEPassiveL08F00, hgcalPassive:HGCalHEPassiveL08F01,
+ hgcalPassive:HGCalHEPassiveL08F02, hgcalPassive:HGCalHEPassiveL08F03,
+ hgcalPassive:HGCalHEPassiveL08F04, hgcalPassive:HGCalHEPassiveL08F05,
+ hgcalPassive:HGCalHEPassiveL08F06, hgcalPassive:HGCalHEPassiveL08F07,
+ hgcalPassive:HGCalHEPassiveL08F08, hgcalPassive:HGCalHEPassiveL08F09,
+ hgcalPassive:HGCalHEPassiveL08F10, hgcalPassive:HGCalHEPassiveL08F11,
+ hgcalPassive:HGCalHEPassiveL09F00, hgcalPassive:HGCalHEPassiveL09F01,
+ hgcalPassive:HGCalHEPassiveL09F02, hgcalPassive:HGCalHEPassiveL09F03,
+ hgcalPassive:HGCalHEPassiveL09F04, hgcalPassive:HGCalHEPassiveL09F05,
+ hgcalPassive:HGCalHEPassiveL09F06, hgcalPassive:HGCalHEPassiveL09F07,
+ hgcalPassive:HGCalHEPassiveL09F08, hgcalPassive:HGCalHEPassiveL09F09,
+ hgcalPassive:HGCalHEPassiveL09F10, hgcalPassive:HGCalHEPassiveL09F11,
+ hgcalPassive:HGCalHEPassiveL10F00, hgcalPassive:HGCalHEPassiveL10F01,
+ hgcalPassive:HGCalHEPassiveL10F02, hgcalPassive:HGCalHEPassiveL10F03,
+ hgcalPassive:HGCalHEPassiveL10F04, hgcalPassive:HGCalHEPassiveL10F05,
+ hgcalPassive:HGCalHEPassiveL10F06, hgcalPassive:HGCalHEPassiveL10F07,
+ hgcalPassive:HGCalHEPassiveL10F08, hgcalPassive:HGCalHEPassiveL10F09,
+ hgcalPassive:HGCalHEPassiveL10F10, hgcalPassive:HGCalHEPassiveL10F11,
+ hgcalPassive:HGCalHEPassiveL11F00, hgcalPassive:HGCalHEPassiveL11F01,
+ hgcalPassive:HGCalHEPassiveL11F02, hgcalPassive:HGCalHEPassiveL11F03,
+ hgcalPassive:HGCalHEPassiveL11F04, hgcalPassive:HGCalHEPassiveL11F05,
+ hgcalPassive:HGCalHEPassiveL11F06, hgcalPassive:HGCalHEPassiveL11F07,
+ hgcalPassive:HGCalHEPassiveL11F08, hgcalPassive:HGCalHEPassiveL11F09,
+ hgcalPassive:HGCalHEPassiveL11F10, hgcalPassive:HGCalHEPassiveL11F11,
+ hgcalPassive:HGCalHEPassiveL12F00, hgcalPassive:HGCalHEPassiveL12F01,
+ hgcalPassive:HGCalHEPassiveL12F02, hgcalPassive:HGCalHEPassiveL12F03,
+ hgcalPassive:HGCalHEPassiveL12F04, hgcalPassive:HGCalHEPassiveL12F05,
+ hgcalPassive:HGCalHEPassiveL12F06, hgcalPassive:HGCalHEPassiveL12F07,
+ hgcalPassive:HGCalHEPassiveL12F08, hgcalPassive:HGCalHEPassiveL12F09,
+ hgcalPassive:HGCalHEPassiveL12F10, hgcalPassive:HGCalHEPassiveL12F11,
+ hgcalPassive:HGCalHEPassiveL13F00, hgcalPassive:HGCalHEPassiveL13F01,
+ hgcalPassive:HGCalHEPassiveL13F02, hgcalPassive:HGCalHEPassiveL13F03,
+ hgcalPassive:HGCalHEPassiveL13F04, hgcalPassive:HGCalHEPassiveL13F05,
+ hgcalPassive:HGCalHEPassiveL13F06, hgcalPassive:HGCalHEPassiveL13F07,
+ hgcalPassive:HGCalHEPassiveL13F08, hgcalPassive:HGCalHEPassiveL13F09,
+ hgcalPassive:HGCalHEPassiveL13F10, hgcalPassive:HGCalHEPassiveL13F11,
+ hgcalPassive:HGCalHEPassiveL14F00, hgcalPassive:HGCalHEPassiveL14F01,
+ hgcalPassive:HGCalHEPassiveL14F02, hgcalPassive:HGCalHEPassiveL14F03,
+ hgcalPassive:HGCalHEPassiveL14F04, hgcalPassive:HGCalHEPassiveL14F05,
+ hgcalPassive:HGCalHEPassiveL14F06, hgcalPassive:HGCalHEPassiveL14F07,
+ hgcalPassive:HGCalHEPassiveL14F08, hgcalPassive:HGCalHEPassiveL14F09,
+ hgcalPassive:HGCalHEPassiveL14F10, hgcalPassive:HGCalHEPassiveL14F11,
+ hgcalPassive:HGCalHEPassiveL15F00, hgcalPassive:HGCalHEPassiveL15F01,
+ hgcalPassive:HGCalHEPassiveL15F02, hgcalPassive:HGCalHEPassiveL15F03,
+ hgcalPassive:HGCalHEPassiveL15F04, hgcalPassive:HGCalHEPassiveL15F05,
+ hgcalPassive:HGCalHEPassiveL15F06, hgcalPassive:HGCalHEPassiveL15F07,
+ hgcalPassive:HGCalHEPassiveL15F08, hgcalPassive:HGCalHEPassiveL15F09,
+ hgcalPassive:HGCalHEPassiveL15F10, hgcalPassive:HGCalHEPassiveL15F11,
+ hgcalPassive:HGCalHEPassiveL16F00, hgcalPassive:HGCalHEPassiveL16F01,
+ hgcalPassive:HGCalHEPassiveL16F02, hgcalPassive:HGCalHEPassiveL16F03,
+ hgcalPassive:HGCalHEPassiveL16F04, hgcalPassive:HGCalHEPassiveL16F05,
+ hgcalPassive:HGCalHEPassiveL16F06, hgcalPassive:HGCalHEPassiveL16F07,
+ hgcalPassive:HGCalHEPassiveL16F08, hgcalPassive:HGCalHEPassiveL16F09,
+ hgcalPassive:HGCalHEPassiveL16F10, hgcalPassive:HGCalHEPassiveL16F11,
+ hgcalPassive:HGCalHEPassiveL17F00, hgcalPassive:HGCalHEPassiveL17F01,
+ hgcalPassive:HGCalHEPassiveL17F02, hgcalPassive:HGCalHEPassiveL17F03,
+ hgcalPassive:HGCalHEPassiveL17F04, hgcalPassive:HGCalHEPassiveL17F05,
+ hgcalPassive:HGCalHEPassiveL17F06, hgcalPassive:HGCalHEPassiveL17F07,
+ hgcalPassive:HGCalHEPassiveL17F08, hgcalPassive:HGCalHEPassiveL17F09,
+ hgcalPassive:HGCalHEPassiveL17F10, hgcalPassive:HGCalHEPassiveL17F11,
+ hgcalPassive:HGCalHEPassiveL18F00, hgcalPassive:HGCalHEPassiveL18F01,
+ hgcalPassive:HGCalHEPassiveL18F02, hgcalPassive:HGCalHEPassiveL18F03,
+ hgcalPassive:HGCalHEPassiveL18F04, hgcalPassive:HGCalHEPassiveL18F05,
+ hgcalPassive:HGCalHEPassiveL18F06, hgcalPassive:HGCalHEPassiveL18F07,
+ hgcalPassive:HGCalHEPassiveL18F08, hgcalPassive:HGCalHEPassiveL18F09,
+ hgcalPassive:HGCalHEPassiveL18F10, hgcalPassive:HGCalHEPassiveL18F11,
+ hgcalPassive:HGCalHEPassiveL19F00, hgcalPassive:HGCalHEPassiveL19F01,
+ hgcalPassive:HGCalHEPassiveL19F02, hgcalPassive:HGCalHEPassiveL19F03,
+ hgcalPassive:HGCalHEPassiveL19F04, hgcalPassive:HGCalHEPassiveL19F05,
+ hgcalPassive:HGCalHEPassiveL19F06, hgcalPassive:HGCalHEPassiveL19F07,
+ hgcalPassive:HGCalHEPassiveL19F08, hgcalPassive:HGCalHEPassiveL19F09,
+ hgcalPassive:HGCalHEPassiveL19F10, hgcalPassive:HGCalHEPassiveL19F11,
+ hgcalPassive:HGCalHEPassiveL20F00, hgcalPassive:HGCalHEPassiveL20F01,
+ hgcalPassive:HGCalHEPassiveL20F02, hgcalPassive:HGCalHEPassiveL20F03,
+ hgcalPassive:HGCalHEPassiveL20F04, hgcalPassive:HGCalHEPassiveL20F05,
+ hgcalPassive:HGCalHEPassiveL20F06, hgcalPassive:HGCalHEPassiveL20F07,
+ hgcalPassive:HGCalHEPassiveL20F08, hgcalPassive:HGCalHEPassiveL20F09,
+ hgcalPassive:HGCalHEPassiveL20F10, hgcalPassive:HGCalHEPassiveL20F11,
+ hgcalPassive:HGCalHEPassiveL21F00, hgcalPassive:HGCalHEPassiveL21F01,
+ hgcalPassive:HGCalHEPassiveL21F02, hgcalPassive:HGCalHEPassiveL21F03,
+ hgcalPassive:HGCalHEPassiveL21F04, hgcalPassive:HGCalHEPassiveL21F05,
+ hgcalPassive:HGCalHEPassiveL21F06, hgcalPassive:HGCalHEPassiveL21F07,
+ hgcalPassive:HGCalHEPassiveL21F08, hgcalPassive:HGCalHEPassiveL21F09,
+ hgcalPassive:HGCalHEPassiveL21F10, hgcalPassive:HGCalHEPassiveL21F11
+
+ hgcalPassive:HGCalHECoolingPlateL01F00, hgcalPassive:HGCalHECoolingPlateL01F01,
+ hgcalPassive:HGCalHECoolingPlateL01F02, hgcalPassive:HGCalHECoolingPlateL01F03,
+ hgcalPassive:HGCalHECoolingPlateL01F04, hgcalPassive:HGCalHECoolingPlateL01F05,
+ hgcalPassive:HGCalHECoolingPlateL01F06, hgcalPassive:HGCalHECoolingPlateL01F07,
+ hgcalPassive:HGCalHECoolingPlateL01F08, hgcalPassive:HGCalHECoolingPlateL01F09,
+ hgcalPassive:HGCalHECoolingPlateL01F10, hgcalPassive:HGCalHECoolingPlateL01F11,
+ hgcalPassive:HGCalHECoolingPlateL02F00, hgcalPassive:HGCalHECoolingPlateL02F01,
+ hgcalPassive:HGCalHECoolingPlateL02F02, hgcalPassive:HGCalHECoolingPlateL02F03,
+ hgcalPassive:HGCalHECoolingPlateL02F04, hgcalPassive:HGCalHECoolingPlateL02F05,
+ hgcalPassive:HGCalHECoolingPlateL02F06, hgcalPassive:HGCalHECoolingPlateL02F07,
+ hgcalPassive:HGCalHECoolingPlateL02F08, hgcalPassive:HGCalHECoolingPlateL02F09,
+ hgcalPassive:HGCalHECoolingPlateL02F10, hgcalPassive:HGCalHECoolingPlateL02F11,
+ hgcalPassive:HGCalHECoolingPlateL03F00, hgcalPassive:HGCalHECoolingPlateL03F01,
+ hgcalPassive:HGCalHECoolingPlateL03F02, hgcalPassive:HGCalHECoolingPlateL03F03,
+ hgcalPassive:HGCalHECoolingPlateL03F04, hgcalPassive:HGCalHECoolingPlateL03F05,
+ hgcalPassive:HGCalHECoolingPlateL03F06, hgcalPassive:HGCalHECoolingPlateL03F07,
+ hgcalPassive:HGCalHECoolingPlateL03F08, hgcalPassive:HGCalHECoolingPlateL03F09,
+ hgcalPassive:HGCalHECoolingPlateL03F10, hgcalPassive:HGCalHECoolingPlateL03F11,
+ hgcalPassive:HGCalHECoolingPlateL04F00, hgcalPassive:HGCalHECoolingPlateL04F01,
+ hgcalPassive:HGCalHECoolingPlateL04F02, hgcalPassive:HGCalHECoolingPlateL04F03,
+ hgcalPassive:HGCalHECoolingPlateL04F04, hgcalPassive:HGCalHECoolingPlateL04F05,
+ hgcalPassive:HGCalHECoolingPlateL04F06, hgcalPassive:HGCalHECoolingPlateL04F07,
+ hgcalPassive:HGCalHECoolingPlateL04F08, hgcalPassive:HGCalHECoolingPlateL04F09,
+ hgcalPassive:HGCalHECoolingPlateL04F10, hgcalPassive:HGCalHECoolingPlateL04F11,
+ hgcalPassive:HGCalHECoolingPlateL05F00, hgcalPassive:HGCalHECoolingPlateL05F01,
+ hgcalPassive:HGCalHECoolingPlateL05F02, hgcalPassive:HGCalHECoolingPlateL05F03,
+ hgcalPassive:HGCalHECoolingPlateL05F04, hgcalPassive:HGCalHECoolingPlateL05F05,
+ hgcalPassive:HGCalHECoolingPlateL05F06, hgcalPassive:HGCalHECoolingPlateL05F07,
+ hgcalPassive:HGCalHECoolingPlateL05F08, hgcalPassive:HGCalHECoolingPlateL05F09,
+ hgcalPassive:HGCalHECoolingPlateL05F10, hgcalPassive:HGCalHECoolingPlateL05F11,
+ hgcalPassive:HGCalHECoolingPlateL06F00, hgcalPassive:HGCalHECoolingPlateL06F01,
+ hgcalPassive:HGCalHECoolingPlateL06F02, hgcalPassive:HGCalHECoolingPlateL06F03,
+ hgcalPassive:HGCalHECoolingPlateL06F04, hgcalPassive:HGCalHECoolingPlateL06F05,
+ hgcalPassive:HGCalHECoolingPlateL06F06, hgcalPassive:HGCalHECoolingPlateL06F07,
+ hgcalPassive:HGCalHECoolingPlateL06F08, hgcalPassive:HGCalHECoolingPlateL06F09,
+ hgcalPassive:HGCalHECoolingPlateL06F10, hgcalPassive:HGCalHECoolingPlateL06F11,
+ hgcalPassive:HGCalHECoolingPlateL07F00, hgcalPassive:HGCalHECoolingPlateL07F01,
+ hgcalPassive:HGCalHECoolingPlateL07F02, hgcalPassive:HGCalHECoolingPlateL07F03,
+ hgcalPassive:HGCalHECoolingPlateL07F04, hgcalPassive:HGCalHECoolingPlateL07F05,
+ hgcalPassive:HGCalHECoolingPlateL07F06, hgcalPassive:HGCalHECoolingPlateL07F07,
+ hgcalPassive:HGCalHECoolingPlateL07F08, hgcalPassive:HGCalHECoolingPlateL07F09,
+ hgcalPassive:HGCalHECoolingPlateL07F10, hgcalPassive:HGCalHECoolingPlateL07F11,
+ hgcalPassive:HGCalHECoolingPlateL08F00, hgcalPassive:HGCalHECoolingPlateL08F01,
+ hgcalPassive:HGCalHECoolingPlateL08F02, hgcalPassive:HGCalHECoolingPlateL08F03,
+ hgcalPassive:HGCalHECoolingPlateL08F04, hgcalPassive:HGCalHECoolingPlateL08F05,
+ hgcalPassive:HGCalHECoolingPlateL08F06, hgcalPassive:HGCalHECoolingPlateL08F07,
+ hgcalPassive:HGCalHECoolingPlateL08F08, hgcalPassive:HGCalHECoolingPlateL08F09,
+ hgcalPassive:HGCalHECoolingPlateL08F10, hgcalPassive:HGCalHECoolingPlateL08F11,
+ hgcalPassive:HGCalHECoolingPlateL09F00, hgcalPassive:HGCalHECoolingPlateL09F01,
+ hgcalPassive:HGCalHECoolingPlateL09F02, hgcalPassive:HGCalHECoolingPlateL09F03,
+ hgcalPassive:HGCalHECoolingPlateL09F04, hgcalPassive:HGCalHECoolingPlateL09F05,
+ hgcalPassive:HGCalHECoolingPlateL09F06, hgcalPassive:HGCalHECoolingPlateL09F07,
+ hgcalPassive:HGCalHECoolingPlateL09F08, hgcalPassive:HGCalHECoolingPlateL09F09,
+ hgcalPassive:HGCalHECoolingPlateL09F10, hgcalPassive:HGCalHECoolingPlateL09F11,
+ hgcalPassive:HGCalHECoolingPlateL10F00, hgcalPassive:HGCalHECoolingPlateL10F01,
+ hgcalPassive:HGCalHECoolingPlateL10F02, hgcalPassive:HGCalHECoolingPlateL10F03,
+ hgcalPassive:HGCalHECoolingPlateL10F04, hgcalPassive:HGCalHECoolingPlateL10F05,
+ hgcalPassive:HGCalHECoolingPlateL10F06, hgcalPassive:HGCalHECoolingPlateL10F07,
+ hgcalPassive:HGCalHECoolingPlateL10F08, hgcalPassive:HGCalHECoolingPlateL10F09,
+ hgcalPassive:HGCalHECoolingPlateL10F10, hgcalPassive:HGCalHECoolingPlateL10F11,
+ hgcalPassive:HGCalHECoolingPlateL11F00, hgcalPassive:HGCalHECoolingPlateL11F01,
+ hgcalPassive:HGCalHECoolingPlateL11F02, hgcalPassive:HGCalHECoolingPlateL11F03,
+ hgcalPassive:HGCalHECoolingPlateL11F04, hgcalPassive:HGCalHECoolingPlateL11F05,
+ hgcalPassive:HGCalHECoolingPlateL11F06, hgcalPassive:HGCalHECoolingPlateL11F07,
+ hgcalPassive:HGCalHECoolingPlateL11F08, hgcalPassive:HGCalHECoolingPlateL11F09,
+ hgcalPassive:HGCalHECoolingPlateL11F10, hgcalPassive:HGCalHECoolingPlateL11F11,
+ hgcalPassive:HGCalHECoolingPlateL12F00, hgcalPassive:HGCalHECoolingPlateL12F01,
+ hgcalPassive:HGCalHECoolingPlateL12F02, hgcalPassive:HGCalHECoolingPlateL12F03,
+ hgcalPassive:HGCalHECoolingPlateL12F04, hgcalPassive:HGCalHECoolingPlateL12F05,
+ hgcalPassive:HGCalHECoolingPlateL12F06, hgcalPassive:HGCalHECoolingPlateL12F07,
+ hgcalPassive:HGCalHECoolingPlateL12F08, hgcalPassive:HGCalHECoolingPlateL12F09,
+ hgcalPassive:HGCalHECoolingPlateL12F10, hgcalPassive:HGCalHECoolingPlateL12F11,
+ hgcalPassive:HGCalHECoolingPlateL13F00, hgcalPassive:HGCalHECoolingPlateL13F01,
+ hgcalPassive:HGCalHECoolingPlateL13F02, hgcalPassive:HGCalHECoolingPlateL13F03,
+ hgcalPassive:HGCalHECoolingPlateL13F04, hgcalPassive:HGCalHECoolingPlateL13F05,
+ hgcalPassive:HGCalHECoolingPlateL13F06, hgcalPassive:HGCalHECoolingPlateL13F07,
+ hgcalPassive:HGCalHECoolingPlateL13F08, hgcalPassive:HGCalHECoolingPlateL13F09,
+ hgcalPassive:HGCalHECoolingPlateL13F10, hgcalPassive:HGCalHECoolingPlateL13F11,
+ hgcalPassive:HGCalHECoolingPlateL14F00, hgcalPassive:HGCalHECoolingPlateL14F01,
+ hgcalPassive:HGCalHECoolingPlateL14F02, hgcalPassive:HGCalHECoolingPlateL14F03,
+ hgcalPassive:HGCalHECoolingPlateL14F04, hgcalPassive:HGCalHECoolingPlateL14F05,
+ hgcalPassive:HGCalHECoolingPlateL14F06, hgcalPassive:HGCalHECoolingPlateL14F07,
+ hgcalPassive:HGCalHECoolingPlateL14F08, hgcalPassive:HGCalHECoolingPlateL14F09,
+ hgcalPassive:HGCalHECoolingPlateL14F10, hgcalPassive:HGCalHECoolingPlateL14F11,
+ hgcalPassive:HGCalHECoolingPlateL15F00, hgcalPassive:HGCalHECoolingPlateL15F01,
+ hgcalPassive:HGCalHECoolingPlateL15F02, hgcalPassive:HGCalHECoolingPlateL15F03,
+ hgcalPassive:HGCalHECoolingPlateL15F04, hgcalPassive:HGCalHECoolingPlateL15F05,
+ hgcalPassive:HGCalHECoolingPlateL15F06, hgcalPassive:HGCalHECoolingPlateL15F07,
+ hgcalPassive:HGCalHECoolingPlateL15F08, hgcalPassive:HGCalHECoolingPlateL15F09,
+ hgcalPassive:HGCalHECoolingPlateL15F10, hgcalPassive:HGCalHECoolingPlateL15F11,
+ hgcalPassive:HGCalHECoolingPlateL16F00, hgcalPassive:HGCalHECoolingPlateL16F01,
+ hgcalPassive:HGCalHECoolingPlateL16F02, gcalPassive:HGCalHECoolingPlateL16F03,
+ hgcalPassive:HGCalHECoolingPlateL16F04, hgcalPassive:HGCalHECoolingPlateL16F05,
+ hgcalPassive:HGCalHECoolingPlateL16F06, hgcalPassive:HGCalHECoolingPlateL16F07,
+ hgcalPassive:HGCalHECoolingPlateL16F08, hgcalPassive:HGCalHECoolingPlateL16F09,
+ hgcalPassive:HGCalHECoolingPlateL16F10, hgcalPassive:HGCalHECoolingPlateL16F11,
+ hgcalPassive:HGCalHECoolingPlateL17F00, hgcalPassive:HGCalHECoolingPlateL17F01,
+ hgcalPassive:HGCalHECoolingPlateL17F02, hgcalPassive:HGCalHECoolingPlateL17F03,
+ hgcalPassive:HGCalHECoolingPlateL17F04, hgcalPassive:HGCalHECoolingPlateL17F05,
+ hgcalPassive:HGCalHECoolingPlateL17F06, hgcalPassive:HGCalHECoolingPlateL17F07,
+ hgcalPassive:HGCalHECoolingPlateL17F08, hgcalPassive:HGCalHECoolingPlateL17F09,
+ hgcalPassive:HGCalHECoolingPlateL17F10, hgcalPassive:HGCalHECoolingPlateL17F11,
+ hgcalPassive:HGCalHECoolingPlateL18F00, hgcalPassive:HGCalHECoolingPlateL18F01,
+ hgcalPassive:HGCalHECoolingPlateL18F02, hgcalPassive:HGCalHECoolingPlateL18F03,
+ hgcalPassive:HGCalHECoolingPlateL18F04, hgcalPassive:HGCalHECoolingPlateL18F05,
+ hgcalPassive:HGCalHECoolingPlateL18F06, hgcalPassive:HGCalHECoolingPlateL18F07,
+ hgcalPassive:HGCalHECoolingPlateL18F08, hgcalPassive:HGCalHECoolingPlateL18F09,
+ hgcalPassive:HGCalHECoolingPlateL18F10, hgcalPassive:HGCalHECoolingPlateL18F11,
+ hgcalPassive:HGCalHECoolingPlateL19F00, hgcalPassive:HGCalHECoolingPlateL19F01,
+ hgcalPassive:HGCalHECoolingPlateL19F02, hgcalPassive:HGCalHECoolingPlateL19F03,
+ hgcalPassive:HGCalHECoolingPlateL19F04, hgcalPassive:HGCalHECoolingPlateL19F05,
+ hgcalPassive:HGCalHECoolingPlateL19F06, hgcalPassive:HGCalHECoolingPlateL19F07,
+ hgcalPassive:HGCalHECoolingPlateL19F08, hgcalPassive:HGCalHECoolingPlateL19F09,
+ hgcalPassive:HGCalHECoolingPlateL19F10, hgcalPassive:HGCalHECoolingPlateL19F11,
+ hgcalPassive:HGCalHECoolingPlateL20F00, hgcalPassive:HGCalHECoolingPlateL20F01,
+ hgcalPassive:HGCalHECoolingPlateL20F02, hgcalPassive:HGCalHECoolingPlateL20F03,
+ hgcalPassive:HGCalHECoolingPlateL20F04, hgcalPassive:HGCalHECoolingPlateL20F05,
+ hgcalPassive:HGCalHECoolingPlateL20F06, hgcalPassive:HGCalHECoolingPlateL20F07,
+ hgcalPassive:HGCalHECoolingPlateL20F08, hgcalPassive:HGCalHECoolingPlateL20F09,
+ hgcalPassive:HGCalHECoolingPlateL20F10, hgcalPassive:HGCalHECoolingPlateL20F11,
+ hgcalPassive:HGCalHECoolingPlateL21F00, hgcalPassive:HGCalHECoolingPlateL21F01,
+ hgcalPassive:HGCalHECoolingPlateL21F02, hgcalPassive:HGCalHECoolingPlateL21F03,
+ hgcalPassive:HGCalHECoolingPlateL21F04, hgcalPassive:HGCalHECoolingPlateL21F05,
+ hgcalPassive:HGCalHECoolingPlateL21F06, hgcalPassive:HGCalHECoolingPlateL21F07,
+ hgcalPassive:HGCalHECoolingPlateL21F08, hgcalPassive:HGCalHECoolingPlateL21F09,
+ hgcalPassive:HGCalHECoolingPlateL21F10, hgcalPassive:HGCalHECoolingPlateL21F11
materials:StainlessSteel, materials:StainlessSteel, materials:Air,
- materials:Air, materials:Air, materials:Copper, materials:Air
+ materials:Air, materials:Air, materials:Air, materials:Air
HGCalHEAbsorber1, HGCalHEAbsorber2, HGCalHEAirGap0, HGCalHEAirGap1,
HGCalHESteelCover, HGCalHECoolingPlate, HGCalHESiliconLayer
- 45.0*mm, 41.5*mm, 1.25*mm, 4.00*mm, 2.50*mm, 6.35*mm,
+ [hgcal:thickHEAbsorber1], [hgcal:thickHEAbsorber2], [hgcal:thickHEAirGap],
+ [hgcal:thickHEService], [hgcal:thickHESteelCover], [hgcal:thickHECooling],
[hgcal:ModuleThicknessHE]
6, 5, 5, 5, 5, 5, 5
- 67.80*mm, 63.05*mm, 63.05*mm, 63.05*mm, 63.05*mm, 63.05*mm, 63.05*mm
-
+ [hgcal:thickHEModule1], [hgcal:thickHEModule2], [hgcal:thickHEModule2],
+ [hgcal:thickHEModule2], [hgcal:thickHEModule2], [hgcal:thickHEModule2],
+ [hgcal:thickHEModule2]
2, 0, 3, 4, 6, 5,
1, 3, 4, 6, 5,
@@ -140,13 +361,13 @@
1, 3, 4, 6, 5,
1, 3, 4, 6, 5
- 0, 0, 0, -1, 1, 0,
- 0, 0, -1, 1, 0,
- 0, 0, -1, 1, 0,
- 0, 0, -1, 1, 0,
- 0, 0, -1, 1, 0,
- 0, 0, -1, 1, 0,
- 0, 0, -1, 1, 0
+ 0, 0, 0, -1, 1, -2,
+ 0, 0, -1, 1, -2,
+ 0, 0, -1, 1, -2,
+ 0, 0, -1, 1, -2,
+ 0, 0, -1, 1, -2,
+ 0, 0, -1, 1, -2,
+ 0, 0, -1, 1, -2
0, 0, 0, 0
diff --git a/Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml b/Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml
index 19691dbd90234..a7fe0f6efca9c 100644
--- a/Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml
+++ b/Geometry/HGCalCommonData/data/hgcalPassive/v19/hgcalPassive.xml
@@ -10,6 +10,15 @@
+
+
+
+
+
+
+
+
@@ -150,7 +159,7 @@
materials:Copper
- 6.05*mm
+ [hgcal:thickEECooling]
@@ -189,7 +198,7 @@
materials:Copper
- 6.05*mm
+ [hgcal:thickEECooling]
@@ -228,7 +237,241 @@
materials:Copper
- 6.05*mm
+ [hgcal:thickEECooling]
+
+
+
+
+
+ 0, 0, 0, 0
+
+ [hgcal:zHGCal0], [hgcal:zHGCal2], [hgcal:zHGCal7],
+ [hgcal:zHGCal8]
+
+ [hgcal:rMinHGCal2], [hgcal:rMinHGCal4],
+ [hgcal:rMinHGCal6], [hgcal:rMinHGCal8]
+
+ [hgcal:slope1], [hgcal:slope3], 0, 0
+
+ [hgcal:zHGCal1], [hgcal:zHGCal5], [hgcal:zHGCal10],
+ [hgcal:zHGCal11]
+
+ [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
+ [hgcal:rMaxHGCal11]
+
+
+
+
+
+
+
+
+
+
+ L01
+
+ F00, F01, F02, F03, F04, F05, F06, F07, F08, F09, F10, F11
+
+ StainlessSteel
+
+ materials:StainlessSteel
+
+ [hgcal:thickHEAbsorber1]
+
+ 0
+
+
+
+ 0, 0, 0, 0
+
+ [hgcal:zHGCal0], [hgcal:zHGCal2], [hgcal:zHGCal7],
+ [hgcal:zHGCal8]
+
+ [hgcal:rMinHGCal2], [hgcal:rMinHGCal4],
+ [hgcal:rMinHGCal6], [hgcal:rMinHGCal8]
+
+ [hgcal:slope1], [hgcal:slope3], 0, 0
+
+ [hgcal:zHGCal1], [hgcal:zHGCal5], [hgcal:zHGCal10],
+ [hgcal:zHGCal11]
+
+ [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
+ [hgcal:rMaxHGCal11]
+
+
+
+
+
+
+
+
+
+
+ L02, L03, L04, L05, L06, L07, L08, L09, L10, L11
+
+ F00, F01, F02, F03, F04, F05, F06, F07, F08, F09, F10, F11
+
+ StainlessSteel
+
+ materials:StainlessSteel
+
+ [hgcal:thickHEAbsorber2]
+
+ 0
+
+
+
+ 0, 0, 0, 0
+
+ [hgcal:zHGCal0], [hgcal:zHGCal2], [hgcal:zHGCal7],
+ [hgcal:zHGCal8]
+
+ [hgcal:rMinHGCal2], [hgcal:rMinHGCal4],
+ [hgcal:rMinHGCal6], [hgcal:rMinHGCal8]
+
+ [hgcal:slope1], [hgcal:slope3], 0, 0
+
+ [hgcal:zHGCal1], [hgcal:zHGCal5], [hgcal:zHGCal10],
+ [hgcal:zHGCal11]
+
+ [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
+ [hgcal:rMaxHGCal11]
+
+
+
+
+
+
+
+
+
+
+ L12, L13, L14, L15, L16, L17, L18, L19, L20, L21
+
+ F00, F01, F02, F03, F04, F05, F06, F07, F08, F09, F10, F11
+
+ StainlessSteel
+
+ materials:StainlessSteel
+
+ [hgcal:thickHEAbsorber3]
+
+ 0
+
+
+
+ 0, 0, 0, 0
+
+ [hgcal:zHGCal0], [hgcal:zHGCal2], [hgcal:zHGCal7],
+ [hgcal:zHGCal8]
+
+ [hgcal:rMinHGCal2], [hgcal:rMinHGCal4],
+ [hgcal:rMinHGCal6], [hgcal:rMinHGCal8]
+
+ [hgcal:slope1], [hgcal:slope3], 0, 0
+
+ [hgcal:zHGCal1], [hgcal:zHGCal5], [hgcal:zHGCal10],
+ [hgcal:zHGCal11]
+
+ [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
+ [hgcal:rMaxHGCal11]
+
+
+
+
+
+
+
+
+
+
+ L01
+
+ F00, F01, F02, F03, F04, F05, F06, F07, F08, F09, F10, F11
+
+ Copper
+
+ materials:Copper
+
+ [hgcal:thickHECooling]
+
+
+
+
+
+ 0, 0, 0, 0
+
+ [hgcal:zHGCal0], [hgcal:zHGCal2], [hgcal:zHGCal7],
+ [hgcal:zHGCal8]
+
+ [hgcal:rMinHGCal2], [hgcal:rMinHGCal4],
+ [hgcal:rMinHGCal6], [hgcal:rMinHGCal8]
+
+ [hgcal:slope1], [hgcal:slope3], 0, 0
+
+ [hgcal:zHGCal1], [hgcal:zHGCal5], [hgcal:zHGCal10],
+ [hgcal:zHGCal11]
+
+ [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
+ [hgcal:rMaxHGCal11]
+
+
+
+
+
+
+
+
+
+
+ L02, L03, L04, L05, L06, L07, L08, L09, L10, L11
+
+ F00, F01, F02, F03, F04, F05, F06, F07, F08, F09, F10, F11
+
+ Copper
+
+ materials:Copper
+
+ [hgcal:thickHECooling]
+
+
+
+
+
+ 0, 0, 0, 0
+
+ [hgcal:zHGCal0], [hgcal:zHGCal2], [hgcal:zHGCal7],
+ [hgcal:zHGCal8]
+
+ [hgcal:rMinHGCal2], [hgcal:rMinHGCal4],
+ [hgcal:rMinHGCal6], [hgcal:rMinHGCal8]
+
+ [hgcal:slope1], [hgcal:slope3], 0, 0
+
+ [hgcal:zHGCal1], [hgcal:zHGCal5], [hgcal:zHGCal10],
+ [hgcal:zHGCal11]
+
+ [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
+ [hgcal:rMaxHGCal11]
+
+
+
+
+
+
+
+
+
+
+ L12, L13, L14, L15, L16, L17, L18, L19, L20, L21
+
+ F00, F01, F02, F03, F04, F05, F06, F07, F08, F09, F10, F11
+
+ Copper
+
+ materials:Copper
+
+ [hgcal:thickHECooling]
diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedFineCassette.cc b/Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedFineCassette.cc
index 9b7d7dacbf2cc..61c3198ae43e1 100644
--- a/Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedFineCassette.cc
+++ b/Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedFineCassette.cc
@@ -75,6 +75,7 @@ class DDHGCalMixRotatedFineCassette : public DDAlgorithm {
int firstCoarseLayer_; // Copy # of the first Coarse sensitive layer
int absorbMode_; // Absorber mode
int sensitiveMode_; // Sensitive mode
+ int passiveMode_; // Mode for passive components
double zMinBlock_; // Starting z-value of the block
double waferSize_; // Width of the wafer
double waferSepar_; // Sensor separation
@@ -156,10 +157,12 @@ void DDHGCalMixRotatedFineCassette::initialize(const DDNumericArguments& nArgs,
firstCoarseLayer_ = (int)(nArgs["FirstCoarseLayer"]);
absorbMode_ = (int)(nArgs["AbsorberMode"]);
sensitiveMode_ = (int)(nArgs["SensitiveMode"]);
+ passiveMode_ = (int)(nArgs["PassiveMode"]);
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::First Layers " << firstFineLayer_ << ":"
<< firstCoarseLayer_ << " and "
- << "Absober:Sensitive mode " << absorbMode_ << ":" << sensitiveMode_;
+ << "Absober:Sensitive mode " << absorbMode_ << ":" << sensitiveMode_ << ":"
+ << passiveMode_;
#endif
zMinBlock_ = nArgs["zMinBlock"];
waferSize_ = nArgs["waferSize"];
@@ -685,59 +688,94 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
// Make the bottom part next
int layer = (copyM - firstFineLayer_);
- static const double sqrt3 = std::sqrt(3.0);
- int layercenter = layerOrient_[layer];
- int layertype = HGCalTypes::layerFrontBack(layerOrient_[layer]);
- int firstWafer = waferLayerStart_[layer];
- int lastWafer = ((layer + 1 < static_cast(waferLayerStart_.size())) ? waferLayerStart_[layer + 1]
- : static_cast(waferIndex_.size()));
- double delx = 0.5 * (waferSize_ + waferSepar_);
- double dely = 2.0 * delx / sqrt3;
- double dy = 0.75 * dely;
- const auto& xyoff = geomTools_.shiftXY(layercenter, (waferSize_ + waferSepar_));
-#ifdef EDM_ML_DEBUG
- int ium(0), ivm(0), kount(0);
- std::vector ntype(3, 0);
- edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::Bottom: " << glog.ddname() << " r " << delx << " R "
- << dely << " dy " << dy << " Shift " << xyoff.first << ":" << xyoff.second
- << " WaferSize " << (waferSize_ + waferSepar_) << " index " << firstWafer << ":"
- << (lastWafer - 1) << " Copy " << copyM << ":" << layer;
-#endif
- for (int k = firstWafer; k < lastWafer; ++k) {
- int u = HGCalWaferIndex::waferU(waferIndex_[k]);
- int v = HGCalWaferIndex::waferV(waferIndex_[k]);
-#ifdef EDM_ML_DEBUG
- int iu = std::abs(u);
- int iv = std::abs(v);
-#endif
- int nr = 2 * v;
- int nc = -2 * u + v;
- int type = HGCalProperty::waferThick(waferProperty_[k]);
- int part = HGCalProperty::waferPartial(waferProperty_[k]);
- int orien = HGCalProperty::waferOrient(waferProperty_[k]);
- int cassette = HGCalProperty::waferCassette(waferProperty_[k]);
- int place = HGCalCell::cellPlacementIndex(1, layertype, orien);
-#ifdef EDM_ML_DEBUG
- edm::LogVerbatim("HGCalGeom")
- << "DDHGCalMixRotatedFineCassette::index:Property:layertype:type:part:orien:cassette:place:offsets:ind " << k
- << ":" << waferProperty_[k] << ":" << layertype << ":" << type << ":" << part << ":" << orien << ":" << cassette
- << ":" << place;
-#endif
- auto cshift = cassette_.getShift(layer + 1, -1, cassette, false);
- double xpos = xyoff.first - cshift.first + nc * delx;
- double ypos = xyoff.second + cshift.second + nr * dy;
-#ifdef EDM_ML_DEBUG
- double xorig = xyoff.first + nc * delx;
- double yorig = xyoff.second + nr * dy;
- double angle = std::atan2(yorig, xorig);
- edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::Wafer: layer " << layer + 1 << " cassette "
- << cassette << " Shift " << cshift.first << ":" << cshift.second << " Original "
- << xorig << ":" << yorig << ":" << convertRadToDeg(angle) << " Final " << xpos << ":"
- << ypos;
-#endif
- std::string wafer;
- int i(999);
- if (absType < 0) {
+ if (absType > 0) {
+#ifdef EDM_ML_DEBUG
+ int kount(0);
+#endif
+ for (int k = 0; k < cassettes_; ++k) {
+ int cassette = k + 1;
+ auto cshift = cassette_.getShift(layer + 1, -1, cassette);
+ double xpos = -cshift.first;
+ double ypos = cshift.second;
+ int i = layer * cassettes_ + k;
+#ifdef EDM_ML_DEBUG
+ edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::Passive: layer " << layer + 1 << " cassette "
+ << cassette << " Shift " << cshift.first << ":" << cshift.second << " PassiveIndex "
+ << i << ":" << passiveFull_.size() << ":" << passivePart_.size();
+#endif
+ std::string passive = (absType <= waferTypes_) ? passiveFull_[i] : passivePart_[i];
+#ifdef EDM_ML_DEBUG
+ edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Passive " << passive << " number " << cassette
+ << " pos " << xpos << ":" << ypos;
+ kount++;
+#endif
+ DDTranslation tran(xpos, ypos, 0.0);
+ DDRotation rotation;
+ DDName name = DDName(DDSplit(passive).first, DDSplit(passive).second);
+ cpv.position(name, glog.ddname(), cassette, tran, rotation);
+#ifdef EDM_ML_DEBUG
+ edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << name << " number " << cassette
+ << " positioned in " << glog.ddname() << " at " << tran << " with no rotation";
+#endif
+ }
+#ifdef EDM_ML_DEBUG
+ edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: " << kount << " passives of type " << absType
+ << " for " << glog.ddname();
+#endif
+ } else {
+ static const double sqrt3 = std::sqrt(3.0);
+ int layercenter = layerOrient_[layer];
+ int layertype = HGCalTypes::layerFrontBack(layerOrient_[layer]);
+ int firstWafer = waferLayerStart_[layer];
+ int lastWafer = ((layer + 1 < static_cast(waferLayerStart_.size())) ? waferLayerStart_[layer + 1]
+ : static_cast(waferIndex_.size()));
+ double delx = 0.5 * (waferSize_ + waferSepar_);
+ double dely = 2.0 * delx / sqrt3;
+ double dy = 0.75 * dely;
+ const auto& xyoff = geomTools_.shiftXY(layercenter, (waferSize_ + waferSepar_));
+#ifdef EDM_ML_DEBUG
+ int ium(0), ivm(0), kount(0);
+ std::vector ntype(3, 0);
+ edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::Bottom: " << glog.ddname() << " r " << delx
+ << " R " << dely << " dy " << dy << " Shift " << xyoff.first << ":" << xyoff.second
+ << " WaferSize " << (waferSize_ + waferSepar_) << " index " << firstWafer << ":"
+
+ << (lastWafer - 1) << " Copy " << copyM << ":" << layer;
+#endif
+ for (int k = firstWafer; k < lastWafer; ++k) {
+ int u = HGCalWaferIndex::waferU(waferIndex_[k]);
+ int v = HGCalWaferIndex::waferV(waferIndex_[k]);
+#ifdef EDM_ML_DEBUG
+ int iu = std::abs(u);
+ int iv = std::abs(v);
+#endif
+ int nr = 2 * v;
+ int nc = -2 * u + v;
+ int type = HGCalProperty::waferThick(waferProperty_[k]);
+ int part = HGCalProperty::waferPartial(waferProperty_[k]);
+ int orien = HGCalProperty::waferOrient(waferProperty_[k]);
+ int cassette = HGCalProperty::waferCassette(waferProperty_[k]);
+ int place = HGCalCell::cellPlacementIndex(1, layertype, orien);
+#ifdef EDM_ML_DEBUG
+ edm::LogVerbatim("HGCalGeom")
+ << "DDHGCalMixRotatedFineCassette::index:Property:layertype:type:part:orien:cassette:place:offsets:ind " << k
+ << ":" << waferProperty_[k] << ":" << layertype << ":" << type << ":" << part << ":" << orien << ":"
+ << cassette << ":" << place;
+#endif
+ auto cshift = cassette_.getShift(layer + 1, -1, cassette, false);
+ double xpos = xyoff.first - cshift.first + nc * delx;
+ double ypos = xyoff.second + cshift.second + nr * dy;
+#ifdef EDM_ML_DEBUG
+ double xorig = xyoff.first + nc * delx;
+ double yorig = xyoff.second + nr * dy;
+ double angle = std::atan2(yorig, xorig);
+ edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette::Wafer: layer " << layer + 1 << " cassette "
+ << cassette << " Shift " << cshift.first << ":" << cshift.second << " Original "
+ << xorig << ":" << yorig << ":" << convertRadToDeg(angle) << " Final " << xpos
+ << ":" << ypos;
+#endif
+ std::string wafer;
+ int i(999);
if (part == HGCalTypes::WaferFull) {
i = type * facingTypes_ * orientationTypes_ + place - placeOffset_;
#ifdef EDM_ML_DEBUG
@@ -758,61 +796,36 @@ void DDHGCalMixRotatedFineCassette::positionMix(const DDLogicalPart& glog,
#endif
wafer = waferPart_[i];
}
- } else {
- type = absType;
- if (part == HGCalTypes::WaferFull) {
- i = absType - 1;
- wafer = passiveFull_[i];
-#ifdef EDM_ML_DEBUG
- edm::LogVerbatim("HGCalGeom") << " layertype:abstype:part:orien:cassette:offsets:ind " << layertype << ":"
- << absType << ":" << part << ":" << orien << ":" << cassette << ":"
- << ":" << partialTypes_ << ":" << orientationTypes_ << " passive " << i << ":"
- << wafer;
+ int copy = HGCalTypes::packTypeUV(type, u, v);
+#ifdef EDM_ML_DEBUG
+ edm::LogVerbatim("HGCalGeom") << " DDHGCalMixRotatedFineCassette: Layer "
+ << HGCalWaferIndex::waferLayer(waferIndex_[k]) << " Wafer " << wafer << " number "
+ << copy << " type :part:orien:ind " << type << ":" << part << ":" << orien << ":"
+ << i << " layer:u:v " << (layer + firstFineLayer_) << ":" << u << ":" << v;
+ if (iu > ium)
+ ium = iu;
+ if (iv > ivm)
+ ivm = iv;
+ kount++;
+ if (copies_.count(copy) == 0)
+ copies_.insert(copy);
+#endif
+ DDTranslation tran(xpos, ypos, 0.0);
+ DDName name = DDName(DDSplit(wafer).first, DDSplit(wafer).second);
+ cpv.position(name, glog.ddname(), copy, tran, rot);
+#ifdef EDM_ML_DEBUG
+ ++ntype[type];
+ edm::LogVerbatim("HGCalGeom") << " DDHGCalMixRotatedFineCassette: " << name << " number " << copy << " type "
+ << layertype << ":" << type << " positioned in " << glog.ddname() << " at " << tran
+ << " with no rotation";
#endif
- } else {
- int partoffset = (part >= HGCalTypes::WaferHDTop)
- ? HGCalTypes::WaferPartHDOffset
- : (HGCalTypes::WaferPartLDOffset - HGCalTypes::WaferTypeOffset[1]);
- i = (part - partoffset) * facingTypes_ * orientationTypes_ +
- (absType - 1) * facingTypes_ * orientationTypes_ * partialTypes_ + place - placeOffset_;
-#ifdef EDM_ML_DEBUG
- edm::LogVerbatim("HGCalGeom") << " layertype:abstype:part:orien:cassette:3Types:offset:ind " << layertype << ":"
- << absType << ":" << part << ":" << orien << ":" << cassette << ":"
- << partialTypes_ << ":" << facingTypes_ << ":" << orientationTypes_ << ":"
- << partoffset << ":" << i << ":" << passivePart_.size();
-#endif
- wafer = passivePart_[i];
- }
}
- int copy = HGCalTypes::packTypeUV(type, u, v);
-#ifdef EDM_ML_DEBUG
- edm::LogVerbatim("HGCalGeom") << " DDHGCalMixRotatedFineCassette: Layer "
- << HGCalWaferIndex::waferLayer(waferIndex_[k]) << " Wafer " << wafer << " number "
- << copy << " type :part:orien:ind " << type << ":" << part << ":" << orien << ":" << i
- << " layer:u:v " << (layer + firstFineLayer_) << ":" << u << ":" << v;
- if (iu > ium)
- ium = iu;
- if (iv > ivm)
- ivm = iv;
- kount++;
- if (copies_.count(copy) == 0)
- copies_.insert(copy);
-#endif
- DDTranslation tran(xpos, ypos, 0.0);
- DDName name = DDName(DDSplit(wafer).first, DDSplit(wafer).second);
- cpv.position(name, glog.ddname(), copy, tran, rot);
-#ifdef EDM_ML_DEBUG
- ++ntype[type];
- edm::LogVerbatim("HGCalGeom") << " DDHGCalMixRotatedFineCassette: " << name << " number " << copy << " type "
- << layertype << ":" << type << " positioned in " << glog.ddname() << " at " << tran
- << " with no rotation";
-#endif
- }
#ifdef EDM_ML_DEBUG
- edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Maximum # of u " << ium << " # of v " << ivm
- << " and " << kount << " wafers (" << ntype[0] << ":" << ntype[1] << ":" << ntype[2]
- << ") for " << glog.ddname();
+ edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedFineCassette: Maximum # of u " << ium << " # of v " << ivm
+ << " and " << kount << " wafers (" << ntype[0] << ":" << ntype[1] << ":" << ntype[2]
+ << ") for " << glog.ddname();
#endif
+ }
}
DEFINE_EDM_PLUGIN(DDAlgorithmFactory, DDHGCalMixRotatedFineCassette, "hgcal:DDHGCalMixRotatedFineCassette");
diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalPassive.cc b/Geometry/HGCalCommonData/plugins/DDHGCalPassive.cc
index 10976b11b5e3f..703524a28e4a0 100644
--- a/Geometry/HGCalCommonData/plugins/DDHGCalPassive.cc
+++ b/Geometry/HGCalCommonData/plugins/DDHGCalPassive.cc
@@ -21,7 +21,7 @@
#include
#include
-//#define EDM_ML_DEBUG
+#define EDM_ML_DEBUG
using namespace angle_units::operators;
diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalSiliconRotatedCassette.cc b/Geometry/HGCalCommonData/plugins/DDHGCalSiliconRotatedCassette.cc
index 2e1e6b5a72149..57f9e0367e5d1 100644
--- a/Geometry/HGCalCommonData/plugins/DDHGCalSiliconRotatedCassette.cc
+++ b/Geometry/HGCalCommonData/plugins/DDHGCalSiliconRotatedCassette.cc
@@ -32,7 +32,7 @@
#include
#include
-//#define EDM_ML_DEBUG
+#define EDM_ML_DEBUG
using namespace angle_units::operators;
class DDHGCalSiliconRotatedCassette : public DDAlgorithm {
@@ -50,6 +50,7 @@ class DDHGCalSiliconRotatedCassette : public DDAlgorithm {
void constructLayers(const DDLogicalPart&, DDCompactView& cpv);
void positionSensitive(const DDLogicalPart& glog, int layer, DDCompactView& cpv);
void positionPassive(const DDLogicalPart& glog, int layer, int passiveType, DDCompactView& cpv);
+ void positionPassive2(const DDLogicalPart& glog, int layer, int passiveType, DDCompactView& cpv);
private:
HGCalGeomTools geomTools_;
@@ -67,6 +68,7 @@ class DDHGCalSiliconRotatedCassette : public DDAlgorithm {
int firstLayer_; // Copy # of the first sensitive layer
int absorbMode_; // Absorber mode
int sensitiveMode_; // Sensitive mode
+ int passiveMode_; // Mode for passive volumes
double zMinBlock_; // Starting z-value of the block
double waferSize_; // Width of the wafer
double waferSepar_; // Sensor separation
@@ -126,9 +128,11 @@ void DDHGCalSiliconRotatedCassette::initialize(const DDNumericArguments& nArgs,
firstLayer_ = static_cast(nArgs["FirstLayer"]);
absorbMode_ = static_cast(nArgs["AbsorberMode"]);
sensitiveMode_ = static_cast(nArgs["SensitiveMode"]);
+ passiveMode_ = static_cast(nArgs["PassiveMode"]);
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << "First Layer " << firstLayer_ << " and "
- << "Absober:Sensitive mode " << absorbMode_ << ":" << sensitiveMode_;
+ << "Absober:Sensitive mode " << absorbMode_ << ":" << sensitiveMode_ << ":"
+ << passiveMode_;
#endif
zMinBlock_ = nArgs["zMinBlock"];
waferSize_ = nArgs["waferSize"];
@@ -379,10 +383,13 @@ void DDHGCalSiliconRotatedCassette::constructLayers(const DDLogicalPart& module,
<< routs << ", " << hthick << ", 0.0, 360.0 and position " << glog.name()
<< " number " << copy << ":" << layerOrient_[copy - firstLayer_] << " Z " << zz;
#endif
- if (layerSense_[ly] > 0)
+ if (layerSense_[ly] > 0) {
positionSensitive(glog, (copy - firstLayer_), cpv);
- else
+ } else if (passiveMode_ > 0) {
+ positionPassive2(glog, (copy - firstLayer_), -layerSense_[ly], cpv);
+ } else {
positionPassive(glog, (copy - firstLayer_), -layerSense_[ly], cpv);
+ }
}
DDTranslation r1(0, 0, zz);
DDRotation rot;
@@ -435,6 +442,10 @@ void DDHGCalSiliconRotatedCassette::positionSensitive(const DDLogicalPart& glog,
#ifdef EDM_ML_DEBUG
int ium(0), ivm(0), kount(0);
std::vector ntype(3, 0);
+ edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette: PositionSensitive layer " << layer << " r " << delx
+ << " R " << dely << " dy " << dy << " Shift " << xyoff.first << ":" << xyoff.second
+ << " WaferSize " << (waferSize_ + waferSepar_) << " index " << firstWafer << ":"
+ << (lastWafer - 1) << " Layer Center " << layercenter << ":" << layertype;
edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette: " << glog.ddname() << " r " << delx << " R " << dely
<< " dy " << dy << " Shift " << xyoff.first << ":" << xyoff.second << " WaferSize "
<< (waferSize_ + waferSepar_) << " index " << firstWafer << ":" << (lastWafer - 1)
@@ -471,13 +482,15 @@ void DDHGCalSiliconRotatedCassette::positionSensitive(const DDLogicalPart& glog,
int i(999);
if (part == HGCalTypes::WaferFull) {
i = type * facingTypes_ * orientationTypes_ + place - placeOffset_;
- wafer = waferFull_[i];
+ edm::LogVerbatim("HGCalGeom") << "facitype " << facingTypes_ << ":" << orientationTypes_ << ":" << placeOffset_
+ << " i " << i << ":" << waferFull_.size();
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << " layertype:type:part:orien:cassette:place:offsets:ind " << layertype << ":"
<< type << ":" << part << ":" << orien << ":" << cassette << ":" << place << ":"
<< placeOffset_ << ":" << facingTypes_ << ":" << orientationTypes_ << " wafer " << i
- << ":" << wafer;
+ << ":" << waferFull_.size();
#endif
+ wafer = waferFull_[i];
} else {
int partoffset = (part >= HGCalTypes::WaferHDTop) ? HGCalTypes::WaferPartHDOffset : HGCalTypes::WaferPartLDOffset;
i = (part - partoffset) * facingTypes_ * orientationTypes_ +
@@ -523,11 +536,14 @@ void DDHGCalSiliconRotatedCassette::positionSensitive(const DDLogicalPart& glog,
#endif
}
-// Position the passive modules
+// Position the passive modules (mode == 0)
void DDHGCalSiliconRotatedCassette::positionPassive(const DDLogicalPart& glog,
int layer,
int absType,
DDCompactView& cpv) {
+#ifdef EDM_ML_DEBUG
+ edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette: positionPassive is called";
+#endif
static const double sqrt3 = std::sqrt(3.0);
int layercenter = layerOrient_[layer];
int layertype = (layerOrient_[layer] == HGCalTypes::WaferCenterB) ? 1 : 0;
@@ -539,6 +555,10 @@ void DDHGCalSiliconRotatedCassette::positionPassive(const DDLogicalPart& glog,
double dy = 0.75 * dely;
const auto& xyoff = geomTools_.shiftXY(layercenter, (waferSize_ + waferSepar_));
#ifdef EDM_ML_DEBUG
+ edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette: PositionPassive Layer " << layer << " LayerCenter "
+ << layercenter << ":" << layertype << " r " << delx << " R " << dely << " dy " << dy
+ << " Shift " << xyoff.first << ":" << xyoff.second << " WaferSize "
+ << (waferSize_ + waferSepar_) << " index " << firstWafer << ":" << (lastWafer - 1);
int ium(0), ivm(0), kount(0);
edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette: " << glog.ddname() << " r " << delx << " R " << dely
<< " dy " << dy << " Shift " << xyoff.first << ":" << xyoff.second << " WaferSize "
@@ -626,4 +646,45 @@ void DDHGCalSiliconRotatedCassette::positionPassive(const DDLogicalPart& glog,
#endif
}
+// Position the passive modules (mode > 0)
+void DDHGCalSiliconRotatedCassette::positionPassive2(const DDLogicalPart& glog,
+ int layer,
+ int absType,
+ DDCompactView& cpv) {
+#ifdef EDM_ML_DEBUG
+ edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette: positionPassive2 is called";
+ int kount(0);
+#endif
+ for (int k = 0; k < cassettes_; ++k) {
+ int cassette = k + 1;
+ auto cshift = cassette_.getShift(layer + 1, -1, cassette);
+ double xpos = -cshift.first;
+ double ypos = cshift.second;
+ int i = layer * cassettes_ + k;
+#ifdef EDM_ML_DEBUG
+ edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette::Passive: layer " << layer + 1 << " cassette "
+ << cassette << " Shift " << cshift.first << ":" << cshift.second << " PassiveIndex "
+ << i << ":" << passiveFull_.size() << ":" << passivePart_.size();
+#endif
+ std::string passive = (absType <= waferTypes_) ? passiveFull_[i] : passivePart_[i];
+#ifdef EDM_ML_DEBUG
+ edm::LogVerbatim("HGCalGeom") << " DDHGCalSiliconRotatedCassette: Passive " << passive << " number " << cassette
+ << " pos " << xpos << ":" << ypos;
+ kount++;
+#endif
+ DDTranslation tran(xpos, ypos, 0.0);
+ DDRotation rotation;
+ DDName name = DDName(DDSplit(passive).first, DDSplit(passive).second);
+ cpv.position(name, glog.ddname(), cassette, tran, rotation);
+#ifdef EDM_ML_DEBUG
+ edm::LogVerbatim("HGCalGeom") << " DDHGCalSiliconRotatedCassette: " << name << " number " << cassette
+ << " positioned in " << glog.ddname() << " at " << tran << " with no rotation";
+#endif
+ }
+#ifdef EDM_ML_DEBUG
+ edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette: " << kount << " passives of type " << absType
+ << " for " << glog.ddname();
+#endif
+}
+
DEFINE_EDM_PLUGIN(DDAlgorithmFactory, DDHGCalSiliconRotatedCassette, "hgcal:DDHGCalSiliconRotatedCassette");