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

Adding IDEA_o1_v02 and its vertex detector #273

Merged
merged 73 commits into from
Oct 3, 2023
Merged

Adding IDEA_o1_v02 and its vertex detector #273

Show file tree
Hide file tree
Changes from 55 commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
8d465f5
Adding module functionality to ZPlanarTracker_geo
Nov 2, 2022
c00f642
Leaving ZPlanarTracker as it is but instead make a new VertexBarrel_o…
Dec 15, 2022
640115c
Added ability to have flex and support consisting of multiple compone…
Jan 16, 2023
f259579
First implementation of IDEA end-cap and adaption of barrel
Feb 21, 2023
fa1d847
Version of Barrel with correct sensitive surfaces (use teveDisplay to…
Feb 23, 2023
6061af7
Improved structure of barrel detectors (layer - ladder+sensors)
Feb 23, 2023
6d6af32
Progress: The surface arrows are now displayed in the endcap, but the…
Feb 23, 2023
e69ee1d
Whole barrel is properly visible in teveDisplay, but don't mange to m…
Feb 28, 2023
012de49
Also endcap shows all volumes in teveDisplay, but bad hierarchy
Feb 28, 2023
e165a35
Endcap and barrel now run through ddsim overlap checker (overlaps sti…
Mar 14, 2023
cc2656d
IDEA Vertex working with ddsim, some overlaps still to be understood
Mar 21, 2023
dee4d5a
Not working teveDisplay, endcap digitisation not working probably the…
Apr 5, 2023
1a22125
Fixed endcap, all surfaces visible in teveDisplay, managed to run dds…
Apr 6, 2023
e08ea1e
Non-working version, the sensitive volumes are wrong, no idea why, us…
Apr 6, 2023
a8c19ec
Bad hierarchy, but otherwise working
Apr 6, 2023
c8eef55
Found way to remove mother volumes in sensitive and passives. Now all…
May 1, 2023
f27a485
Removing unneeded lines
May 2, 2023
ce6e9ec
Recomputing bounding boxes, hasn't fixed the problem yet
May 25, 2023
a19cad2
Adding IDEA as FCCee_IDEA_o1_v01, not final yet, need to make sure th…
May 26, 2023
ca514ec
Adding again deleted file
May 26, 2023
23113db
Reverting changes to VertexBarrel_o1_v01_geo.cpp
May 26, 2023
82c7996
Adding scripts
May 26, 2023
a7b9a86
Addressing comments from MR, adding some tests for DDCAD files
Jun 22, 2023
b250bb3
Add DDCAD test
Jun 22, 2023
30e7504
Adding test
Jun 22, 2023
6099720
Renamed constructor files
Jun 22, 2023
b4b5df0
Adapting dd4hep::CellID instead of long64
Jun 26, 2023
67e3925
Changing naming convention to Vertex inner barrel, vertex outer barre…
Jun 29, 2023
2ca7981
SingleShape_geo not needed for DDCAD import, instead using DD4hep_Tes…
Jun 29, 2023
81e6f96
Changing CAD shape name
armin-ilg Jul 3, 2023
9bfa40e
Adding all plotting scripts
armin-ilg Jul 17, 2023
4060e59
Renaming constructor files, adding in latest changes
armin-ilg Jul 17, 2023
281a350
Add README file for the vertex detector constructors, remove HOM abso…
armin-ilg Jul 17, 2023
970ce38
Make scripts working with command line input argument for xml file
armin-ilg Jul 17, 2023
7c32aa9
Change folder structure as sugested by Brieuc
armin-ilg Jul 17, 2023
c450cb2
Fixed some paths
armin-ilg Jul 17, 2023
a9f7870
Testing test...
armin-ilg Jul 18, 2023
4ef98c8
Increasing timeout for IDEA test
armin-ilg Jul 18, 2023
9242186
Fixing test
armin-ilg Jul 18, 2023
2ab05fa
Using .obj file for Vertex inner barrel support instead of .stl, runn…
armin-ilg Jul 18, 2023
51c43e8
Adding back hierarchy of vertex detector elements, visualisation does…
armin-ilg Jul 18, 2023
0ef86c7
Add missing periphery components to outer barrel
armin-ilg Jul 18, 2023
cb4a8bf
Fix simulate script
armin-ilg Jul 18, 2023
c7303cb
ATLASPix3 modules were 90 degrees rotated, now fixed. Furthermore wro…
armin-ilg Jul 18, 2023
e1c3160
Removing unnecessary line
armin-ilg Jul 18, 2023
48dfd8f
Test is working now for the key4hep nightly release, decreasing large…
armin-ilg Jul 18, 2023
43c81c6
Reducing hierarchy by one level in the endcaps, so that it's visible …
armin-ilg Jul 20, 2023
2a9a9af
Fixing physVolIDs
armin-ilg Jul 20, 2023
4551275
Merge pull request #1 from armin-ilg/test
armin-ilg Jul 20, 2023
7496661
Small script fixes
armin-ilg Jul 20, 2023
49eb21a
Moving IDEA scripts to FCCee/scripts as they are generally usable
armin-ilg Jul 25, 2023
7914eb0
Fixing paths using a /afs/cern.ch/user/a/afehr/lcgeo global variable
armin-ilg Jul 25, 2023
4b1bd08
Cannot use environmental variable before it's defined
armin-ilg Jul 25, 2023
d37be7e
Found another way to get the correct paths for the scripts, using /cv…
armin-ilg Jul 25, 2023
de5c1ef
Deleting utils inside of IDEA folder
armin-ilg Jul 25, 2023
81cddf1
Addressing last comments from Andre
armin-ilg Aug 30, 2023
b09858a
Adding suggested change to dd4hep2root
armin-ilg Aug 30, 2023
fb1b591
Addressing comments by Andre, still need to copy beam pipe from CLD
armin-ilg Sep 5, 2023
ab80327
Merge branch 'master' of https://github.com/key4hep/k4geo into HEAD
armin-ilg Sep 5, 2023
17bcdf3
Using same beampipe as in CLD_o2_v05
armin-ilg Sep 5, 2023
9d61c8e
Letting IDEA test run from anywhere
armin-ilg Sep 5, 2023
d66a05d
Renaming beampipe to match with CLD beampipe (identical at the moment…
armin-ilg Sep 6, 2023
3693833
Fixing test and have correct name for beampipe also in main xml file.…
armin-ilg Sep 6, 2023
cfcaf04
Multiple properties in one SET_TESTS_PROPERTIES instance
armin-ilg Sep 6, 2023
11d1105
Moved volume creation within main part of program, so that correct vo…
armin-ilg Sep 20, 2023
6a4c536
Added functionality to have end of stave structures in vertex barrel.…
armin-ilg Sep 21, 2023
7646e21
Added end-of-stave structures or proxies as well for the outer barrel…
armin-ilg Sep 21, 2023
13554da
Making proxy end-of-stave structure smaller to not have overlaps
armin-ilg Sep 21, 2023
c07d81c
Unified description of readout and support structures, now called com…
armin-ilg Sep 21, 2023
aa26ee6
Fixing volIDs in barrel, adding end-of-stave structures in barrel and…
armin-ilg Sep 28, 2023
eafb798
Correcting material in beam pipe
armin-ilg Sep 28, 2023
406a3f5
Fixing test and for the moment comment out the vertex inner barrel su…
armin-ilg Sep 28, 2023
d149e7e
Changing to IDEA_o1_v02
armin-ilg Oct 2, 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
36 changes: 36 additions & 0 deletions FCCee/IDEA/compact/IDEA_o1_v01/BeamInstrumentation_o1_v01.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<lccdd>

<info name="FCCee"
title="FCCee Beam instrumentation: taken correspoding to CLD: BeamInstrumentation_o3_v02_fitShield.xml"
author="from ILCSOFT/lcgeo/FCCee/compact/FCCee_o1_v04"
url="no"
status="development"
version="1.0">
<comment>COmpensating and screening solenoids for FCCee</comment>
</info>


<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>
150 changes: 150 additions & 0 deletions FCCee/IDEA/compact/IDEA_o1_v01/Beampipe_o1_v01.xml
View file
Open in desktop
armin-ilg marked this conversation as resolved.
Show resolved Hide resolved
armin-ilg marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
<lccdd>

<info name="FCCee"
title="FCCee Beam pipe: taken corresponding to CLD: Beampipe_o4_v04_noNotch_W_n02.xml"
author="from ILCSOFT/lcgeo/FCCee/compact/FCCee_o1_v04"
url="no"
status="development"
version="1.0">
<comment>A beampipe for FCCee, R(central) = 1.5 cm</comment>
</info>

<!-- Definition of global dictionary constants -->
<define>
<!-- Definition of global dictionary constants -->
<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>

<comment>Part of beampipe made of Beryllium</comment>

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

<section type="Center" start="0*mm" end="CentralBeamPipe_zmax" rMin1="CentralBeamPipe_rmax" rMin2="CentralBeamPipe_rmax" rMax1="CentralBeamPipe_rmax+BeamPipeWidth" rMax2="CentralBeamPipe_rmax+BeamPipeWidth" material="Beryllium" name="VertexInnerBe" />

<section type="Center" start="CentralBeamPipe_zmax" end="BePartEnd_z" rMin1="CentralBeamPipe_rmax" rMin2="CentralBeamPipe_rmax+(BePartEnd_z-CentralBeamPipe_zmax)*0.017" rMax1="CentralBeamPipe_rmax+BeamPipeWidthFirstCone" rMax2="CentralBeamPipe_rmax+BeamPipeWidthFirstCone+(BePartEnd_z-CentralBeamPipe_zmax)*0.017" material="Beryllium" name="FirstConeBe" />

</detector>

<detector name="BeamPipe" type="DD4hep_Beampipe_o1_v01" insideTrackingVolume="true" vis="BeamPipeVis" region="BeampipeRegion">
<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="BePartEnd_z" rMin1="CentralBeamPipe_rmax-(beampipegoldwidth+beampipegoldtolerance)" rMin2="CentralBeamPipe_rmax-(beampipegoldwidth+beampipegoldtolerance)+(BePartEnd_z-CentralBeamPipe_zmax)*0.017" rMax1="CentralBeamPipe_rmax-beampipegoldtolerance" rMax2="CentralBeamPipe_rmax-beampipegoldtolerance+(BePartEnd_z-CentralBeamPipe_zmax)*0.017" material="Gold" name="FirstConeGold" />

<comment>Part of beampipe made of Copper</comment>

<section type="Center" start="BePartEnd_z" end="SeparatedBeamPipe_z" rMin1="CentralBeamPipe_rmax+(BePartEnd_z-CentralBeamPipe_zmax)*0.017" rMin2="CentralBeamPipe_rmax+(BePartEnd_z-CentralBeamPipe_zmax)*0.017+(SeparatedBeamPipe_z-BePartEnd_z)*0.017" rMax1="CentralBeamPipe_rmax+BeamPipeWidthFirstCone+(BePartEnd_z-CentralBeamPipe_zmax)*0.017" rMax2="CentralBeamPipe_rmax+BeamPipeWidthFirstCone+(BePartEnd_z-CentralBeamPipe_zmax)*0.017+(SeparatedBeamPipe_z-BePartEnd_z)*0.017" material="Copper" name="CopperCone" />


<!-- PunchedCenter = un volume qui s'etend jusqu'a rMax1 (a z=start) et rMax2 (a end) et avec deux cylindres extrudes le long
des directions up / down (depend du xing angle), de rayon rMin1 et rMin2 -->


<section type="PunchedCenter" start="SeparatedBeamPipe_z" end="SeparatedBeamPipe_z+3*mm" rMin1="SeparatedBeamPipe_rmax" rMin2="SeparatedBeamPipe_rmax" rMax1="CentralBeamPipe_rmax+BeamPipeWidthFirstCone+(BePartEnd_z-CentralBeamPipe_zmax)*0.015+(SeparatedBeamPipe_z-BePartEnd_z)*0.015" rMax2="CentralBeamPipe_rmax+BeamPipeWidthFirstCone+(BePartEnd_z-CentralBeamPipe_zmax)*0.017+(SeparatedBeamPipe_z-BePartEnd_z)*0.017 + 3*mm*0.017" material="Copper" name="SplitVacChambers"/>

<!-- Downstream pipe : first part : radius = 1.5 cm -->

<section type="DnstreamClippedFront" start="SeparatedBeamPipe_z+3.01*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.01*mm" end="6000*mm" rMin1="SeparatedBeamPipe_rmax" rMin2="SeparatedBeamPipe_rmax" rMax1="SeparatedBeamPipe_rmax+1*mm" rMax2="SeparatedBeamPipe_rmax+1*mm" material="Copper" name="UpStreamBeamPipe_1"/>

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

<comment>Before HOM space</comment>
<section type="PunchedCenter"
start="LumiCal_max_z + 5*mm" end="1197.5*mm"
rMin1="SeparatedBeamPipe_rmax + BeamPipeWidth + 0.1*mm"
rMin2="SeparatedBeamPipe_rmax + BeamPipeWidth + 0.1*mm "
rMax1="SeparatedBeamPipe_rmax + (LumiCal_max_z + 5*mm )*0.015 + BeamPipeWidth + 0.1*mm + BeamPipeTantalShieldWidth"
rMax2="SeparatedBeamPipe_rmax + (1197.5*mm) * 0.015 + BeamPipeWidth + 0.1*mm + BeamPipeTantalShieldWidth"
material="Tungsten" name="TaShield_BH2" />

<comment>After HOM space (1197.5*m - 1298.7*mm) +18 cm as solenoid is now closer to IP </comment>
<section type="PunchedCenter"
start="1298.7*mm" end="QD0_min_z + 18*cm"
rMin1="SeparatedBeamPipe_rmax + BeamPipeWidth + 0.1*mm"
rMin2="SeparatedBeamPipe_rmax + BeamPipeWidth + 0.1*mm "
rMax1="SeparatedBeamPipe_rmax + (1298.7*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_AH" />

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

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

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

<comment>was 370</comment>
<section type="Center"
start="330*mm" end="500*mm"
rMin1="CentralBeamPipe_rmax + (330*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm"
rMin2="CentralBeamPipe_rmax + (500*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm"
rMax1="CentralBeamPipe_rmax + (330*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm"
rMax2="CentralBeamPipe_rmax + (500*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 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 + (600*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm"
rMin2="CentralBeamPipe_rmax + (LumiCal_max_z + 4.9*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm"
rMax1="CentralBeamPipe_rmax + (600*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm + SideFillerShieldWidth"
rMax2="CentralBeamPipe_rmax + (LumiCal_max_z + 4.9*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 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 + (600*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm"
rMin2="CentralBeamPipe_rmax + (LumiCal_max_z + 4.9*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm"
rMax1="CentralBeamPipe_rmax + (600*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm + SideFillerShieldWidth"
rMax2="CentralBeamPipe_rmax + (LumiCal_max_z + 4.9*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm + BeamPipeTantalShieldWidth"
phi1="291*degree"
phi2="326*degree"
material="Tungsten" name="TaShieldFiller2" />


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