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.

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

IDEA vertex and silicon wrapper for IDEA_o1_v03 #363

Merged
merged 184 commits into from
Sep 19, 2024
Merged
Changes from 1 commit
Commits
Show all changes
184 commits
Select commit Hold shift + click to select a range
5cc9224
Leaving ZPlanarTracker as it is but instead make a new VertexBarrel_o…
Dec 15, 2022
fbf41b7
Added ability to have flex and support consisting of multiple compone…
Jan 16, 2023
bef9e81
First implementation of IDEA end-cap and adaption of barrel
Feb 21, 2023
77b8038
Version of Barrel with correct sensitive surfaces (use teveDisplay to…
Feb 23, 2023
0f51769
Improved structure of barrel detectors (layer - ladder+sensors)
Feb 23, 2023
2a7f754
Progress: The surface arrows are now displayed in the endcap, but the…
Feb 23, 2023
42ebae6
Whole barrel is properly visible in teveDisplay, but don't mange to m…
Feb 28, 2023
4b0073b
Also endcap shows all volumes in teveDisplay, but bad hierarchy
Feb 28, 2023
ebbdec6
Endcap and barrel now run through ddsim overlap checker (overlaps sti…
Mar 14, 2023
6521b81
IDEA Vertex working with ddsim, some overlaps still to be understood
Mar 21, 2023
ccfec4e
Not working teveDisplay, endcap digitisation not working probably the…
Apr 5, 2023
c9b39a8
Fixed endcap, all surfaces visible in teveDisplay, managed to run dds…
Apr 6, 2023
4682a69
Non-working version, the sensitive volumes are wrong, no idea why, us…
Apr 6, 2023
4592553
Bad hierarchy, but otherwise working
Apr 6, 2023
a8d2415
Found way to remove mother volumes in sensitive and passives. Now all…
May 1, 2023
56f9d27
Removing unneeded lines
May 2, 2023
ab9f66e
Recomputing bounding boxes, hasn't fixed the problem yet
May 25, 2023
ad69d11
Adding IDEA as FCCee_IDEA_o1_v01, not final yet, need to make sure th…
May 26, 2023
3619146
Adding again deleted file
May 26, 2023
12258b3
Reverting changes to VertexBarrel_o1_v01_geo.cpp
May 26, 2023
e5e5b46
Adding scripts
May 26, 2023
43733be
Addressing comments from MR, adding some tests for DDCAD files
Jun 22, 2023
b649622
Add DDCAD test
Jun 22, 2023
f915742
Adding test
Jun 22, 2023
94bde0b
Renamed constructor files
Jun 22, 2023
f4ee391
Changing naming convention to Vertex inner barrel, vertex outer barre…
Jun 29, 2023
9cbdb6d
SingleShape_geo not needed for DDCAD import, instead using DD4hep_Tes…
Jun 29, 2023
6ad8044
Changing CAD shape name
armin-ilg Jul 3, 2023
27e6a3a
Adding all plotting scripts
armin-ilg Jul 17, 2023
6835fc1
Renaming constructor files, adding in latest changes
armin-ilg Jul 17, 2023
b5a2f82
Add README file for the vertex detector constructors, remove HOM abso…
armin-ilg Jul 17, 2023
74bba2f
Make scripts working with command line input argument for xml file
armin-ilg Jul 17, 2023
2d8fabb
Change folder structure as sugested by Brieuc
armin-ilg Jul 17, 2023
11ad253
Fixed some paths
armin-ilg Jul 17, 2023
c47e407
Testing test...
armin-ilg Jul 18, 2023
30528c2
Increasing timeout for IDEA test
armin-ilg Jul 18, 2023
bc932ee
Fixing test
armin-ilg Jul 18, 2023
2785837
Using .obj file for Vertex inner barrel support instead of .stl, runn…
armin-ilg Jul 18, 2023
b9a651a
Adding back hierarchy of vertex detector elements, visualisation does…
armin-ilg Jul 18, 2023
3b5ed52
Add missing periphery components to outer barrel
armin-ilg Jul 18, 2023
49c9a9e
Fix simulate script
armin-ilg Jul 18, 2023
f708119
ATLASPix3 modules were 90 degrees rotated, now fixed. Furthermore wro…
armin-ilg Jul 18, 2023
9960bfc
Removing unnecessary line
armin-ilg Jul 18, 2023
8970ff8
Test is working now for the key4hep nightly release, decreasing large…
armin-ilg Jul 18, 2023
64be4e6
Reducing hierarchy by one level in the endcaps, so that it's visible …
armin-ilg Jul 20, 2023
59f15bd
Small script fixes
armin-ilg Jul 20, 2023
3fdeb00
Moving IDEA scripts to FCCee/scripts as they are generally usable
armin-ilg Jul 25, 2023
4b5fd9f
Fixing paths using a /afs/cern.ch/user/a/afehr/lcgeo global variable
armin-ilg Jul 25, 2023
c83d7c7
Cannot use environmental variable before it's defined
armin-ilg Jul 25, 2023
5514d03
Found another way to get the correct paths for the scripts, using /cv…
armin-ilg Jul 25, 2023
c682228
Deleting utils inside of IDEA folder
armin-ilg Jul 25, 2023
e7e67a9
Addressing last comments from Andre
armin-ilg Aug 30, 2023
3e74c51
Adding suggested change to dd4hep2root
armin-ilg Aug 30, 2023
cbe0469
Addressing comments by Andre, still need to copy beam pipe from CLD
armin-ilg Sep 5, 2023
d1a8971
Using same beampipe as in CLD_o2_v05
armin-ilg Sep 5, 2023
c43fe42
Renaming beampipe to match with CLD beampipe (identical at the moment…
armin-ilg Sep 6, 2023
f8aac4e
Fixing test and have correct name for beampipe also in main xml file.…
armin-ilg Sep 6, 2023
4c72895
Moved volume creation within main part of program, so that correct vo…
armin-ilg Sep 20, 2023
d538659
Added functionality to have end of stave structures in vertex barrel.…
armin-ilg Sep 21, 2023
3b26355
Added end-of-stave structures or proxies as well for the outer barrel…
armin-ilg Sep 21, 2023
3401b0f
Making proxy end-of-stave structure smaller to not have overlaps
armin-ilg Sep 21, 2023
bce49c5
Unified description of readout and support structures, now called com…
armin-ilg Sep 21, 2023
748a876
Fixing volIDs in barrel, adding end-of-stave structures in barrel and…
armin-ilg Sep 28, 2023
dc212a3
Correcting material in beam pipe
armin-ilg Sep 28, 2023
3a7199f
Fixing test and for the moment comment out the vertex inner barrel su…
armin-ilg Sep 28, 2023
905f833
Changing to IDEA_o1_v02
armin-ilg Oct 2, 2023
e89b182
Add back vertex inner barrel support, other minor changes
armin-ilg Oct 17, 2023
4e977dc
Adding first version of Si wrapper
armin-ilg Oct 17, 2023
41a955e
Add PC
armin-ilg Oct 23, 2023
96cac13
Thanks to changes in FCCSW and DD4hep, now plotstyle.py from FCCSW ca…
armin-ilg Oct 23, 2023
721aebf
Use VTXOB_r_max from dimensions in vertex detector. Not done yet for …
armin-ilg Oct 26, 2023
8a13ce1
Changing L3 of vertex inner barrel, and added possibility to have eve…
armin-ilg Nov 7, 2023
9b339a4
Surfaces finally working, had to decrease the hierarchy of DetElements
armin-ilg Nov 13, 2023
af6e786
Making detector constructors more efficient (more intermediate assemb…
armin-ilg Dec 7, 2023
df343dc
Removing one level of DetElements, as otherwise the surfaces are not …
armin-ilg Dec 8, 2023
346e25a
Made the hole in Si wrapper barrel larger, not compatible with number…
armin-ilg Dec 8, 2023
b8d9f1f
Improving description of IDEA vertex disks, they should now match the…
armin-ilg Dec 12, 2023
f712be1
Updating VertexSupport to have origin at the IP and to have already a…
armin-ilg Dec 14, 2023
03315d2
Correctly renaming VertexSupport
armin-ilg Dec 14, 2023
bde97e5
Removing overlaps in Si wrapper and vertex, filling holes in Si wrapp…
armin-ilg Dec 15, 2023
4163aee
scripts/save_detector_to_root.sh can be provided with a second argume…
armin-ilg Dec 15, 2023
a831f5e
Fixing change coming from wrong git rebase
armin-ilg Dec 15, 2023
da63426
Adding default values to offset in vertexBarrel end_z structures
armin-ilg Dec 15, 2023
1184829
Making Si Disk go to larger radii, as otherwise a large area is not c…
armin-ilg Dec 15, 2023
d2c974a
Fix some overlap
armin-ilg Dec 15, 2023
b0cd8a4
Put mistakingly deleted files back
armin-ilg Dec 15, 2023
7f173b8
Revert some stupid git mistake
armin-ilg Dec 15, 2023
5db488b
Fixing some other git mistakes
armin-ilg Dec 15, 2023
831d666
Remove whitespace change
armin-ilg Dec 15, 2023
92153e3
Remove whitespace change
armin-ilg Dec 15, 2023
0d70373
Adding default dz value for endOfStave structure
armin-ilg Dec 15, 2023
dc06f25
Getting rid of one overlap, there is still one hidden somewhere in th…
armin-ilg Dec 15, 2023
f4a752a
Trying to pass test without the DDCAD vertex support
armin-ilg Dec 18, 2023
802a27d
Adding vertex support again as this is not the culprit
armin-ilg Dec 18, 2023
8dcdd39
Reducing vertex clearance from IP further so that Vertex disks are fu…
armin-ilg Dec 18, 2023
c8f732a
Adding module functionality to ZPlanarTracker_geo
Nov 2, 2022
c538385
Removing unnecessary includes in vertex constructors and fix VertexBa…
armin-ilg Dec 19, 2023
a5c2f49
Increasing timeout for IDEA test
armin-ilg Dec 19, 2023
723e758
Merge branch 'main' into master
jmcarcell Feb 21, 2024
d5dc0e4
Small changes to fix visualisation
armin-ilg Mar 15, 2024
96b2824
Merging inner and outer vertex barrel into one constructor to enable …
Apr 23, 2024
970ac38
Adding first version of curved vertex
armin-ilg Apr 23, 2024
c0f5827
Revert "Merging inner and outer vertex barrel into one constructor to…
armin-ilg Apr 23, 2024
6ba4918
Changing description
armin-ilg Apr 23, 2024
c106806
Separating inner vertex and outer vertex into two different files, so…
armin-ilg Apr 24, 2024
382da4d
Adding CLD with IDEA vertex
Apr 26, 2024
42f12f7
Removing assembly that is put into world and instead place the envelo…
armin-ilg May 2, 2024
d1122e8
Adding LiquidNDecane to list, to ignore beam pipe material budget
armin-ilg May 2, 2024
56eb6f9
Adding some way to reduce overlaps, but the curved structures require…
armin-ilg May 2, 2024
762c0ce
Fix disk envelope
armin-ilg May 2, 2024
a2a671e
Changes to CLDwithIDEAvertex
May 3, 2024
5d19e1a
Getting rid of overlap between endcap and outer barrel envelopes
armin-ilg May 3, 2024
992de7a
Commenting out CAD volume for the moment
armin-ilg May 3, 2024
f1843cf
Fixing detID
May 3, 2024
5009bfc
Fixed all overlaps except for between disk environment and first disk…
armin-ilg May 3, 2024
fd7d51c
Fix to avoid overlaps
armin-ilg May 3, 2024
755dbd2
Temp fix for overlaps
armin-ilg May 3, 2024
5e2de4f
Actually working version of CLD with IDEA vertex
May 10, 2024
7cfc5c4
Working configuration, fixing orientation of sensitive volumes in ver…
May 14, 2024
01465e8
Adding install.sh file
May 15, 2024
c40e342
IDEA vertex detector outer barrel uses as well Cylindrical constructo…
May 22, 2024
1939219
Working!
May 23, 2024
98bc637
Use same readout names as for CLD
Jun 4, 2024
5af5d3f
My CLD with IDEA vertex
armin-ilg Jun 4, 2024
b86b26f
Merge branch 'main' of https://github.com/key4hep/k4geo into CLD_with…
armin-ilg Jun 4, 2024
b0a7d55
Making curved vertex asymmetric in layer 3 and 4, removing some longe…
armin-ilg Jun 4, 2024
1103c61
Adding ability to have asymmetrical designs for the vertex detector, …
armin-ilg Jun 5, 2024
e56e043
Adding metal layer to curved vertex, fix module id issue by removing …
armin-ilg Jun 17, 2024
77268bc
VertexCylindrical now working with mother volume option (for Silicon …
armin-ilg Jul 25, 2024
574f4fd
Fix extrusion of longerons with mother volume
armin-ilg Jul 25, 2024
5303dbc
Fixed flex overlaps
armin-ilg Jul 25, 2024
d881d50
Got rid of ALL overlaps in inner vertex (normal and ultra-light) and …
armin-ilg Jul 26, 2024
9be0628
Removed all overlaps in both detectors. Added the inner vertex tube. …
armin-ilg Jul 29, 2024
a089a67
Fixed mother volume usage in silicon wrapper
armin-ilg Jul 30, 2024
481cd85
All overlaps gone, also in Silicon Wrapper. Silicon Wrapper performan…
armin-ilg Jul 30, 2024
ca09e80
Merge branch 'main' of https://github.com/key4hep/k4geo into CLD_with…
armin-ilg Jul 30, 2024
bed1b66
Moving to v03 of IDEA, no overlaps found!
armin-ilg Jul 30, 2024
161bac8
Updating my CLD_IDEAvertex
armin-ilg Jul 30, 2024
c49c15a
New branch with only IDEA_o1_v03
armin-ilg Jul 30, 2024
06450bb
Removing changes to v02
armin-ilg Jul 30, 2024
82968e2
Fixing v02
armin-ilg Jul 31, 2024
90a805b
Fixing v02, finally
armin-ilg Jul 31, 2024
c7dd105
Not working version, investigating
armin-ilg Aug 5, 2024
a43ad04
Add bounding boxes to assemblies - fixing bad reconstruction when usi…
armin-ilg Aug 6, 2024
69cd779
Removing old (non-curved) vertex barrel constructor.
armin-ilg Aug 6, 2024
7bc118a
Renaming VertexCylindrical to VertexBarrel and increase version of ve…
armin-ilg Aug 6, 2024
a71a6a7
Updating README
armin-ilg Aug 6, 2024
501a9e0
Merge branch 'main' into IDEA_o1_v03
armin-ilg Aug 6, 2024
8228c66
Adding curved vertex sensitive surfaces (see DD4hep MR as well)
armin-ilg Aug 9, 2024
cde929b
Final changes to have sensitive VolCylinder surface positioned correc…
armin-ilg Aug 14, 2024
b4043b8
Addressing comments and update ALLEGRO, move some visibilities into t…
armin-ilg Aug 14, 2024
e25dafd
Merge branch 'main' into IDEA_o1_v03
armin-ilg Aug 14, 2024
62e90bc
Taking in latest changes
armin-ilg Aug 14, 2024
5158c65
Merge pull request #3 from armin-ilg/CLD_with_IDEAvertex_and_ultra-light
armin-ilg Aug 14, 2024
ff1df42
Fixing some final things for the PR
armin-ilg Aug 14, 2024
a838155
Fixing wrong VertexEndcap file
armin-ilg Aug 14, 2024
5aa686d
And also o1_v01 endcap file
armin-ilg Aug 14, 2024
07e585a
Merge pull request #4 from armin-ilg/CLD_with_IDEAvertex_and_ultra-light
armin-ilg Aug 14, 2024
8e2f13a
WIP towards an updated silicon wrapper, with a more realistic geometr…
armin-ilg Aug 15, 2024
e755d5f
Adding Silicon Wrapper for ALLEGRO, reverting lumical vis change, for…
armin-ilg Aug 15, 2024
4d13180
Removing mistakingly added drift chamber readout ID
armin-ilg Aug 15, 2024
1e56639
Now have a rough version of how the SiWr updated barrel could look li…
armin-ilg Aug 16, 2024
e83bf9e
Properties of to-be-added global disk support proxies. Will need feat…
armin-ilg Aug 16, 2024
4a0182b
Start adding disk proxy volumes
armin-ilg Aug 19, 2024
cd662e5
Merge branch 'SiliconWrapper_o2_v01' into IDEA_o1_v03_disk_supports
armin-ilg Aug 19, 2024
daf356f
Merge branch 'main' into IDEA_o1_v03
armin-ilg Aug 20, 2024
f298980
Finally made vertex disk supports running correctly (they had a wrong…
armin-ilg Aug 21, 2024
65a219f
Renaming VertexBarrel_detailed
armin-ilg Aug 21, 2024
259c4a9
Comment out DDCAD files
armin-ilg Aug 21, 2024
583d097
Rotating inner vertex tube, making insensitive regions in phi for cur…
armin-ilg Aug 27, 2024
7ba1793
Changed inner vertex tube to use just 200 um of carbon fiber and have…
armin-ilg Aug 27, 2024
80eee51
Going full detail for the curved vertex, adding feature to name senso…
armin-ilg Aug 30, 2024
a67e27f
Use as default the classic vertex
armin-ilg Sep 5, 2024
87b5a1f
Removing again CLDIDEAvertex
armin-ilg Sep 17, 2024
230c218
Merge pull request #5 from armin-ilg/IDEA_o1_v03_disk_supports
armin-ilg Sep 17, 2024
a681220
For the moment remove updated silicon wrapper
armin-ilg Sep 17, 2024
3557d0b
Merge branch 'main' of https://github.com/key4hep/k4geo into IDEA_o1_v03
armin-ilg Sep 17, 2024
7435879
Adding Rohacell to ALLEGRO, no overlaps in vertex/silicon wrapper
armin-ilg Sep 18, 2024
b7b7772
Merge branch 'main' into IDEA_o1_v03
armin-ilg Sep 18, 2024
53ae74a
Update tests, also change to new vertex and silicon wrapper there
armin-ilg Sep 19, 2024
2122ee2
Remove .stl files, add them later in the same way as MDI files
armin-ilg Sep 19, 2024
9d09fe5
Merge branch 'IDEA_o1_v03' of https://github.com/armin-ilg/lcgeo into…
armin-ilg Sep 19, 2024
f7e2329
Fixing silicon wrapper path...
armin-ilg Sep 19, 2024
0881aa1
Update utils/material_plots.py
armin-ilg Sep 19, 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
Prev Previous commit
Next Next commit
Also endcap shows all volumes in teveDisplay, but bad hierarchy
Armin Fehr authored and armin-ilg committed Dec 18, 2023
commit 4b0073b8bbfff4e7b26769f98d386ab74ac53399
4 changes: 2 additions & 2 deletions detector/tracker/VertexEndcap_IDEA_o1_v01_geo.cpp
Original file line number Diff line number Diff line change
@@ -283,7 +283,7 @@ static Ref_t create_detector(Detector& theDetector, xml_h e, SensitiveDetector s
Volume ele_vol = Volume( _toString(i, "support_%d"), ele_box, m.support_materials[i]);
ele_vol.setVisAttributes(theDetector.visAttributes(m.support_viss[i]));

pv = stave_assembly.placeVolume(ele_vol, Transform3D(rot, pos) );
pv = envelope.placeVolume(ele_vol, Transform3D(rot, pos) );
}

// Place readout
@@ -297,7 +297,7 @@ static Ref_t create_detector(Detector& theDetector, xml_h e, SensitiveDetector s
Box ele_box = Box( m.readout_widths[i]/2., stave_length/2., m.readout_thicknesses[i]/2.);
Volume ele_vol = Volume( _toString(i, "readout_%d"), ele_box, m.readout_materials[i]);
ele_vol.setVisAttributes(theDetector.visAttributes(m.readout_viss[i]));
pv = stave_assembly.placeVolume(ele_vol, Transform3D(rot, pos) );
pv = envelope.placeVolume(ele_vol, Transform3D(rot, pos) );
}

for(int iModule=0; iModule<nmodules; iModule++){