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

Tof new geom #796

Merged
merged 39 commits into from
Oct 20, 2024
Merged

Tof new geom #796

Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
4bd7cc7
Added BarrelTOFTracker_geo.cpp. It's basically the same as BarrelTrac…
ssedd1123 Aug 3, 2024
27e5338
Merge branch 'eic:main' into main
ssedd1123 Aug 26, 2024
47219bf
Added variables for the central ring that people are considereing.
ssedd1123 Aug 26, 2024
3b51b94
Using realiztic (sort of) sensor geometry.
ssedd1123 Aug 29, 2024
d4d7839
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 30, 2024
e68b470
Merge branch 'main' into main
veprbl Sep 22, 2024
6a20277
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 22, 2024
461ad90
Merge branch 'eic:main' into main
ssedd1123 Sep 23, 2024
b399cb8
Update src/BarrelTOFTracker_geo.cpp
ssedd1123 Sep 23, 2024
e97ec93
Merge branch 'eic:main' into main
ssedd1123 Sep 27, 2024
7f00f9b
Use a more realistic geometry for EndcapTOF.
ssedd1123 Sep 28, 2024
3d35c57
Merge branch 'main' of https://github.com/ssedd1123/epic
ssedd1123 Sep 28, 2024
89de5a8
Updated endcap TOF geo. BTOF sensors are now double sided.
ssedd1123 Oct 8, 2024
c843a78
Removed un-necessary cout.
ssedd1123 Oct 8, 2024
6183629
Updated license
ssedd1123 Oct 9, 2024
e5451c4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 9, 2024
6a03211
ETOF geometry changed to match newest drawing. And fixed volume overl…
ssedd1123 Oct 9, 2024
a34cd92
Resolve pull conflicts on ETOF.
ssedd1123 Oct 9, 2024
8395a7b
The ring is now located in the right place.
ssedd1123 Oct 9, 2024
e751e50
Latest report shows that the BTOF staves are cut in two halfs, and th…
ssedd1123 Oct 10, 2024
4176675
Added cooling tubes between the sensors.
ssedd1123 Oct 11, 2024
a8f96f3
More accurate sensor configurations. (Half sensors near the edge.)
ssedd1123 Oct 11, 2024
3654b7c
Merge remote-tracking branch 'origin/main' into tof_new_gemo
ssedd1123 Oct 11, 2024
44599e2
Sensitive volume are placed in one single parent layer instead of two…
ssedd1123 Oct 11, 2024
32fcb7b
Include modified file.
ssedd1123 Oct 11, 2024
c594cdb
Moved the volumes to the right place to eliminate overlaps.
ssedd1123 Oct 11, 2024
a5d3fb3
Fixed overlap geometry.
ssedd1123 Oct 12, 2024
f1241c9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 12, 2024
f8df330
Fixed overlap geometry.
ssedd1123 Oct 12, 2024
a488fed
Fix merging conflicts.
ssedd1123 Oct 12, 2024
c470949
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 12, 2024
7e49b62
Fixed Endcap module overlapping error.
ssedd1123 Oct 12, 2024
c309329
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 12, 2024
b1414d8
Fixed Endcap module overlapping error (again).
ssedd1123 Oct 12, 2024
9fc43eb
Merge branch 'main' into tof_new_gemo
ssedd1123 Oct 15, 2024
268a3db
Merge branch 'main' into tof_new_gemo
ssedd1123 Oct 17, 2024
407aabb
Update src/EndcapTOF_geo.cpp
ssedd1123 Oct 17, 2024
7647cf9
Removed magic numbers from tof_endcap.xml.
ssedd1123 Oct 17, 2024
df82fce
retrigger checks
ssedd1123 Oct 18, 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
11 changes: 7 additions & 4 deletions compact/tracking/definitions_craterlake.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,18 @@

<comment> Main parameters for Barrel TOF layers </comment>
<comment> Barrel TOF region </comment>
<constant name="BarrelTOF_zmin" value="112.5*cm"/>
<constant name="BarrelTOF_zmax" value="174.0*cm"/>
<constant name="BarrelTOF1_zmin" value="115.0*cm"/>
<constant name="BarrelTOF1_zmax" value="14.75*cm"/>
<constant name="BarrelTOF2_zmin" value="-15.25*cm"/>
<constant name="BarrelTOF2_zmax" value="174.0*cm"/>

<constant name="BarrelTOF_radius_design" value="64.6*cm"/>

<comment> Forward TOF region </comment>
<constant name="ForwardTOFRegion_zmin" value="174.0*cm" />
<constant name="ForwardTOFRegion_tan" value="CentralTrackingRegionP_tan" />
<constant name="ForwardTOFRegion_minR" value="8*cm" />
<constant name="ForwardTOFRegion_maxR" value="50*cm" />
<constant name="ForwardTOFRegion_minR" value="10.5*cm" />
<constant name="ForwardTOFRegion_maxR" value="60.5*cm" />
<constant name="ForwardTOF_xOffset" value="-2.75*cm" />
<constant name="ForwardTOF_det_height" value="2.0*cm" />
<constant name="ForwardTOF_length" value="min(ForwardTOFRegion_length, 2.*cm)"/>
Expand Down
122 changes: 88 additions & 34 deletions compact/tracking/tof_barrel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,21 @@
<constant name="BarrelTOF_rOffset2" value="1.4*cm"/>
<constant name="BarrelTOF_rmin" value="BarrelTOF_radius-BarrelTOF_rOffset1"/>
<constant name="BarrelTOF_rmax" value="BarrelTOF_radius+BarrelTOF_rOffset2"/>
<constant name="BarrelTOF_zoffset" value="0.5*(BarrelTOF_zmax - BarrelTOF_zmin)"/>
<constant name="BarrelTOF_length1" value="BarrelTOF_zmin + BarrelTOF_zmax"/>
<constant name="BarrelTOF_length2" value="BarrelTOF_length1"/>
<constant name="BarrelTOF_length" value="BarrelTOF_length2"/>
<constant name="BarrelTOF_zoffset" value="0.5*(BarrelTOF2_zmax - BarrelTOF1_zmin)"/>
<constant name="BarrelTOF1_zoffset" value="BarrelTOF_zoffset - 0.5*(BarrelTOF1_zmax - BarrelTOF1_zmin)"/>
<constant name="BarrelTOF2_zoffset" value="BarrelTOF_zoffset - 0.5*(BarrelTOF2_zmax - BarrelTOF2_zmin)"/>
<constant name="BarrelTOF1_length" value="BarrelTOF1_zmin + BarrelTOF1_zmax"/>
<constant name="BarrelTOF2_length" value="BarrelTOF2_zmin + BarrelTOF2_zmax"/>
<constant name="BarrelTOF_length" value="BarrelTOF1_zmin + BarrelTOF2_zmax"/>

<constant name="BarrelTOF_Sensor_length" value="4*cm"/>
<constant name="BarrelTOF_Sensor_deadspaceY" value="0.1*cm"/>
<constant name="BarrelTOF_Sensor_amount" value="64"/>
<constant name="BarrelTOF_Sensor_length" value="2*cm"/>
<constant name="BarrelTOF_Sensor_overlap" value="1*mm"/>
<constant name="BarrelTOF_Sensor_deadspaceY" value="2*cm - BarrelTOF_Sensor_overlap"/>
<constant name="BarrelTOF1_Sensor_amount" value="33"/>
<constant name="BarrelTOF1_Sensor_amount_back" value="33"/>
<constant name="BarrelTOF2_Sensor_amount" value="41"/>
<constant name="BarrelTOF2_Sensor_amount_back" value="40"/>

<constant name="BarrelTOF_ring_center" value="144*cm"/>
<constant name="BarrelTOF_ring_width" value="0.7*cm"/>
<constant name="BarrelTOF_Sensor_Center_before_ring" value="-0.5*BarrelTOF_length1+BarrelTOF_ring_center-BarrelTOF_ring_width-0.5*BarrelTOF_Sensor_length"/>
<constant name="BarrelTOF_First_Sensor_Center" value="-(0.5*BarrelTOF_Sensor_amount-1)*(BarrelTOF_Sensor_length+BarrelTOF_Sensor_deadspaceY) + BarrelTOF_Sensor_Center_before_ring"/>

</define>

Expand All @@ -91,52 +93,104 @@
insideTrackingVolume="true">
<type_flags type="DetType_TRACKER + DetType_BARREL"/>
<dimensions
rmin="BarrelTOF_rmin"
rmax="BarrelTOF_rmax"
length="BarrelTOF_length"/>
rmin="BarrelTOF_rmin - 1*mm"
rmax="BarrelTOF_rmax + 1*mm"
length="BarrelTOF_length"
/>
<comment>
Tracker Barrel Modules
</comment>
<module name="BarrelTOF_Module1" vis="TOFBarrelModuleVis">
<module_component name="sensor" material="Silicon" sensitive="true" width="BarrelTOF_Sensor_width" length="BarrelTOF_Sensor_length" thickness="BarrelTOF_Sensor_thickness" vis="TOFSensorVis" >
<GridSensors start_x="BarrelTOF_Sensor_position" start_y="BarrelTOF_First_Sensor_Center" start_z="0" xdist="0" ydist="BarrelTOF_Sensor_length+BarrelTOF_Sensor_deadspaceY" nx="1" ny="BarrelTOF_Sensor_amount" ny_before_ring="0.5*BarrelTOF_Sensor_amount" ring_extra_width="BarrelTOF_ring_width-2*BarrelTOF_Sensor_deadspaceY"/>
<comment>
keep_layer means the next module is located at the same thickness level
so you can place component side by side
Just make sure all components you placed side by side share the same thickness
</comment>
<module_component name="sensorFront" material="Silicon" sensitive="true" width="BarrelTOF_Sensor_width" length="BarrelTOF_Sensor_length" thickness="0.5*BarrelTOF_Sensor_thickness" vis="TOFSensorVis" keep_layer="true">
<GridSensors start_x="BarrelTOF_Sensor_position" start_y="-0.5*BarrelTOF1_length + BarrelTOF1_zoffset" start_z="0" xdist="0" ydist="BarrelTOF_Sensor_length+BarrelTOF_Sensor_deadspaceY" nx="1" ny="BarrelTOF1_Sensor_amount" half_length="left"/>
</module_component>
<module_component name="hybridtop" material="Kapton" sensitive="false" width="BarrelTOF_Module_width" length="BarrelTOF_length1" thickness="BarrelTOF_Hybrid_thickness" vis="TOFHybridVis" >
<position x="BarrelTOF_Service_position" y="0" z="0" />

<module_component name="sensorFront" material="Silicon" sensitive="true" width="BarrelTOF_Sensor_width" length="BarrelTOF_Sensor_length" thickness="0.5*BarrelTOF_Sensor_thickness" vis="TOFSensorVis" >
<GridSensors start_x="BarrelTOF_Sensor_position" start_y="0.5*BarrelTOF2_length-(BarrelTOF2_Sensor_amount-1)*(BarrelTOF_Sensor_length+BarrelTOF_Sensor_deadspaceY)+BarrelTOF2_zoffset" start_z="0" xdist="0" ydist="BarrelTOF_Sensor_length+BarrelTOF_Sensor_deadspaceY" nx="1" ny="BarrelTOF2_Sensor_amount" half_length="both"/>
</module_component>

<module_component name="hybridtop" material="Kapton" sensitive="false" width="BarrelTOF_Module_width" length="BarrelTOF1_length" thickness="BarrelTOF_Hybrid_thickness" vis="TOFHybridVis" keep_layer="true">
<position x="BarrelTOF_Service_position" y="BarrelTOF1_zoffset" z="0" />
</module_component>
<module_component name="hybridtop" material="Kapton" sensitive="false" width="BarrelTOF_Module_width" length="BarrelTOF2_length" thickness="BarrelTOF_Hybrid_thickness" vis="TOFHybridVis" >
<position x="BarrelTOF_Service_position" y="BarrelTOF2_zoffset" z="0" />
</module_component>

<module_component name="cfskintop" material="CFRPMix2" sensitive="false" width="BarrelTOF_Module_width" length="BarrelTOF1_length" thickness="BarrelTOF_CFSkin_thickness" vis="TOFCSkinVis" keep_layer="true">
<position x="BarrelTOF_Service_position" y="BarrelTOF1_zoffset" z="0" />
</module_component>
<module_component name="cfskintop" material="CFRPMix2" sensitive="false" width="BarrelTOF_Module_width" length="BarrelTOF2_length" thickness="BarrelTOF_CFSkin_thickness" vis="TOFCSkinVis" >
<position x="BarrelTOF_Service_position" y="BarrelTOF2_zoffset" z="0" />
</module_component>

<module_component name="cfskintop" material="CFRPMix2" sensitive="false" width="BarrelTOF_Module_width" length="BarrelTOF1_length" thickness="BarrelTOF_CFSkin_thickness" vis="TOFCSkinVis" keep_layer="true">
<position x="BarrelTOF_Service_position" y="BarrelTOF1_zoffset" z="0" />
</module_component>
<module_component name="cfskintop" material="CFRPMix2" sensitive="false" width="BarrelTOF_Module_width" length="BarrelTOF2_length" thickness="BarrelTOF_CFSkin_thickness" vis="TOFCSkinVis" >
<position x="BarrelTOF_Service_position" y="BarrelTOF2_zoffset" z="0" />
</module_component>
<module_component name="cfskintop" material="CFRPMix2" sensitive="false" width="BarrelTOF_Module_width" length="BarrelTOF_length1" thickness="BarrelTOF_CFSkin_thickness" vis="TOFCSkinVis" >
<position x="BarrelTOF_Service_position" y="0" z="0" />


<module_component name="cfoam" material="CarbonFoam" sensitive="false" width="BarrelTOF_CFoam_width" length="BarrelTOF1_length" thickness="BarrelTOF_CFoam_thickness" vis="TOFCFoamVis" coolingTube="true" keep_layer="true">
<position x="BarrelTOF_CFoam_position" y="BarrelTOF1_zoffset" z="0" />
<inner_tube name="cooling_tube" material="Aluminum" rmin="0.2*BarrelTOF_CFoam_thickness" rmax="0.24*BarrelTOF_CFoam_thickness"/>
<inner_tube name="coolant" material="NOVEC7200" rmin="0" rmax="0.2*BarrelTOF_CFoam_thickness" vis="TOFWater"/>
</module_component>
<module_component name="cfoam" material="CarbonFoam" sensitive="false" width="BarrelTOF_CFoam_width" length="BarrelTOF2_length" thickness="BarrelTOF_CFoam_thickness" vis="TOFCFoamVis" coolingTube="true" keep_layer="true">
<position x="BarrelTOF_CFoam_position" y="BarrelTOF2_zoffset" z="0" />
<inner_tube name="cooling_tube" material="Aluminum" rmin="0.2*BarrelTOF_CFoam_thickness" rmax="0.24*BarrelTOF_CFoam_thickness"/>
<inner_tube name="coolant" material="NOVEC7200" rmin="0" rmax="0.2*BarrelTOF_CFoam_thickness" vis="TOFWater"/>
</module_component>
<module_component name="choneycomb" material="CFRPMix" sensitive="false" width="BarrelTOF_CHoneycomb_width" length="BarrelTOF1_length" thickness="BarrelTOF_CHoneycomb_thickness" vis="TOFCHoneycombVis" keep_layer="true">
<position x="BarrelTOF_CHoneycomb_position" y="BarrelTOF1_zoffset" z="0" />
<inner_tube name="cooling_tube" material="Aluminum" rmin="0.2*BarrelTOF_CHoneycomb_thickness" rmax="0.24*BarrelTOF_CHoneycomb_thickness"/>
<inner_tube name="coolant" material="NOVEC7200" rmin="0" rmax="0.2*BarrelTOF_CHoneycomb_thickness" vis="TOFWater"/>
</module_component>
<module_component name="choneycomb" material="CFRPMix" sensitive="false" width="BarrelTOF_CHoneycomb_width" length="BarrelTOF2_length" thickness="BarrelTOF_CHoneycomb_thickness" vis="TOFCHoneycombVis">
<position x="BarrelTOF_CHoneycomb_position" y="BarrelTOF2_zoffset" z="0" />
<inner_tube name="cooling_tube" material="Aluminum" rmin="0.2*BarrelTOF_CHoneycomb_thickness" rmax="0.24*BarrelTOF_CHoneycomb_thickness"/>
<inner_tube name="coolant" material="NOVEC7200" rmin="0" rmax="0.2*BarrelTOF_CHoneycomb_thickness" vis="TOFWater"/>
</module_component>
<module_component name="coolingtube" material="Aluminum" sensitive="false" width="BarrelTOF_CoolingTube_width" length="BarrelTOF_length1" thickness="BarrelTOF_CoolingTube_thickness" vis="TOFCoolingTubeVis" >
<position x="BarrelTOF_CoolingTube_position" y="0" z="0" />

<module_component name="cfskinbottom" material="CFRPMix2" sensitive="false" width="BarrelTOF_Module_width" length="BarrelTOF1_length" thickness="BarrelTOF_CFSkin_thickness" vis="TOFCSkinVis" keep_layer="true">
<position x="BarrelTOF_Service_position" y="BarrelTOF1_zoffset" z="0" />
</module_component>
<module_component name="coolant" material="NOVEC7200" sensitive="false" width="BarrelTOF_Coolant_width" length="BarrelTOF_length1" thickness="BarrelTOF_Coolant_thickness" vis="TOFCoolantVis" >
<position x="BarrelTOF_Coolant_position" y="0" z="0" />
<module_component name="cfskinbottom" material="CFRPMix2" sensitive="false" width="BarrelTOF_Module_width" length="BarrelTOF2_length" thickness="BarrelTOF_CFSkin_thickness" vis="TOFCSkinVis" >
<position x="BarrelTOF_Service_position" y="BarrelTOF2_zoffset" z="0" />
</module_component>
<module_component name="cfoam" material="CarbonFoam" sensitive="false" width="BarrelTOF_CFoam_width" length="BarrelTOF_length1" thickness="BarrelTOF_CFoam_thickness" vis="TOFCFoamVis" >
<position x="BarrelTOF_CFoam_position" y="0" z="0" />

<module_component name="hybridbottom" material="Kapton" sensitive="false" width="BarrelTOF_Module_width" length="BarrelTOF1_length" thickness="BarrelTOF_Hybrid_thickness" vis="TOFHybridVis" keep_layer="true">
<position x="BarrelTOF_Service_position" y="BarrelTOF1_zoffset" z="0" />
</module_component>
<module_component name="choneycomb" material="CFRPMix" sensitive="false" width="BarrelTOF_CHoneycomb_width" length="BarrelTOF_length1" thickness="BarrelTOF_CHoneycomb_thickness" vis="TOFCHoneycombVis" >
<position x="BarrelTOF_CHoneycomb_position" y="0" z="-1*BarrelTOF_CFoam_thickness" />
<module_component name="hybridbottom" material="Kapton" sensitive="false" width="BarrelTOF_Module_width" length="BarrelTOF2_length" thickness="BarrelTOF_Hybrid_thickness" vis="TOFHybridVis" >
<position x="BarrelTOF_Service_position" y="BarrelTOF2_zoffset" z="0" />
</module_component>
<module_component name="cfskinbottom" material="CFRPMix2" sensitive="false" width="BarrelTOF_Module_width" length="BarrelTOF_length1" thickness="BarrelTOF_CFSkin_thickness" vis="TOFCSkinVis" >
<position x="BarrelTOF_Service_position" y="0" z="0" />

<module_component name="sensorBack" material="Silicon" sensitive="true" width="BarrelTOF_Sensor_width" length="BarrelTOF_Sensor_length" thickness="0.5*BarrelTOF_Sensor_thickness" vis="TOFSensorVis" keep_layer="true">
<GridSensors start_x="BarrelTOF_Sensor_position" start_y="-0.5*BarrelTOF1_length+BarrelTOF_Sensor_length + BarrelTOF1_zoffset-0.5*BarrelTOF_Sensor_overlap" start_z="0" xdist="0" ydist="BarrelTOF_Sensor_length+BarrelTOF_Sensor_deadspaceY" nx="1" ny="BarrelTOF1_Sensor_amount_back" half_length="right"/>
</module_component>
<module_component name="hybridbottom" material="Kapton" sensitive="false" width="BarrelTOF_Module_width" length="BarrelTOF_length1" thickness="BarrelTOF_Hybrid_thickness" vis="TOFHybridVis" >
<position x="BarrelTOF_Service_position" y="0" z="0" />
<module_component name="sensorBack" material="Silicon" sensitive="true" width="BarrelTOF_Sensor_width" length="BarrelTOF_Sensor_length" thickness="0.5*BarrelTOF_Sensor_thickness" vis="TOFSensorVis" >
<GridSensors start_x="BarrelTOF_Sensor_position" start_y="0.5*BarrelTOF2_length-(BarrelTOF2_Sensor_amount_back-1)*(BarrelTOF_Sensor_length+BarrelTOF_Sensor_deadspaceY)-BarrelTOF_Sensor_length+BarrelTOF2_zoffset+0.5*BarrelTOF_Sensor_overlap" start_z="0" xdist="0" ydist="BarrelTOF_Sensor_length+BarrelTOF_Sensor_deadspaceY" nx="1" ny="BarrelTOF2_Sensor_amount_back"/>
</module_component>

</module>
<layer module="BarrelTOF_Module1" id="1" vis="TOFLayerVis">
<barrel_envelope
inner_r="BarrelTOF_rmin"
outer_r="BarrelTOF_rmax"
z_length="BarrelTOF_length+2*BarrelTOF_zOffset"
z_length="BarrelTOF_length"
z0="BarrelTOF_zoffset"/>
<layer_material surface="inner" binning="binPhi,binZ" bins0="BarrelTOF_Module_nphi" bins1="100" />
<layer_material surface="outer" binning="binPhi,binZ" bins0="BarrelTOF_Module_nphi" bins1="100" />
<rphi_layout phi_tilt="BarrelTOF_Module_tiltangle" nphi="BarrelTOF_Module_nphi" phi0="0.0" rc="BarrelTOF_radius" dr="0.0*mm"/>
<z_layout dr="0.0*mm" z0="BarrelTOF_zOffset" nz="BarrelTOF_Module_nz"/>
<z_layout dr="0.0*mm" z0="0" nz="BarrelTOF_Module_nz"/>
</layer>

</detector>
</detectors>

Expand Down
Loading
Loading