Merge pull request #31675 from bsunanda/Phase2-hcx265

Phase2-hcx265 Address the warnings reported in #31672
cms-sw · Oct 6, 2020 · 2aaf537 · 2aaf537
2 parents c3c5d03 + 70b9382
commit 2aaf537
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Geometry/ForwardCommonData/data/hfnose/v4/hfnose.xml b/Geometry/ForwardCommonData/data/hfnose/v4/hfnose.xml
@@ -23,7 +23,7 @@
   <Constant name="HFNoseDz1"             value="50.0*mm"/>
   <Constant name="HFNoseDz2"             value="23.0*mm"/>
   <Constant name="HFNoseDz3"             value="70.0*mm"/>
-  <Constant name="HFNoseDz0"             value="18.35*mm"/>
+  <Constant name="HFNoseDz0"             value="18.55*mm"/>
   <Constant name="NumberAbs1"            value="1"/>
   <Constant name="NumberAbs2"            value="6"/>
   <Constant name="NumberAbs3"            value="2"/>
@@ -53,8 +53,8 @@
   <Polycone name="HFNoseVol" startPhi="0*deg" deltaPhi="360*deg">
     <ZSection z="[HFNoseZ1]" rMin="[HFNoseRMin1]" rMax="[HFNoseRMax1]"/>
     <ZSection z="[HFNoseZ2]" rMin="[HFNoseRMin2]" rMax="[HFNoseRMax2]"/>
-    <ZSection z="[HFNoseZ2]" rMin="[HFNoseRMin2]" rMax="[cms:CMSR3]"/>
-    <ZSection z="[HFNoseZ4]" rMin="[HFNoseRMin4]" rMax="[cms:CMSR3]"/>
+    <ZSection z="[HFNoseZ2]" rMin="[cms:ForwdBeamR1]" rMax="[cms:CMSR3]"/>
+    <ZSection z="[HFNoseZ4]" rMin="[cms:ForwdBeamR1]" rMax="[cms:CMSR3]"/>
   </Polycone>
   <Polycone name="HFNose" startPhi="0*deg" deltaPhi="360*deg">
     <ZSection z="[HFNoseZ1]" rMin="[HFNoseRMin1]" rMax="[HFNoseRMax1]"/>

diff --git a/Geometry/ForwardCommonData/data/hfnoseLayer/v2/hfnoseLayer.xml b/Geometry/ForwardCommonData/data/hfnoseLayer/v2/hfnoseLayer.xml
@@ -24,8 +24,8 @@
     <Vector name="Layers" type="numeric" nEntries="8"> 
       13, 12, 12, 12, 12, 12, 10, 10</Vector>
     <Vector name="LayerThick" type="numeric" nEntries="8"> 
-      91.35*mm, 41.35*mm, 41.35*mm, 41.35*mm, 41.35*mm, 41.35*mm, 88.35*mm,
-      88.35*mm </Vector>
+      91.55*mm, 41.55*mm, 41.55*mm, 41.55*mm, 41.55*mm, 41.55*mm, 88.55*mm,
+      88.55*mm </Vector>
     <Vector name="LayerType" type="numeric" nEntries="93"> 
       0, 1, 2, 1, 9, 8, 4,10, 5,11, 7, 3, 8,
       1, 2, 1, 9, 8, 4,10, 5,11, 7, 3, 8,