Merge branch 'master' into 'master'

Beampipe update

See merge request !205

Detector/DetCRD/compact/CRD_common_v01/Lumical_o1_v01.xml

@@ -80,13 +80,10 @@
             </layer>
             <layer name = "LYSO_2nd">
                 <slice  dx="10*mm" dy="10*mm" dz="150*mm" material="LYSO" vis="GrayVis" sensitive="yes" limits="5*mm">
-	            <position x="0" y="-12*mm" z="875*mm"/>
+	            <position x="0" y="-12*mm" z="800*mm"/>
 	            <rotation x="0" y="0" z="0" />
                 </slice>
             </layer>
-            
-        
-            
         </detector>
     </detectors>
 
@@ -112,4 +109,4 @@
     </readout>
   </readouts>
 
-</lccdd>
+</lccdd>
\ No newline at end of file

Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml

@@ -78,6 +78,9 @@
     <constant name="BeamPipe_FirstSeparated_zmax"  value="1110*mm"/>
     <constant name="BeamPipe_Mask_zmin"            value="1210*mm"/>
     <constant name="BeamPipe_Mask_zmax"            value="1230*mm"/>
+    <constant name="BeamPipe_SR_Mask_z1"           value="1850*mm"/>
+    <constant name="BeamPipe_SR_Mask_z2"           value="1870*mm"/>
+    <constant name="BeamPipe_SR_Mask_z3"           value="1880*mm"/>
     <constant name="BeamPipe_Q1a_zmin"             value="1900*mm"/>
     <constant name="BeamPipe_Q1a_zmax"             value="3110*mm"/>
     <constant name="BeamPipe_Q1b_zmin"             value="3190*mm"/>
@@ -86,11 +89,22 @@
     <constant name="BeamPipe_QF1_zmax"             value="6200*mm"/>
     <constant name="BeamPipe_end_z"                value="7050*mm"/>
 
-    <constant name="BeamPipe_Central_inner_radius"  value="10*mm"/>
+    <constant name="BeamPipe_AntiSolenoid1_zmin"         value="1130*mm"/>
+    <constant name="BeamPipe_AntiSolenoid1_zmax"         value="1900*mm"/>
+    <constant name="BeamPipe_AntiSolenoid1_inner_radius" value="90*mm"/>
+    <constant name="BeamPipe_AntiSolenoid2_zmin"         value="1930*mm"/>
+    <constant name="BeamPipe_AntiSolenoid2_zmax"         value="3964*mm"/>
+    <constant name="BeamPipe_AntiSolenoid2_inner_radius" value="120*mm"/>
+    <constant name="BeamPipe_AntiSolenoid3_zmin"         value="3970*mm"/>
+    <constant name="BeamPipe_AntiSolenoid3_zmax"         value="7000*mm"/>
+    <constant name="BeamPipe_AntiSolenoid3_inner_radius" value="185*mm"/>
+
+    <constant name="BeamPipe_Central_inner_radius"  value="9.995*mm"/>
     <constant name="BeamPipe_Fork_inner_radius"     value="10*mm"/>
     <constant name="BeamPipe_FirstExpand_width"     value="35*mm"/>
     <constant name="BeamPipe_SecondExpand_width"    value="39*mm"/>
     <constant name="BeamPipe_Mask_inner_radius"     value="6*mm"/>
+    <constant name="BeamPipe_Cu_thickness_SR_Mask_mid" value="7*mm"/>
     <constant name="BeamPipe_Q1a_inner_radius"      value="BeamPipe_Fork_inner_radius"/>
     <constant name="BeamPipe_Q1b_inner_radius"      value="11.5*mm"/>
     <constant name="BeamPipe_QF1_inner_radius"      value="16*mm"/>

Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml

@@ -27,7 +27,7 @@
 
   <include ref="./TDR_Dimensions_v01_01.xml"/>
 
-  <include ref="../CRD_common_v02/Beampipe_v01_06.xml"/>
+  <include ref="../CRD_common_v02/Beampipe_v01_07.xml"/>
   <!--preliminary vertex and tracker, to update/-->
   <!--include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_01.xml"/-->
   <include ref="../CRD_common_v02/VXD_Composite_v01_02.xml"/>