Merge pull request #608 from ktevans/develop

Add new optics target, sieve geometry, and blocker
JeffersonLab · Oct 7, 2024 · e9e2e43 · e9e2e43
2 parents 25da657 + c5d0be3
commit e9e2e43
Show file tree

Hide file tree

Showing 11 changed files with 409 additions and 130 deletions.
diff --git a/geometry/mollerParallel.gdml b/geometry/mollerParallel.gdml
@@ -993,7 +993,7 @@
 
     <physvol name="sieveVirtualPlane_phys">
       <volumeref ref="sieveVirtualPlane_log"/>
-      <position ref="sieveVirtualPlane_pos" unit="mm" z="105"/>
+      <position ref="sieveVirtualPlane_pos" unit="mm" z="250"/>
     </physvol>
 
     <physvol name="Col2Ent_phys">

diff --git a/geometry/positions.xml b/geometry/positions.xml
@@ -67,8 +67,10 @@
 <position name="n2atmoVirtualPlane_pos" z="31525.00" unit="mm"/>
 
 <!-- Sieve position -->
-<position name="sieveActualCenter_pos" z="-1895.00" x="200" unit="mm"/>
-<position name="sieveVirtualPlane_pos" z="105.00" unit="mm"/>
+<position name="sieveActualCenter_pos" z="-1750.00" x="200" unit="mm"/>
+<position name="sieveVirtualPlane_pos" z="250.00" unit="mm"/>
+<position name="blockerActualCenter_pos" z="-1750.00" x="-200" unit="mm"/>
+
 
 <!-- Showermax virtual plane detector position -->
 <position name="showerMaxVirtualPlane_pos" z="23920.00-90.00" unit="mm"/>

diff --git a/geometry/target/targetLadder.gdml b/geometry/target/targetLadder.gdml
@@ -11,7 +11,7 @@
 
 <solids>
   <box name="TargetLadder1_solid" x="200" y="200" z="1300" lunit="mm"/>
-  <box name="TargetLadder2_solid" x="200" y="600" z="1300" lunit="mm"/>
+  <box name="TargetLadder2_solid" x="200" y="700" z="1300" lunit="mm"/>
   <union name="TargetLadder_solid">
     <first ref="TargetLadder1_solid"/>
     <second ref="TargetLadder2_solid"/>
@@ -38,7 +38,7 @@
     <second ref="TargetAlHole_solid"/>
   </subtraction>
 
-  <box name="TargetCFoil_solid" x="25*mm" y="25*mm" z="1*mm"/>
+  <box name="TargetCFoil_solid" x="25*mm" y="25*mm" z="0.254*mm"/>
 
 </solids>
 
@@ -121,7 +121,7 @@
   <volume name="TargetAlDummy4pctUS_logical">
     <materialref ref="G4_Al"/>
     <solidref ref="TargetAlDummy4pct_solid"/>
-    <auxiliary auxtype="TargetSamplingVolume" auxvalue="USAl"/>
+    <auxiliary auxtype="TargetSamplingVolume" auxvalue="DSAl"/>
   </volume>
   <volume name="TargetAlDummy2pctDS_logical">
     <materialref ref="G4_Al"/>
@@ -175,38 +175,71 @@
     <solidref ref="TargetCFoil_solid"/>
     <auxiliary auxtype="TargetSamplingVolume" auxvalue="USC"/>
   </volume>
+
+  <volume name="TargetCFoilMS_logical">
+    <materialref ref="G4_C"/>
+    <solidref ref="TargetCFoil_solid"/>
+    <auxiliary auxtype="TargetSamplingVolume" auxvalue="MSC"/>
+  </volume>
+
   <volume name="TargetCFoilDS_logical">
     <materialref ref="G4_C"/>
     <solidref ref="TargetCFoil_solid"/>
     <auxiliary auxtype="TargetSamplingVolume" auxvalue="DSC"/>
   </volume>
+
+
   <volume name="TargetPositionOptics1_logical">
     <materialref ref="G4_Galactic"/>
     <solidref ref="TargetPosition_solid"/>
-    <physvol>
+    <!--<physvol>
       <volumeref ref="TargetCFoilUS_logical"/>
       <position z="-30*cm"/>
-    </physvol>
+    </physvol>-->
+
     <physvol>
       <volumeref ref="TargetCFoilDS_logical"/>
-      <position z="+60*cm"/>
+      <position z="-62.45*cm"/>
     </physvol>
+
     <auxiliary auxtype="TargetSystem" auxvalue="Optics1"/>
   </volume>
+
+
   <volume name="TargetPositionOptics2_logical">
     <materialref ref="G4_Galactic"/>
     <solidref ref="TargetPosition_solid"/>
-    <physvol>
+
+    <!--<physvol>
       <volumeref ref="TargetCFoilUS_logical"/>
       <position z="-60*cm"/>
-    </physvol>
+    </physvol>-->
+
     <physvol>
       <volumeref ref="TargetCFoilDS_logical"/>
-      <position z="+30*cm"/>
+      <position z="+62.45*cm"/>
     </physvol>
+
     <auxiliary auxtype="TargetSystem" auxvalue="Optics2"/>
   </volume>
 
+  <volume name="TargetPositionOptics3_logical">
+    <materialref ref="G4_Galactic"/>
+    <solidref ref="TargetPosition_solid"/>
+
+    <!--<physvol>
+      <volumeref ref="TargetCFoilUS_logical"/>
+      <position z="-60*cm"/>
+    </physvol>-->
+
+    <physvol>
+      <volumeref ref="TargetCFoilDS_logical"/>
+      <position z="+0.0127*cm"/>
+    </physvol>
+
+    <auxiliary auxtype="TargetSystem" auxvalue="Optics3"/>
+  </volume>
+
   <volume name="TargetLadder_logical">
     <materialref ref="G4_Galactic"/>
     <solidref ref="TargetLadder_solid"/>
@@ -255,6 +288,11 @@
       <position y="-63*cm"/>
     </physvol>
 
+    <physvol>
+      <volumeref ref="TargetPositionOptics3_logical"/>
+      <position y="-70*cm"/>
+    </physvol>
+
     <auxiliary auxtype="TargetLadder" auxvalue=""/>
   </volume>
 

diff --git a/geometry/upstream/blocker.gdml b/geometry/upstream/blocker.gdml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gdml
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="http://service-spi.web.cern.ch/service-spi/app/releases/GDML/schema/gdml.xsd">
+
+<define>
+  <!-- Full blocker system dimensions -->
+  <quantity name="blocker_system_inner_radius" type="length" value="26.5" unit="mm"/>
+  <quantity name="blocker_system_outer_radius" type="length" value="98" unit="mm"/>
+  <quantity name="blocker_system_thickness" type="length" value="100" unit="mm"/>
+
+</define>
+
+<materials>
+</materials>
+
+
+<solids>
+  <!-- Blocker system solid -->
+  <tube name="blocker_system_solid"
+    rmin="blocker_system_inner_radius"
+    rmax="blocker_system_outer_radius"
+    z="blocker_system_thickness"
+    startphi="0" deltaphi="360.0" aunit="deg"
+    />
+</solids>
+
+<structure>
+  <volume name="blocker_system_logic">
+    <materialref ref="G4_W"/>
+    <solidref ref="blocker_system_solid"/>
+    <auxiliary auxtype="Alpha" auxvalue="0.1"/>
+    <auxiliary auxtype="SensDet" auxvalue="sieveDet"/>
+    <auxiliary auxtype="DetType" auxvalue="secondaries"/>
+    <auxiliary auxtype="DetType" auxvalue="boundaryhits"/>
+    <auxiliary auxtype="DetType" auxvalue="lowenergyneutral"/>
+    <auxiliary auxtype="DetNo" auxvalue="1007"/>
+  </volume>
+</structure>
+
+<setup name="blocker_system_world" version="1.0">
+  <world ref="blocker_system_logic"/>
+</setup>
+
+</gdml>
+
+
+
+