Skip to content
Snippets Groups Projects
Commit 38fe0292 authored by FU Chengdong's avatar FU Chengdong
Browse files

update to center pipe of default CEPC_v4

parent 96a31054
No related branches found
No related tags found
No related merge requests found
......@@ -25,21 +25,21 @@
start="TUBE_firstCone_zStart" end="TUBE_firstCone_zEnd"
rMin1="TUBE_firstCone_rInnerStart" rMin2="TUBE_firstCone_rInnerEnd"
rMax1="TUBE_firstCone_rInnerStart+TUBE_firstCone_RadThickness" rMax2="TUBE_firstCone_rInnerEnd+TUBE_firstCone_RadThickness"
material="G4_Cu" name="IPInnerBulge" />
material="G4_Be" name="IPInnerBulge" />
<!-- second cylinder -->
<section type ="Center"
<!--section type ="Center"
start="TUBE_secondCylinder_zStart" end="TUBE_secondCylinder_zEnd"
rMin1="TUBE_secondCylinder_rInner" rMin2="TUBE_secondCylinder_rInner"
rMax1="TUBE_secondCylinder_rInner+TUBE_secondCylinder_thickness" rMax2="TUBE_secondCylinder_rInner+TUBE_secondCylinder_thickness"
material="G4_Cu" name="IPOuterTube" />
material="G4_Cu" name="IPOuterTube" /-->
<!-- second cone, split into parts -->
<section type ="Center"
<!--section type ="Center"
start="TUBE_secondCone_part1_zStart" end="TUBE_secondCone_part4_zEnd"
rMin1="TUBE_secondCone_part1_rInnerStart" rMin2="TUBE_secondCone_part4_rInnerEnd"
rMax1="TUBE_secondCone_part1_rInnerStart+TUBE_secondCone_part1_RadThickness" rMax2="TUBE_secondCone_part4_rInnerEnd+TUBE_secondCone_part4_RadThickness"
material="BeampipeBeCableMix" name="IPOuterTube" />
material="BeampipeBeCableMix" name="IPOuterTube" /-->
<!--section type ="Center"
start="TUBE_secondCone_part2_zStart" end="TUBE_secondCone_part2_zEnd"
......
......@@ -112,14 +112,14 @@
<constant name="BCal_rOuter" value="140*mm"/>
<!-- the beam tube -->
<constant name="TUBE_IPInnerTube_end_z" value="200*mm"/>
<constant name="TUBE_IPInnerTube_end_z" value="500*mm"/>
<constant name="TUBE_central_inner_radius" value="14*mm"/>
<constant name="TUBE_central_thickness" value="0.5*mm"/>
<constant name="TUBE_IPInnerBulge_end_z" value="500*mm"/>
<constant name="TUBE_IPInnerBulge_end_innerradius" value="19.5*mm"/>
<constant name="TUBE_IPInnerBulge_end_z" value="700*mm"/>
<constant name="TUBE_IPInnerBulge_end_innerradius" value="17.5*mm"/>
<constant name="TUBE_IPOuterTube_start_z" value="500*mm"/>
<constant name="TUBE_IPOuterTube_start_z" value="700*mm"/>
<constant name="TUBE_IPOuterTube_end_z" value="700*mm"/>
<constant name="TUBE_Lcal_clearance" value="20*mm"/>
......
......@@ -8,7 +8,7 @@
<constant name="TUBE_firstCone_zEnd" value="TUBE_IPInnerBulge_end_z"/>
<constant name="TUBE_firstCone_rInnerStart" value="TUBE_innerCylinder_rInner"/>
<constant name="TUBE_firstCone_rInnerEnd" value="TUBE_IPInnerBulge_end_innerradius"/>
<constant name="TUBE_firstCone_thickness" value="3*mm"/>
<constant name="TUBE_firstCone_thickness" value="0.5*mm"/>
<!--
D. Jeans, update april 2017
in this driver, we have to define the what I call the radial thickness
......@@ -19,8 +19,8 @@
<constant name="TUBE_firstCone_dz" value="TUBE_firstCone_zEnd-TUBE_firstCone_zStart"/>
<constant name="TUBE_firstCone_dr" value="TUBE_firstCone_rInnerEnd-TUBE_firstCone_rInnerStart"/>
<constant name="TUBE_firstCone_costh" value="TUBE_firstCone_dz/sqrt( TUBE_firstCone_dz**2. + TUBE_firstCone_dr**2. )"/>
<constant name="TUBE_firstCone_RadThickness" value="TUBE_firstCone_thickness/TUBE_firstCone_costh"/>
<!--constant name="TUBE_firstCone_RadThickness" value="TUBE_firstCone_thickness/TUBE_firstCone_costh"/-->
<constant name="TUBE_firstCone_RadThickness" value="TUBE_firstCone_thickness"/>
<constant name="TUBE_secondCylinder_zStart" value="TUBE_firstCone_zEnd"/>
<constant name="TUBE_secondCylinder_zEnd" value="TUBE_IPOuterTube_end_z"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment