Merge pull request #12055 from vandreev11/hgcal-v7-geometry-EEFH-corr…

…ections

Hgcal v7 geometry eefh corrections

Geometry/HGCalCommonData/data/v7/hgcal.xml

@@ -9,16 +9,16 @@
   <Constant name="zHGCal1"     value="3170.0*mm"/>
   <Constant name="rMaxHGCal10" value="29.5*cm"/>
   <Constant name="rMaxHGCal1"  value="1534.5*mm"/>
-  <Constant name="zHGCal2"     value="4014.2*mm"/>
+  <Constant name="zHGCal2"     value="3898.2*mm"/>
   <Constant name="rMaxHGCal2"  value="([rMaxHGCal1]+(([zHGCal2]-[zHGCal1])*[slope2]))"/>
-  <Constant name="zHGCal3"     value="4340.4*mm"/>
+  <Constant name="zHGCal3"     value="4180.4*mm"/>
   <Constant name="rMaxHGCal3"  value="([rMaxHGCal2]+(([zHGCal3]-[zHGCal2])*[slope3]))"/>
   <Constant name="rMaxHGCal4"  value="2458.0*mm"/>
-  <Constant name="zHGCal4"     value="5036.4*mm"/>
-  <Constant name="zHGCal44"    value="4275.4*mm"/>
+  <Constant name="zHGCal4"     value="4876.4*mm"/>
+  <Constant name="zHGCal44"    value="4115.4*mm"/>
   <Constant name="zHGCal45"    value="[zHGCal3]"/>
   <Constant name="zMinEE"      value="[zHGCal1]"/>
-  <Constant name="zMaxEE"      value="3536.8*mm"/>
+  <Constant name="zMaxEE"      value="3508.8*mm"/>
   <Constant name="zMinHE"      value="[zMaxEE]"/>
   <Constant name="rMinHGCal1"  value="[etaMax:slope]*[zHGCal1]"/>
   <Constant name="rMinHGCal2"  value="[etaMax:slope]*[zHGCal2]"/>    
@@ -31,8 +31,8 @@
   <Constant name="rMaxEEMin"   value="[rMaxHGCal1]"/>
   <Constant name="rMaxEEMax"   value="([rMaxHGCal1]+(([zMaxEE]-[zHGCal1])*[slope2]))"/>
   <Constant name="rMaxHEMin"   value="[rMaxEEMax]"/>
-  <Constant name="factor1"     value="cos(15*deg)"/>
-  <Constant name="factor2"     value="cos(15*deg)"/>
+  <Constant name="factor1"     value="cos(10*deg)"/>
+  <Constant name="factor2"     value="cos(10*deg)"/>
   <Constant name="rMapEEMin"   value="[rMaxEEMin]*[factor1]"/>
   <Constant name="rMapEEMax"   value="[rMaxEEMax]*[factor1]"/>
   <Constant name="rMapHEMin"   value="[rMaxHEMin]*[factor1]"/>