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

Importing CLD models from FCCDetectors, new CLD Model with overlaps fixed #280

Merged
merged 53 commits into from
Aug 23, 2023
Merged

Importing CLD models from FCCDetectors, new CLD Model with overlaps fixed #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
744a61b
FCCee_o1_v06: start new CLD model for fixing overlaps
andresailer May 8, 2023
158cb76
FCCee_o1_v06: update desription
andresailer May 8, 2023
6b49404
FCCee_o1_v06: fix overlap in vertex detector envelop
andresailer May 8, 2023
3741f79
FCC_o2_v03: copy of FCCDetectors FCCee_o2_v02
andresailer May 30, 2023
1c8deb5
FCC_o2_v03: HCalBarrel: make like original file
andresailer May 30, 2023
491c995
FCC_o2_v03: Dimensions: layout like FCC_o2_v02
andresailer May 30, 2023
270e69d
FCC_o2_v03: Vertex rename, parameters are for larger Vertex Detector
andresailer May 30, 2023
da27dbd
FCC_o2_v04: Based on FCCDetectors FCCee_o2_v03
andresailer May 31, 2023
58eed10
FCC_o2_v04: rename to old versioned filenames
andresailer May 31, 2023
03eb2f5
FCC_o2_v04: re-align yokeendcap
andresailer May 31, 2023
d9bb125
FCC_o2_v04: re-align YokeBarrel
andresailer May 31, 2023
26ada27
FCC_o2_v04: re-align ECalBarrel
andresailer May 31, 2023
78ee0c0
FCC_o2_v04: re-align ECalEndcap
andresailer May 31, 2023
8d15c58
FCC_o2_v04: re-align HCalBarrel
andresailer May 31, 2023
74f40b5
FCC_o2_v04: re-align HCalEndcap
andresailer May 31, 2023
6fba948
FCC_o2_v04: re-align InnerTracker
andresailer May 31, 2023
d0a8e29
FCC_o2_v04: re-align OuterTracker
andresailer May 31, 2023
3ee90b7
FCC_o2_v04: re-align Solenoid
andresailer May 31, 2023
b05a78e
FCC_o2_v04: re-align LumiCal
andresailer Jun 29, 2023
808844b
FCC_o2_v04: vertex detector: re-align and restructure for easier diff…
andresailer May 31, 2023
e347517
FCC_o2_v04: add BeamPipe from FCCDetectors common
andresailer May 31, 2023
03a8116
FCC_o2_v04: re-aling beam-pipe for better comparison
andresailer Jun 1, 2023
e068440
FCC_o2_v04: beampipe more alignment with previous beampipe, just whit…
andresailer Jun 1, 2023
a819bb3
FCC_o2_v04: Beampipe: add/replace from SRShielding.xml, essentially u…
andresailer Jun 1, 2023
abf3bad
FCC_o2_v04: beampipe: drop random whitespace, align with DD4hep mask …
andresailer Jun 1, 2023
ec8e80e
FCC_o2_v04: beaminstrumentation, HOMAbsorber, copy from FCCDetectors,…
andresailer Jun 1, 2023
ed34257
FCCee_o2_v04: remove HOMAbsorber, no longer needed for low-impedance …
andresailer Jun 29, 2023
428db40
FCC_o2_v04: SRShield is part of the beampipe, NOTE the Overlap! use B…
andresailer Jul 4, 2023
0322132
FCCee_o2_v04: add final focus quadrupoles
andresailer Jul 4, 2023
10b731c
CLD: add Readme for different versions
andresailer Jul 4, 2023
a549da8
CLD_o2_v05: start based o FCCee_o2_v05
andresailer Jul 5, 2023
97ad390
CLD_o2_v05: rename base file
andresailer Jul 5, 2023
3749f88
CLD_o2_v05: adapt detector description
andresailer Jul 5, 2023
8e33866
CLD_o2_v05: HOMAbsorber not needed for low-impedance beampipe
andresailer Jul 5, 2023
872d552
CLD_o2_v05: Rename in view of coming changes
andresailer Jul 5, 2023
e7d89f8
FCCee_o2_v04: mark that VXD and beampipe are different
andresailer Jul 5, 2023
b4c2d49
CLD_o2_v05: implement beam pipe model
andresailer Jul 5, 2023
ce83584
CLD_o2_v05: new Vertex detector layout, respecting constraints from l…
andresailer Jul 5, 2023
4995c9f
CLD_o2_v05: beampipe layout, so far so good
andresailer Jul 5, 2023
531d4c2
CLD_o2_v05: VertexDetector: tweak envelope to remove overlap with bea…
andresailer Jul 6, 2023
42cc5e7
CLD_o2_v05: Beampipe: implement beampipe as far as we understand
andresailer Jul 6, 2023
93ecaae
CLD_o2_v05: Beampipe: add AlBeMet and A paraffin (G4_Paraffin), to be…
andresailer Jul 6, 2023
a80dc41
CLD_o2_v05: InnerTracker: re-implement Envelope as PolyCone
andresailer Jul 7, 2023
343c4db
CLD_o2_v05: InnerTracker: fix overlap of some modules
andresailer Jul 7, 2023
4fd0962
CLD_o2_v05: OuterTracker: fix overlap in EndcapSupport: layer4 was go…
andresailer Jul 7, 2023
50dccff
CLD_o2_v05: rename inner and outer tracker to mark changes
andresailer Jul 7, 2023
c2b939d
CLD_o2_v05: add to README
andresailer Jul 7, 2023
fc2db0f
CLD_o2_v05: rename vertex detector to unique name
andresailer Jul 7, 2023
30cb11c
CLD_o2_v05: use the correct paraffin for the BeamPipe
andresailer Jul 7, 2023
52f6586
CLD_o2_v05: use three rings for vertex detector beampipe instead of a…
andresailer Aug 22, 2023
eff894d
CLD_o2_v05: Vertex: move to 1.3 mm from beam pipe
andresailer Aug 22, 2023
f21f12d
CLD_o2_v05: BeamPipe: use variables for central chamber thicknesses
andresailer Aug 23, 2023
85627ca
Tests: replace fccee tests with test for CLD_o2_v05
andresailer Aug 23, 2023
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
26 changes: 26 additions & 0 deletions FCCee/CLD/compact/CLD_o2_v05/BeamInstrumentation_o3_v02_fitShield.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<lccdd>

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

<detector name="CompSol" type="DD4hep_Mask_o1_v01" insideTrackingVolume="true" vis="CompSolVis">
<parameter crossingangle="CrossingAngle" />
<envelope vis="CoilVis">
<shape type="Assembly"/>
</envelope>
<section type="Center" start="CompSol_min_z" end="QD0_min_z" rMin1="103*mm" rMin2="180*mm" rMax1="123*mm" rMax2="200*mm" material="SolenoidMixture" name="CompSol" />
</detector>

<detector name="ScreenSol" type="DD4hep_Mask_o1_v01" insideTrackingVolume="true" vis="ScreenSolVis">
<parameter crossingangle="CrossingAngle" />
<envelope vis="CoilVis">
<shape type="Assembly"/>
</envelope>

<section type="Center" start="QD0_min_z" end="QD0_min_z+5*cm" rMin1="SeparatedBeamPipe_rmax+1*mm+5*cm" rMin2="SeparatedBeamPipe_rmax+1*mm+5*cm" rMax1="200*mm" rMax2="200*mm" material="SolenoidMixture" name="CompSol" />

<section type="Center" start="QD0_min_z+5*cm" end="QD0_max_z" rMin1="180*mm" rMin2="180*mm" rMax1="200*mm" rMax2="200*mm" material="SolenoidMixture" name="CompSol" />
</detector>

</detectors>
</lccdd>
158 changes: 158 additions & 0 deletions FCCee/CLD/compact/CLD_o2_v05/Beampipe_o4_v05.xml
View file
Open in desktop
andresailer marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
<lccdd>

<info name="FCCee"
title="FCCee low impedance Beam pipe with small radius"
author="Andre Sailer"
url="no"
status="development"
version="1.0">
<comment>A beampipe for FCCee detector based on CLD</comment>
</info>

<!-- Definition of global dictionary constants -->
<define>
<!-- Definition of global dictionary constants -->
andresailer marked this conversation as resolved.
Show resolved Hide resolved
<constant name="beampipegoldwidth" value="BeamPipeGoldWidth"/>
<constant name="beampipegoldtolerance" value="BeamPipeGoldTolerance"/>
</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="GoldCoatingVis" alpha="0.0" r="0.0" g="1.0" b="1.0" showDaughters="true" visible="true"/>
<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>

<!-- ;radius calculator lisp
(+ 12.0 (* (/ (- 28.9 12.0) (- 1190.0 90.0)) (- 110.0 90.0) ) )
-->
<comment>Part of beampipe made of AlBeMet162 and Paraffin flow</comment>

<detector name="BeBeampipe" type="DD4hep_Beampipe_o1_v01" insideTrackingVolume="true" nocore="true" vis="BeamPipeVis">
<parameter crossingangle="CrossingAngle" />
<envelope vis="BlueVis">
<shape type="Assembly"/>
</envelope>
<!-- central section made of two walls of 0.35 mm albemet and liquid paraffin in the middle -->
<section type="Center" start="0*mm" end="CentralBeamPipe_zmax" rMin1="CentralBeamPipe_rmax" rMin2="CentralBeamPipe_rmax" rMax1="CentralBeamPipe_rmax+BPWWall" rMax2="CentralBeamPipe_rmax+BPWWall" material="AlBeMet162" name="VertexInnerAlb" />
<section type="Center" start="0*mm" end="CentralBeamPipe_zmax" rMin1="CentralBeamPipe_rmax+BPWWall" rMin2="CentralBeamPipe_rmax+BPWWall" rMax1="CentralBeamPipe_rmax+BPWWall+BPWCool" rMax2="CentralBeamPipe_rmax+BPWWall+BPWCool" material="LiquidNDecane" name="VertexParaffin" />
<section type="Center" start="0*mm" end="CentralBeamPipe_zmax" rMin1="CentralBeamPipe_rmax+BPWWall+BPWCool" rMin2="CentralBeamPipe_rmax+BPWWall+BPWCool" rMax1="CentralBeamPipe_rmax+2*BPWWall+BPWCool" rMax2="CentralBeamPipe_rmax+2*BPWWall+BPWCool" material="AlBeMet162" name="VertexOuterAlb" />
<section type="Center" start="CentralBeamPipe_zmax" end="SeparatedBeamPipe_z" rMin1="CentralBeamPipe_rmax" rMin2="ConeBeamPipe_Rmax" rMax1="CentralBeamPipe_rmax+BeamPipeWidthFirstCone" rMax2="ConeBeamPipe_Rmax+BeamPipeWidthFirstCone" material="Beryllium" name="AlBeMet162" />

</detector>

<detector name="BeamPipe" type="DD4hep_Beampipe_o1_v01" insideTrackingVolume="true" vis="BeamPipeVis" >
<envelope vis="BlueVis">
<shape type="Assembly"/>
</envelope>
<parameter crossingangle="CrossingAngle" />

<!-- &A Z1 Z2 RIn1 RIn2 ROut1 ROut2 Material -->

<comment>Golden foil in the inner part of the Be beampipe</comment>

<section type="Center" start="0*mm" end="CentralBeamPipe_zmax" rMin1="CentralBeamPipe_rmax-(beampipegoldwidth+beampipegoldtolerance)" rMin2="CentralBeamPipe_rmax-(beampipegoldwidth+beampipegoldtolerance)" rMax1="CentralBeamPipe_rmax-beampipegoldtolerance" rMax2="CentralBeamPipe_rmax-beampipegoldtolerance" material="Gold" name="VertexInnerGold" />

<section type="Center" start="CentralBeamPipe_zmax" end="SeparatedBeamPipe_z" rMin1="CentralBeamPipe_rmax-(beampipegoldwidth+beampipegoldtolerance)" rMin2="ConeBeamPipe_Rmax-(beampipegoldwidth+beampipegoldtolerance)" rMax1="CentralBeamPipe_rmax-beampipegoldtolerance" rMax2="ConeBeamPipe_Rmax-beampipegoldtolerance" material="Gold" name="ConicalChamberGold" />

<section type="PunchedCenter" start="SeparatedBeamPipe_z" end="SeparatedBeamPipe_z+3*mm" rMin1="SeparatedBeamPipe_rmax" rMin2="SeparatedBeamPipe_rmax" rMax1="ConeBeamPipe_Rmax+BeamPipeWidthFirstCone" rMax2="ConeBeamPipe_Rmax+BeamPipeWidthFirstCone" material="Copper" name="SplitVacChambers"/>

<section type="DnstreamClippedFront" start="SeparatedBeamPipe_z+3.0*mm" end="6000*mm" rMin1="SeparatedBeamPipe_rmax" rMin2="SeparatedBeamPipe_rmax" rMax1="SeparatedBeamPipe_rmax+1*mm" rMax2="SeparatedBeamPipe_rmax+1*mm" material="Copper" name="DownStreamBeamPipe_1"/>


<section type="UpstreamClippedFront" start="SeparatedBeamPipe_z+3.0*mm" end="MiddleOfSRMask_z -3*cm" rMin1="SeparatedBeamPipe_rmax" rMin2="SeparatedBeamPipe_rmax" rMax1="SeparatedBeamPipe_rmax+1*mm" rMax2="SeparatedBeamPipe_rmax+1*mm" material="Copper" name="UpStreamBeamPipe_1"/>

<section type="Upstream" start="MiddleOfSRMask_z -3*cm" end="MiddleOfSRMask_z -1*cm" rMin1="SeparatedBeamPipe_rmax" rMax1="SeparatedBeamPipe_rmax+1*mm" rMin2="SeparatedBeamPipe_rmax-SynchRadMaskSize" rMax2="SeparatedBeamPipe_rmax+0.01*mm - SynchRadMaskSize" material="Copper" name="UpStreamBeamPipe_2" />

<section type="Upstream" start="MiddleOfSRMask_z -1*cm" end="MiddleOfSRMask_z +1*cm" rMin1="SeparatedBeamPipe_rmax-SynchRadMaskSize" rMax1="SeparatedBeamPipe_rmax+0.01*mm - SynchRadMaskSize" rMin2="SeparatedBeamPipe_rmax-SynchRadMaskSize" rMax2="SeparatedBeamPipe_rmax+0.01*mm - SynchRadMaskSize" material="Copper" name="UpStreamBeamPipe_3" />

<section type="Upstream" start="MiddleOfSRMask_z +1*cm" end="MiddleOfSRMask_z +3*cm" rMin1="SeparatedBeamPipe_rmax-SynchRadMaskSize" rMax1="SeparatedBeamPipe_rmax+0.01*mm - SynchRadMaskSize" rMin2="SeparatedBeamPipe_rmax" rMax2="SeparatedBeamPipe_rmax+1*mm" material="Copper" name="UpStreamBeamPipe_4" />

<section type="Upstream" start="MiddleOfSRMask_z +3*cm" end="6000*mm" rMin1="SeparatedBeamPipe_rmax" rMin2="SeparatedBeamPipe_rmax" rMax1="SeparatedBeamPipe_rmax+1*mm" rMax2="SeparatedBeamPipe_rmax+1*mm" material="Copper" name="UpStreamBeamPipe_5" />
andresailer marked this conversation as resolved.
Show resolved Hide resolved

</detector>

<!-- 2020.04.08 : Synch Radiation mask (symmetyric in phi for the while) -->

<comment>Synch Radiation mask inside the beam-pipe, at z = 2.1 m </comment>
<detector name="SynchRadMask" type="DD4hep_Mask_o1_v01" insideTrackingVolume="true" vis="TantalumVis" >
<parameter crossingangle="CrossingAngle" />

<section type="Upstream" start="MiddleOfSRMask_z -3*cm" end="MiddleOfSRMask_z -1*cm" rMin1="SeparatedBeamPipe_rmax +1*mm + mask_epsilon" rMax1="SeparatedBeamPipe_rmax+1*mm +2*mask_epsilon" rMin2="SeparatedBeamPipe_rmax +0.01*mm -SynchRadMaskSize + mask_epsilon" rMax2="SeparatedBeamPipe_rmax+1*mm +2* mask_epsilon" material="Tungsten" name="UpStreamBeamPipe_SRmask_1" />

<section type="Upstream" start="MiddleOfSRMask_z -1*cm" end="MiddleOfSRMask_z +1*cm" rMin1="SeparatedBeamPipe_rmax +0.01*mm -SynchRadMaskSize + mask_epsilon" rMax1="SeparatedBeamPipe_rmax+1*mm +2*mask_epsilon " rMin2="SeparatedBeamPipe_rmax +0.01*mm -SynchRadMaskSize + mask_epsilon" rMax2="SeparatedBeamPipe_rmax+1*mm + 2*mask_epsilon" material="Tungsten" name="UpStreamBeamPipe_SRmask_2" />

<section type="Upstream" start="MiddleOfSRMask_z +1*cm" end="MiddleOfSRMask_z +3*cm" rMin1="SeparatedBeamPipe_rmax +0.01*mm -SynchRadMaskSize +mask_epsilon" rMax1="SeparatedBeamPipe_rmax+1*mm + 2*mask_epsilon" rMin2="SeparatedBeamPipe_rmax +1*mm + mask_epsilon" rMax2="SeparatedBeamPipe_rmax+1*mm +2*mask_epsilon" material="Tungsten" name="UpStreamBeamPipe_SRmask_3" />

</detector>

<comment>Full Cone Tungsten Shield</comment>
<detector name="BeamPipeShield" type="DD4hep_Mask_o1_v01" insideTrackingVolume="true" vis="TantalumVis" >
<parameter crossingangle="CrossingAngle" />

<comment>Beampipe Shield (APS: WHAT????? +18 cm (??plus??) as solenoid is now closer to IP) </comment>
andresailer marked this conversation as resolved.
Show resolved Hide resolved
<section type="PunchedCenter"
start="SeparatedBeamPipe_z + 5*mm" end="QD0_min_z + 18*cm"
rMin1="SeparatedBeamPipe_rmax + BeamPipeWidth + 0.1*mm"
rMin2="SeparatedBeamPipe_rmax + BeamPipeWidth + 0.1*mm "
rMax1="SeparatedBeamPipe_rmax + (SeparatedBeamPipe_z + 5*mm) * 0.015 + BeamPipeWidth + 0.1*mm + BeamPipeTantalShieldWidth"
rMax2="SeparatedBeamPipe_rmax + (QD0_min_z + 18*cm) * 0.015 + BeamPipeWidth + 0.1*mm + BeamPipeTantalShieldWidth"
material="Tungsten" name="TaShield" />
andresailer marked this conversation as resolved.
Show resolved Hide resolved

</detector>


<comment>Asymmetric Tungsten Shield no Rotation</comment>

<detector name="BeamPipeShield_noRot" type="DD4hep_Mask_o1_v01" insideTrackingVolume="true" vis="TantalumVis" >
<parameter crossingangle="CrossingAngle" rotationX="true"/>

<section type="Center"
start="500*mm" end="LumiCal_max_z + 4.9*mm"
rMin1="CentralBeamPipe_rmax + BeamPipeWidthFirstCone + (500.0*mm - CentralBeamPipe_zmax) * BeamPipeConeHalfAngle + 0.1*mm"
rMin2="CentralBeamPipe_rmax + BeamPipeWidthFirstCone + (LumiCal_max_z + 4.9*mm - CentralBeamPipe_zmax) * BeamPipeConeHalfAngle + 0.1*mm"
rMax1="CentralBeamPipe_rmax + BeamPipeWidthFirstCone + (500.0*mm - CentralBeamPipe_zmax) * BeamPipeConeHalfAngle + 0.1*mm + TopFillerShieldWidth"
rMax2="CentralBeamPipe_rmax + BeamPipeWidthFirstCone + (LumiCal_max_z + 4.9*mm - CentralBeamPipe_zmax) * BeamPipeConeHalfAngle + 0.1*mm + BeamPipeTantalShieldWidth"
phi1="326*degree"
phi2="34*degree"
material="Tungsten" name="TaShieldTopPart" />

<comment>was 370. Add 0.1*mm so that rmax1 is larger than rmin1 </comment>
<section type="Center"
start="330*mm" end="500*mm"
rMin1="CentralBeamPipe_rmax + BeamPipeWidthFirstCone + (330*mm - CentralBeamPipe_zmax) * BeamPipeConeHalfAngle + 0.1*mm"
rMin2="CentralBeamPipe_rmax + BeamPipeWidthFirstCone + (500*mm - CentralBeamPipe_zmax) * BeamPipeConeHalfAngle + 0.1*mm"
rMax1="CentralBeamPipe_rmax + BeamPipeWidthFirstCone + (330*mm - CentralBeamPipe_zmax) * BeamPipeConeHalfAngle + 0.1*mm + 0.1*mm"
rMax2="CentralBeamPipe_rmax + BeamPipeWidthFirstCone + (500*mm - CentralBeamPipe_zmax) * BeamPipeConeHalfAngle + 0.1*mm + TopFillerShieldWidth"
phi1="326*degree"
phi2="34*degree"
material="Tungsten" name="TaShieldTopPart2" />

<comment>one degree less, to fit lumical window</comment>
<section type="Center"
start="600*mm" end="LumiCal_max_z + 4.9*mm"
rMin1="CentralBeamPipe_rmax + BeamPipeWidthFirstCone + (600*mm - CentralBeamPipe_zmax) * BeamPipeConeHalfAngle + 0.1*mm"
rMin2="CentralBeamPipe_rmax + BeamPipeWidthFirstCone + (LumiCal_max_z + 4.9*mm - CentralBeamPipe_zmax) * BeamPipeConeHalfAngle + 0.1*mm"
rMax1="CentralBeamPipe_rmax + BeamPipeWidthFirstCone + (600*mm - CentralBeamPipe_zmax) * BeamPipeConeHalfAngle + 0.1*mm + SideFillerShieldWidth"
rMax2="CentralBeamPipe_rmax + BeamPipeWidthFirstCone + (LumiCal_max_z + 4.9*mm - CentralBeamPipe_zmax) * BeamPipeConeHalfAngle + 0.1*mm + BeamPipeTantalShieldWidth"
phi1="34*degree"
phi2="70*degree"
material="Tungsten" name="TaShieldFiller1" />

<section type="Center"
start="600*mm" end="LumiCal_max_z + 4.9*mm"
rMin1="CentralBeamPipe_rmax + BeamPipeWidthFirstCone + (600*mm - CentralBeamPipe_zmax) * BeamPipeConeHalfAngle + 0.1*mm"
rMin2="CentralBeamPipe_rmax + BeamPipeWidthFirstCone + (LumiCal_max_z + 4.9*mm - CentralBeamPipe_zmax) * BeamPipeConeHalfAngle + 0.1*mm"
rMax1="CentralBeamPipe_rmax + BeamPipeWidthFirstCone + (600*mm - CentralBeamPipe_zmax) * BeamPipeConeHalfAngle + 0.1*mm + SideFillerShieldWidth"
rMax2="CentralBeamPipe_rmax + BeamPipeWidthFirstCone + (LumiCal_max_z + 4.9*mm - CentralBeamPipe_zmax) * BeamPipeConeHalfAngle + 0.1*mm + BeamPipeTantalShieldWidth"
phi1="291*degree"
phi2="326*degree"
material="Tungsten" name="TaShieldFiller2" />

</detector>

</detectors>
</lccdd>
Loading
Loading