Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new optics target, sieve geometry, and blocker #607

Closed
wants to merge 5 commits into from
Closed

Add new optics target, sieve geometry, and blocker #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2fa7e10
add blocker geometry
Sep 25, 2023
607729c
blocker scripts
Sep 25, 2023
78358d7
Merge branch 'develop' of https://github.com/JeffersonLab/remoll into…
Feb 12, 2024
a59ef77
I added an "Optics3" target that is a single carbon foil in the cente…
Feb 13, 2024
3fc3fa0
updated the optics targets to be more realistic
Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions geometry/positions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="-1795.00" x="200" unit="mm"/>
<position name="sieveVirtualPlane_pos" z="250.00" unit="mm"/>
<position name="blockerActualCenter_pos" z="-1795.00" x="-200" unit="mm"/>


<!-- Showermax virtual plane detector position -->
<position name="showerMaxVirtualPlane_pos" z="23920.00-90.00" unit="mm"/>
Expand Down
56 changes: 47 additions & 9 deletions geometry/target/targetLadder.gdml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand All @@ -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>

Expand Down Expand Up @@ -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"/>
Expand Down Expand Up @@ -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"/>
Expand Down Expand Up @@ -255,6 +288,11 @@
<position y="-63*cm"/>
</physvol>

<physvol>
<volumeref ref="TargetPositionOptics3_logical"/>
<position y="-70*cm"/>
</physvol>

<auxiliary auxtype="TargetLadder" auxvalue=""/>
</volume>

Expand Down
49 changes: 49 additions & 0 deletions geometry/upstream/blocker.gdml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="1.043" unit="in"/>
<quantity name="blocker_system_outer_radius" type="length" value="3.858" unit="in"/>
<quantity name="blocker_system_thickness" type="length" value="3.937" unit="in"/>

</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>




Loading
Loading