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

Jump to bottom

Add clic detector model with DEcal #237

Merged
merged 5 commits into from
Sep 11, 2019
Merged

Add clic detector model with DEcal #237

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
5b28c68
Add CLIC_o4_v14, which is like CLIC_o3_v14 but with a DECal
May 3, 2019
edb7f74
CLIC_o4_v14: increase ECal patch counter
andresailer Sep 10, 2019
ae18b29
CLIC_o4_v14: adapt detector meta data
andresailer Sep 10, 2019
9ebb323
CLIC_o4_v14: import changes from CLIC_o3_v14 for track surface sorting
andresailer Sep 10, 2019
fa08f06
CLIC_o4_v14: only leave lcgeo relevant parts in README
andresailer Sep 10, 2019
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
99 changes: 99 additions & 0 deletions CLIC/compact/CLIC_o4_v14/BeamCal_o1_v01_01.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<lccdd>

<define>
<constant name="BeamCal_spanning_angle" value="350*degree"/>
</define>

<readouts>
<readout name="BeamCalCollection">
<segmentation type="PolarGridRPhi2"
grid_r_values="3.200*cm 3.9876*cm 4.7742*cm 5.5608*cm 6.3474*cm 7.134*cm 7.9206*cm 8.7072*cm 9.4938*cm 10.2804*cm 11.067*cm 11.8536*cm 12.6402*cm 13.4268*cm 14.2134*cm 15.0*cm"
grid_phi_values="350/(4*8)*degree
350/(5*8)*degree
350/(6*8)*degree
350/(6*8)*degree
350/(7*8)*degree
350/(8*8)*degree
350/(9*8)*degree
350/(9*8)*degree
350/(10*8)*degree
350/(11*8)*degree
350/(12*8)*degree
350/(12*8)*degree
350/(13*8)*degree
350/(14*8)*degree
350/(15*8)*degree"
offset_phi="-180*degree+(360*degree-BeamCal_spanning_angle)*0.5"
/>
<id>system:8,barrel:3,layer:8,slice:5,r:32:16,phi:16</id>
</readout>
</readouts>

<detectors>
<detector name="BeamCal" type="BeamCal_o1_v01" vis="SeeThrough" id="DetID_BeamCal" readout="BeamCalCollection" >

<type_flags type=" DetType_CALORIMETER + DetType_ELECTROMAGNETIC + DetType_ENDCAP + DetType_FORWARD + DetType_AUXILIARY "/>

<envelope vis="BCALVis">
<shape type="BooleanShape" operation="Union" material="Air">
<shape type="BooleanShape" operation="Intersection">
<shape type="Box" dx="world_side" dy="world_side" dz="world_side"/>
<shape type="BooleanShape" operation="Subtraction">
<shape type="Tube" rmin="BeamCal_inner_radius" rmax="BeamCal_outer_radius+env_safety" dz="BeamCal_dz+env_safety"/>
<shape type="Tube" rmin="0" rmax="BeamPipe_UpstreamBeamCal" dz="BeamCal_dz+10*env_safety"/>
<position x="tan(-CrossingAngle)*(BeamCal_min_z+BeamCal_dz)" y="0" z="0"/>
<rotation x="0" y="-CrossingAngle" z="0"/>
</shape>
<position x="tan(0.5*CrossingAngle)*(BeamCal_min_z+BeamCal_dz)" y="0" z="(BeamCal_min_z+BeamCal_dz)"/>
<rotation x="0" y="0.5*CrossingAngle" z="0"/>
</shape>
<shape type="BooleanShape" operation="Intersection">
<shape type="Box" dx="world_side" dy="world_side" dz="world_side"/>
<shape type="BooleanShape" operation="Subtraction">
<shape type="Tube" rmin="BeamCal_inner_radius" rmax="BeamCal_outer_radius+env_safety" dz="BeamCal_dz+env_safety"/>
<shape type="Tube" rmin="0" rmax="BeamPipe_UpstreamBeamCal" dz="BeamCal_dz+10*env_safety"/>
<position x="tan(-CrossingAngle)*(BeamCal_min_z+BeamCal_dz)" y="0" z="0"/>
<rotation x="0" y="-CrossingAngle" z="0"/>
</shape>
<position x="tan(0.5*CrossingAngle)*(BeamCal_min_z+BeamCal_dz)" y="0" z="-(BeamCal_min_z+BeamCal_dz)"/>
<rotation x="0" y="180*deg-CrossingAngle*0.5" z="180*deg"/>
</shape>
</shape>
</envelope>

<parameter crossingangle="CrossingAngle"
cutoutspanningangle="360*degree-BeamCal_spanning_angle"
incomingbeampiperadius="BeamPipe_UpstreamBeamCal"
/>

<dimensions inner_r = "BeamCal_inner_radius"
inner_z = "BeamCal_min_z"
outer_r = "BeamCal_outer_radius" />

<!-- Avoid dummy layers without sensitive element which cannot be handled by DDMarlinPandora -->
<!-- Instead, create another layer group with the extra absorber in the front -->
<layer repeat="1" vis="SeeThrough">
<slice material = "C" thickness = "100*mm" vis="LayerVis1" layerType="holeForIncomingBeampipe"/>
<slice material = "TungstenDens24" thickness = "3.5*mm" vis="BCLayerVis1" layerType="holeForIncomingBeampipe" />
<slice material = "Silicon" thickness = "0.3004*mm" vis="BCLayerVis2" sensitive = "yes" />
<slice material = "Copper" thickness = "0.0004*mm" vis="BCLayerVis3" />
<slice material = "Kapton" thickness = "0.15*mm" vis="BCLayerVis4" />
<slice material = "Air" thickness = "0.05*mm" />
</layer>

<layer repeat="39" vis="SeeThrough">
<slice material = "TungstenDens24" thickness = "3.5*mm" vis="BCLayerVis1" layerType="holeForIncomingBeampipe" />
<slice material = "Silicon" thickness = "0.3004*mm" vis="BCLayerVis2" sensitive = "yes" />
<slice material = "Copper" thickness = "0.0004*mm" vis="BCLayerVis3" />
<slice material = "Kapton" thickness = "0.15*mm" vis="BCLayerVis4" />
<slice material = "Air" thickness = "0.05*mm" />
</layer>



</detector>
</detectors>

</lccdd>


27 changes: 27 additions & 0 deletions CLIC/compact/CLIC_o4_v14/BeamInstrumentation_o1_v01_01.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<lccdd>

<detectors>
<comment>Beampipe Instrumentation</comment>

<detector name="Kicker" type="DD4hep_Mask_o1_v01" vis="KICKVis">
<parameter crossingangle="CrossingAngle" />
<envelope vis="KICKVis">
<shape type="Assembly"/>
</envelope>
<!-- &A Z1 Z2 RIn1 RIn2 ROut1 ROut2 Material -->
<section type="Upstream" start="Kicker_min_z" end="Kicker_max_z" rMin1="Kicker_inner_radius" rMin2="Kicker_inner_radius" rMax1="Kicker_outer_radius" rMax2="Kicker_outer_radius" material="Iron" name="Kicker"/>
</detector>


<detector name="BPM" type="DD4hep_Mask_o1_v01" vis="BPMVis">
<parameter crossingangle="CrossingAngle" />
<envelope vis="BPMVis">
<shape type="Assembly"/>
</envelope>
<!-- &A Z1 Z2 RIn1 RIn2 ROut1 ROut2 Material -->
<section type="Dnstream" start="BPM_min_z" end="BPM_max_z" rMin1="BPM_inner_radius" rMin2="BPM_inner_radius" rMax1="BPM_outer_radius" rMax2="BPM_outer_radius" material="Iron" name="BPM"/>
</detector>


</detectors>
</lccdd>
40 changes: 40 additions & 0 deletions CLIC/compact/CLIC_o4_v14/Beampipe_o1_v01_02.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<lccdd>
<!-- Definition of global dictionary constants -->
<define>
</define>

<!-- Definition of the used visualization attributes -->
<display>
<vis name="BeamPipeVis" alpha="0.0" r="0.0" g="1.0" b="0.0" showDaughters="true" visible="false"/>
<vis name="TubeVis" alpha="1.0" r="1.0" g="0.7" b="0.5" showDaughters="true" visible="true"/>
<vis name="VacVis" alpha="1.0" r="1.0" g="1.0" b="1.0" showDaughters="true" visible="false"/>
</display>


<detectors>
<comment>Beampipe</comment>

<detector name="Beampipe" type="DD4hep_Beampipe_o1_v01" vis="BeamPipeVis" region="BeampipeRegion">
<parameter crossingangle="CrossingAngle" />
<envelope vis="BlueVis">
<shape type="Assembly"/>
</envelope>

<!-- &A Z1 Z2 RIn1 RIn2 ROut1 ROut2 Material -->
<section type="Center" start="0*mm" end="CentralBeamPipe_zmax" rMin1="29.4*mm" rMin2="29.4*mm" rMax1="CentralBeamPipe_rmax" rMax2="CentralBeamPipe_rmax" material="Beryllium" name="VertexInner"/>
<section type="Center" start="CentralBeamPipe_zmax" end="337*mm" rMin1="29.4*mm" rMin2="29.4*mm" rMax1="30.0*mm" rMax2="33.4*mm" material="Iron" name="ConeConnector"/>
<section type="Center" start="337*mm" end="ConeBeamPipe_zmax" rMin1="29.4*mm" rMin2="235.2*mm" rMax1="33.4*mm" rMax2="ConeBeamPipe_rmax" material="Iron" name="BigCone"/>
<section type="Center" start="2080*mm" end="BigBeamPipe_zmax" rMin1="235.2*mm" rMin2="235.2*mm" rMax1="ConeBeamPipe_rmax" rMax2="ConeBeamPipe_rmax" material="Iron" name="LumiCalConnector"/>
<section type="PunchedCenter" start="BigBeamPipe_zmax" end="BigBeamPipe_zmax+3*mm" rMin1="0.0*mm" rMin2="98.0*mm" rMax1="240.0*mm" rMax2="240.0*mm" material="Iron" name="LumiCalFront"/>
<section type="DnstreamClippedFront" start="BigBeamPipe_zmax+3*mm" end="3170*mm" rMin1="98.0*mm" rMin2="98.0*mm" rMax1="99.0*mm" rMax2="99.0*mm" material="Iron" name="BeamCalConnector"/>
<section type="PunchedDnstream" start="3170*mm" end="3173*mm" rMin1="2.7*mm" rMin2="31.0*mm" rMax1="99.0*mm" rMax2="99.0*mm" material="Iron" name="BeamCalFront"/>
<section type="Dnstream" start="3173*mm" end="3500*mm" rMin1="31.0*mm" rMin2="31.0*mm" rMax1="32.0*mm-0.1*env_safety" rMax2="32.0*mm-0.1*env_safety" material="Iron" name="BeamCalInnerDownstream"/>
<section type="UpstreamSlicedFront" start="3173*mm" end="3281*mm" rMin1="2.7*mm" rMin2="2.7*mm" rMax1="BeamPipe_UpstreamBeamCal-0.1*env_safety" rMax2="BeamPipe_UpstreamBeamCal-0.1*env_safety" material="Iron" name="BeamCalInnerUpstream"/>
<section type="Upstream" start="3281*mm" end="3835*mm" rMin1="2.7*mm" rMin2="2.7*mm" rMax1="BeamPipe_UpstreamBeamCal" rMax2="BeamPipe_UpstreamBeamCal" material="Iron" name="UpstreamSmall"/>
<section type="Upstream" start="3835*mm" end="3835*mm+10*mm" rMin1="2.7*mm" rMin2="12*mm" rMax1="BeamPipe_UpstreamBeamCal" rMax2="13.5*mm" material="Iron" name="UpstreamCone"/>
<section type="Upstream" start="3835*mm+10*mm" end="BeamPipe_end" rMin1="12*mm" rMin2="12*mm" rMax1="13.5*mm" rMax2="13.5*mm" material="Iron" name="UpstreamLarge"/>
<section type="Dnstream" start="3500*mm" end="BeamPipe_end" rMin1="31.0*mm" rMin2="BeamPipe_end*tan(CrossingAngle*0.5)" rMax1="32.0*mm" rMax2="BeamPipe_end*tan(CrossingAngle*0.5)+2.0*mm" material="Iron" name="DownstreamCone"/>

</detector>
</detectors>
</lccdd>
Loading