CLD_o2_v05.xml diff

198c198
<         <constant name="LumiCal_max_z" value="1186.5*mm" />
---
>         <!-- For convenience, z here refers to dimensions *along the beam pipe*, which is tilted by CrossingAngle/2 w.r.t the global z axis -->
199a200,201
>         <constant name="LumiCal_dz" value="112.5/2.0"/> <!-- Must be consistent with layers defined in the lumiCal xml (25*4.5 mm)-->
>         <constant name="LumiCal_max_z" value="LumiCal_min_z+LumiCal_dz*2*mm" />
201c203,204
<         <constant name="LumiCal_dz" value="(LumiCal_max_z-LumiCal_min_z)/2.0"/>
---
>         <constant name="LumiCal_inner_radius" value="55.0*mm"/>
>         <constant name="LumiCal_outer_radius" value="115.0*mm- env_safety"/>
203,204c206,212
< 	<constant name="LumiCal_inner_radius" value="55.0*mm"/>
< 	<constant name="LumiCal_outer_radius" value="112.0*mm- env_safety"/>
---
>         <constant name="LumiCal_Instr_thickness" value="20*mm"/>
>         <constant name="LumiCal_Instr_inner_radius" value="LumiCal_outer_radius"/>
>         <constant name="LumiCal_Instr_outer_radius" value="LumiCal_outer_radius+LumiCal_Instr_thickness - env_safety"/>
>
>         <constant name="LumiCal_Cool_thickness" value="9.75*mm"/>
>         <constant name="LumiCal_Cool_inner_radius" value="LumiCal_Instr_outer_radius"/>
>         <constant name="LumiCal_Cool_outer_radius" value="LumiCal_Instr_outer_radius+LumiCal_Cool_thickness"/>
206,215d213
< 	<constant name="LumiCal_Instr_thickness" value="20*mm"/>
< 	<constant name="LumiCal_Instr_inner_radius" value="LumiCal_outer_radius"/>
< 	<constant name="LumiCal_Instr_outer_radius" value="LumiCal_outer_radius+LumiCal_Instr_thickness - env_safety"/>
<
< 	<constant name="LumiCal_Cool_thickness" value="9.75*mm"/>
< 	<constant name="LumiCal_Cool_inner_radius" value="LumiCal_Instr_outer_radius"/>
< 	<constant name="LumiCal_Cool_outer_radius" value="LumiCal_Instr_outer_radius+LumiCal_Cool_thickness"/>
<
<         <constant name="Lcal_services_rmax" value="LumiCal_outer_radius+30*mm"/>
<         <constant name="Lcal_offset_phi" value=" 0."/>
220,224c218,219
<         <constant name="LumiCal_shield_dz" value="1.75*mm"/>
<         <!--nose-->
<         <constant name="LumiCal_NoseShield_inner_radius" value="LumiCal_inner_radius-5*mm"/>
<         <constant name="LumiCal_NoseShield_outer_radius" value="LumiCal_inner_radius+10*mm"/>
<         <constant name="LumiCal_nose_shield_dz" value="12*mm"/>
---
>         <!-- For convenience, z here refers to dimensions *along the beam pipe*, which is tilted by CrossingAngle/2 w.r.t the global z axis -->
>         <constant name="LumiCal_shield_dz" value="3.5/2.0*mm"/> <!-- Must be consistent with layers defined in the lumiCal xml (1*3.5 mm)-->
294c289
<     <include ref="LumiCal_o3_v02_03.xml"/>
---
>     <include ref="LumiCal_o3_v02_04.xml"/>