I added an "Optics3" target that is a single carbon foil in the cente…

…r of the z region of the target ladder. It it placed under the "Optics2" target in y on the ladder. I also edited Optics1 and Optics2 to be single foil targets that sample from the DSC target. Also, I grabbed the most up-to-date sieve design from Vassu Doomra.
JeffersonLab · Feb 13, 2024 · a59ef77 · a59ef77
1 parent 78358d7
commit a59ef77
Show file tree

Hide file tree

Showing 4 changed files with 297 additions and 123 deletions.
diff --git a/geometry/target/targetLadder.gdml b/geometry/target/targetLadder.gdml
@@ -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"/>
     </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="-60*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*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>