Merge pull request #600 from MOLLER-UVa/redesign-collimator-6A-6B

Redesign collimator 6A and 6B; reduce the IR of collimator 4.
JeffersonLab · May 17, 2023 · abef28c · abef28c
2 parents 1d6c4b8 + da4bb0a
commit abef28c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/geometry/hybrid/hybridDaughter_unified.gdml b/geometry/hybrid/hybridDaughter_unified.gdml
@@ -519,42 +519,42 @@
 
         <!--    Solid for Collimator 6A -->
         <xtru name="Coll6A_solid1" lunit="mm">
-            <twoDimVertex x="49.836" y="-7.792"/>
-            <twoDimVertex x="49.836" y="-24.000"/>
-            <twoDimVertex x="95.250" y="-45.870"/>
-            <twoDimVertex x="95.250" y="-35.113"/>
-            <twoDimVertex x="91.821" y="-35.113"/>
-            <twoDimVertex x="91.821" y="-26.985"/>
-            <twoDimVertex x="95.250" y="-26.985"/>
-            <twoDimVertex x="95.250" y="-25.080"/>
+            <twoDimVertex x="30.000" y="2.000"/>
+            <twoDimVertex x="30.000" y="-14.447"/>
+            <twoDimVertex x="88.900" y="-42.812"/>
+            <twoDimVertex x="88.900" y="-35.113"/>
+            <twoDimVertex x="85.471" y="-35.113"/>
+            <twoDimVertex x="85.471" y="-26.985"/>
+            <twoDimVertex x="88.900" y="-26.985"/>
+            <twoDimVertex x="88.900" y="-25.080"/>
             <twoDimVertex x="70.787" y="-25.080"/>
-            <twoDimVertex x="70.787" y="-7.792"/>
+            <twoDimVertex x="70.787" y="2.000"/>
             <section zOrder="1" zPosition="0" xOffset="0" yOffset="0" scalingFactor="1"/>
             <section zOrder="2" zPosition="69.850" xOffset="0" yOffset="0" scalingFactor="1"/>
         </xtru>
-        <cone aunit="deg" deltaphi="30" lunit="mm" name="Coll6A_Cylinder_solid1" rmax1="55.314" rmax2="57.982" rmin1="45" rmin2="50" startphi="-30" z="70"/>
+        <cone aunit="deg" deltaphi="360" lunit="mm" name="Coll6A_Cylinder_solid1" rmax1="55.31" rmax2="56.29" rmin1="0" rmin2="0" startphi="0" z="70"/>
         <subtraction name="Coll6A_solid_1">
             <first ref="Coll6A_solid1"/>
             <second ref="Coll6A_Cylinder_solid1"/>
             <position name="Coll6A_Sub_pos1" unit="mm" x="0" y="0" z="69.850/2" />
         </subtraction>
 
         <xtru name="Coll6A_solid2" lunit="mm">
-            <twoDimVertex x="50.277" y="29.851"/>
-            <twoDimVertex x="50.277" y="7.792"/>
-            <twoDimVertex x="70.787" y="7.792"/>
+            <twoDimVertex x="30.000" y="20.086"/>
+            <twoDimVertex x="30.000" y="-2.000"/>
+            <twoDimVertex x="70.787" y="-2.000"/>
             <twoDimVertex x="70.787" y="25.080"/>
-            <twoDimVertex x="95.250" y="25.080"/>
-            <twoDimVertex x="95.250" y="26.985"/>
-            <twoDimVertex x="91.821" y="26.985"/>
-            <twoDimVertex x="91.821" y="35.113"/>
-            <twoDimVertex x="95.250" y="35.113"/>
-            <twoDimVertex x="95.250" y="45.870"/>
-            <twoDimVertex x="93.046" y="50.447"/>
+            <twoDimVertex x="88.900" y="25.080"/>
+            <twoDimVertex x="88.900" y="26.985"/>
+            <twoDimVertex x="85.471" y="26.985"/>
+            <twoDimVertex x="85.471" y="35.113"/>
+            <twoDimVertex x="88.900" y="35.113"/>
+            <twoDimVertex x="88.900" y="42.812"/>
+            <twoDimVertex x="86.696" y="47.389"/>
             <section zOrder="1" zPosition="0" xOffset="0" yOffset="0" scalingFactor="1"/>
             <section zOrder="2" zPosition="69.850" xOffset="0" yOffset="0" scalingFactor="1"/>
         </xtru>
-        <cone aunit="deg" deltaphi="35" lunit="mm" name="Coll6A_Cylinder_solid2" rmax1="58.471" rmax2="61.143" rmin1="45" rmin2="50" startphi="5" z="70"/>
+        <cone aunit="deg" deltaphi="360" lunit="mm" name="Coll6A_Cylinder_solid2" rmax1="56.46" rmax2="57.44" rmin1="0" rmin2="0" startphi="0" z="70"/>
         <subtraction name="Coll6A_solid_2">
             <first ref="Coll6A_solid2"/>
             <second ref="Coll6A_Cylinder_solid2"/>
@@ -578,7 +578,7 @@
             <section zOrder="1" zPosition="0" xOffset="0" yOffset="0" scalingFactor="1"/>
             <section zOrder="2" zPosition="69.850" xOffset="0" yOffset="0" scalingFactor="1"/>
         </xtru>
-        <cone aunit="deg" deltaphi="35" lunit="mm" name="Coll6B_Cylinder_solid1" rmax1="59.911" rmax2="65.411" rmin1="50" rmin2="52" startphi="330" z="71"/>
+        <cone aunit="deg" deltaphi="360" lunit="mm" name="Coll6B_Cylinder_solid1" rmax1="80.00" rmax2="81.47" rmin1="0" rmin2="0" startphi="0" z="70"/>
         <subtraction name="Coll6B_solid_1">
             <first ref="Coll6B_solid1"/>
             <second ref="Coll6B_Cylinder_solid1"/>
@@ -601,7 +601,7 @@
             <section zOrder="1" zPosition="0" xOffset="0" yOffset="0" scalingFactor="1"/>
             <section zOrder="2" zPosition="69.850" xOffset="0" yOffset="0" scalingFactor="1"/>
         </xtru>
-        <cone aunit="deg" deltaphi="50" lunit="mm" name="Coll6B_Cylinder_solid2" rmax1="66.411" rmax2="71.912" rmin1="55" rmin2="56" startphi="-15" z="71"/>
+        <cone aunit="deg" deltaphi="360" lunit="mm" name="Coll6B_Cylinder_solid2" rmax1="81.73" rmax2="83.20" rmin1="0" rmin2="0" startphi="0" z="70"/>
         <subtraction name="Coll6B_solid_2">
             <first ref="Coll6B_solid2"/>
             <second ref="Coll6B_Cylinder_solid2"/>

diff --git a/geometry/upstream/upstreamTorusRegion.gdml b/geometry/upstream/upstreamTorusRegion.gdml
@@ -78,8 +78,8 @@
 
 
 <!-- Dimensions for Collimator 4   -->    
-    <constant name="PCOLL2_R1_U" value ="40"/>
-    <constant name="PCOLL2_R1_D" value ="40"/>
+    <constant name="PCOLL2_R1_U" value ="26"/>
+    <constant name="PCOLL2_R1_D" value ="26"/>
     <constant name="PCOLL2_R4_U" value ="250"/>
     <constant name="PCOLL2_R4_D" value ="250"/>