Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
IDEA vertex and silicon wrapper for IDEA_o1_v03 (#363)
* Leaving ZPlanarTracker as it is but instead make a new VertexBarrel_o1_v01_geo module * Added ability to have flex and support consisting of multiple components, ability to tilt whole modules. * First implementation of IDEA end-cap and adaption of barrel * Version of Barrel with correct sensitive surfaces (use teveDisplay to show them) * Improved structure of barrel detectors (layer - ladder+sensors) * Progress: The surface arrows are now displayed in the endcap, but the volumes not yet * Whole barrel is properly visible in teveDisplay, but don't mange to make good assembly structure * Also endcap shows all volumes in teveDisplay, but bad hierarchy * Endcap and barrel now run through ddsim overlap checker (overlaps still there) * IDEA Vertex working with ddsim, some overlaps still to be understood * Not working teveDisplay, endcap digitisation not working probably therefore * Fixed endcap, all surfaces visible in teveDisplay, managed to run ddsim and fccRec_e4h with vertex digitisation, but no vertices reco'd yet, bad hierarchy again * Non-working version, the sensitive volumes are wrong, no idea why, use the previous commit * Bad hierarchy, but otherwise working * Found way to remove mother volumes in sensitive and passives. Now all overlaps in Endcap gone * Removing unneeded lines * Recomputing bounding boxes, hasn't fixed the problem yet * Adding IDEA as FCCee_IDEA_o1_v01, not final yet, need to make sure that latest beam pipe and other files are used. There's also still an overlap between the CAD-imported vertex support and the vertex barrel * Adding again deleted file * Reverting changes to VertexBarrel_o1_v01_geo.cpp * Adding scripts * Addressing comments from MR, adding some tests for DDCAD files * Add DDCAD test * Adding test * Renamed constructor files * Changing naming convention to Vertex inner barrel, vertex outer barrel and vertex disks, adding working DDCAD import of vertex inner barrel support (using material budget estimation from FCCSW not working yet though, need to use g4MaterialScan). Adding example on how I install k4geo locally (install.sh) * SingleShape_geo not needed for DDCAD import, instead using DD4hep_TestShape_Creator from DD4hep * Changing CAD shape name * Adding all plotting scripts * Renaming constructor files, adding in latest changes * Add README file for the vertex detector constructors, remove HOM absorber * Make scripts working with command line input argument for xml file * Change folder structure as sugested by Brieuc * Fixed some paths * Testing test... * Increasing timeout for IDEA test * Fixing test * Using .obj file for Vertex inner barrel support instead of .stl, running now without Geant4 exceptions * Adding back hierarchy of vertex detector elements, visualisation does not work in teveDisplay (for the whole vertex) or in geoDisplay (for the disks), but is working when using scripts/build_view.sh * Add missing periphery components to outer barrel * Fix simulate script * ATLASPix3 modules were 90 degrees rotated, now fixed. Furthermore wrong distance between individual chips fixed * Removing unnecessary line * Test is working now for the key4hep nightly release, decreasing large timeout again * Reducing hierarchy by one level in the endcaps, so that it's visible in geoDisplay. Apparently three levels of hierarchy of assemblies is the limit, otherwise geoDisplay will not show the volumes. It is not working in teveDisplay however * Small script fixes * Moving IDEA scripts to FCCee/scripts as they are generally usable * Fixing paths using a /afs/cern.ch/user/a/afehr/lcgeo global variable * Cannot use environmental variable before it's defined * Found another way to get the correct paths for the scripts, using /cvmfs/sw-nightlies.hsf.org/key4hep/releases/2023-07-22/x86_64-centos7-gcc12.2.0-opt/k4geo/1c08affe597cf3b1c10c4e81cdbc95ab9e4a4d23=develop-q7e4mj/share/k4geo/compact for the DDCAD import in Vertex_IDEA_o1_v01.xml, should work once merged and added to the key4hep nightly * Deleting utils inside of IDEA folder * Addressing last comments from Andre * Adding suggested change to dd4hep2root * Addressing comments by Andre, still need to copy beam pipe from CLD * Using same beampipe as in CLD_o2_v05 * Renaming beampipe to match with CLD beampipe (identical at the moment, change name when they differ) * Fixing test and have correct name for beampipe also in main xml file. The test will only run once the IDEA folder is in the nightly Key4hep software stack * Moved volume creation within main part of program, so that correct volume names can be assigned. Furthermore changed DetElements in barrel constructor so that they can be properly accessed in k4RecTracker * Added functionality to have end of stave structures in vertex barrel. This is applied in the IDEA vertex detector. Other than this, also the width of the sensor support in the vertex barrel was corrected to be only 4.4 mm wide (instead of 8.8) * Added end-of-stave structures or proxies as well for the outer barrel, only end-cap missing * Making proxy end-of-stave structure smaller to not have overlaps * Unified description of readout and support structures, now called components. Multiple components can be added per stave and the name will be used to name the corresponding assembly. Furthermore fixed the sensitive/periphery regions in VTXIB layers 2 and 3 to be correct * Fixing volIDs in barrel, adding end-of-stave structures in barrel and end-cap. * Correcting material in beam pipe * Fixing test and for the moment comment out the vertex inner barrel support as it will fail the test, since the CAD file cannot be found. After the IDEA detector is in a nightly release, then the CAD file will be found and we can include these lines in the xml again * Changing to IDEA_o1_v02 * Add back vertex inner barrel support, other minor changes * Adding first version of Si wrapper * Add PC * Thanks to changes in FCCSW and DD4hep, now plotstyle.py from FCCSW can be imported directly and the DDCAD file can be imported in the same way as .xml files * Use VTXOB_r_max from dimensions in vertex detector. Not done yet for z max * Changing L3 of vertex inner barrel, and added possibility to have every second stave offset in r * Surfaces finally working, had to decrease the hierarchy of DetElements * Making detector constructors more efficient (more intermediate assemblies) and finalisation of first Si wrapper layout * Removing one level of DetElements, as otherwise the surfaces are not correctly added by Surfacemanager * Made the hole in Si wrapper barrel larger, not compatible with numbers from https://fcc-ee-detector-full-sim.docs.cern.ch/IDEA/ * Improving description of IDEA vertex disks, they should now match the design quite well. It includes rotation of disks of the two sides relative to each other and the correct staggering of staves in the disks * Updating VertexSupport to have origin at the IP and to have already a correct rotation * Correctly renaming VertexSupport * Removing overlaps in Si wrapper and vertex, filling holes in Si wrapper coverage with shorter tile and fixing the subdetector assembly of the Si wrapper * scripts/save_detector_to_root.sh can be provided with a second argument to define the output file name * Fixing change coming from wrong git rebase * Adding default values to offset in vertexBarrel end_z structures * Making Si Disk go to larger radii, as otherwise a large area is not covered by the barrel. Will need to investigate to instead make the barrel longer or put the disk closer to the IP * Fix some overlap * Put mistakingly deleted files back * Revert some stupid git mistake * Fixing some other git mistakes * Remove whitespace change * Remove whitespace change * Adding default dz value for endOfStave structure * Getting rid of one overlap, there is still one hidden somewhere in the Si wrapper * Trying to pass test without the DDCAD vertex support * Adding vertex support again as this is not the culprit * Reducing vertex clearance from IP further so that Vertex disks are fully in envelope * Adding module functionality to ZPlanarTracker_geo * Removing unnecessary includes in vertex constructors and fix VertexBarrel constructor problem * Increasing timeout for IDEA test * Small changes to fix visualisation * Merging inner and outer vertex barrel into one constructor to enable simper usage of CLD Reconstruction. Since the sensors have different pitches, the segmentation is removed. Need to find a solution to add different segmentations for different layers in the same detector * Adding first version of curved vertex * Revert "Merging inner and outer vertex barrel into one constructor to enable simper usage of CLD Reconstruction. Since the sensors have different pitches, the segmentation is removed. Need to find a solution to add different segmentations for different layers in the same detector" This reverts commit 96b2824. * Changing description * Separating inner vertex and outer vertex into two different files, so that inner vertex can more simply be replaced by curved vertex concept * Adding CLD with IDEA vertex * Removing assembly that is put into world and instead place the envelope (volume) there. Leave assemblies in detector constructors as they are * Adding LiquidNDecane to list, to ignore beam pipe material budget * Adding some way to reduce overlaps, but the curved structures require a very high artificial separation in r not to be detected as overlaps. Remaining overlap is between the envelopes and between the inner barrel envelope and beam pipe * Fix disk envelope * Changes to CLDwithIDEAvertex * Getting rid of overlap between endcap and outer barrel envelopes * Commenting out CAD volume for the moment * Fixing detID * Fixed all overlaps except for between disk environment and first disk. This is difficult to fix since the inner barrel is inserted inside the disks and is inside the space for the first disk, but no actual collision. Dont know yet how to fix * Fix to avoid overlaps * Temp fix for overlaps * Actually working version of CLD with IDEA vertex * Working configuration, fixing orientation of sensitive volumes in vertex inner barrel * Adding install.sh file * IDEA vertex detector outer barrel uses as well Cylindrical constructor, adding support for having multiple wafers/staves in z, have vertex inner and outer barrel in same constructor in order to have same detector ID (needed by iLCSoft), replacing some assemblies by volumes in Cylindrical constructor * Working! * Use same readout names as for CLD * My CLD with IDEA vertex * Making curved vertex asymmetric in layer 3 and 4, removing some longerons, and changing gap to 1.25 mm * Adding ability to have asymmetrical designs for the vertex detector, by using side=+1 or -1, to use a second wafer or stave with a different number of modules * Adding metal layer to curved vertex, fix module id issue by removing pixel segmentation, ... * VertexCylindrical now working with mother volume option (for Silicon wrapper), doing some final checks * Fix extrusion of longerons with mother volume * Fixed flex overlaps * Got rid of ALL overlaps in inner vertex (normal and ultra-light) and outer vertex. Need to include new inner vertex conical support * Removed all overlaps in both detectors. Added the inner vertex tube. Commented out the inner vertex support and the cooling cones as they produce overlaps (with themselves and with the vertex). * Fixed mother volume usage in silicon wrapper * All overlaps gone, also in Silicon Wrapper. Silicon Wrapper performant enough, very quick to build geometry and also easily viewable when exported to root file. Using one very long sensor in the silicon wrapper barrel and large sensors in the disks to reduce number of sensitive surfaces, which was taking very long. Everything else is with the same amount of detail however. Silicon wrapper geometry still the same as presented in Annecy Jan 2024 * Moving to v03 of IDEA, no overlaps found! * Updating my CLD_IDEAvertex * New branch with only IDEA_o1_v03 * Removing changes to v02 * Fixing v02 * Fixing v02, finally * Not working version, investigating * Add bounding boxes to assemblies - fixing bad reconstruction when using iLCSoft track reco * Removing old (non-curved) vertex barrel constructor. * Renaming VertexCylindrical to VertexBarrel and increase version of vertex constructors to o1_v02 * Updating README * Adding curved vertex sensitive surfaces (see DD4hep MR as well) * Final changes to have sensitive VolCylinder surface positioned correctly and having the origin vector pointing outwards * Addressing comments and update ALLEGRO, move some visibilities into the subdetector xml files * Fixing some final things for the PR * Fixing wrong VertexEndcap file * And also o1_v01 endcap file * WIP towards an updated silicon wrapper, with a more realistic geometry. Started with barrel * Adding Silicon Wrapper for ALLEGRO, reverting lumical vis change, formatting, correcting readout for vertex and silicon wrapper in ALLEGRO, adding drift chamber readout ID in ALLEGRO, using built-in pi * Removing mistakingly added drift chamber readout ID * Now have a rough version of how the SiWr updated barrel could look like. Added functionality to define layers without sensors (used for complex support structures), adjusted vertex accordingly * Properties of to-be-added global disk support proxies. Will need feature from SiliconWrapper branch to do this * Start adding disk proxy volumes * Finally made vertex disk supports running correctly (they had a wrongly defined mother volume). DDCAD files look fine in display, but need DD4hep material budget estimation for them (doesn't work with FCCSW estimation) * Renaming VertexBarrel_detailed * Comment out DDCAD files * Rotating inner vertex tube, making insensitive regions in phi for curved vertex * Changed inner vertex tube to use just 200 um of carbon fiber and have a continuous tube for the ultra-light vertex (afte discussions with Fabrizio) * Going full detail for the curved vertex, adding feature to name sensor components * Use as default the classic vertex * Removing again CLDIDEAvertex * For the moment remove updated silicon wrapper * Adding Rohacell to ALLEGRO, no overlaps in vertex/silicon wrapper * Update tests, also change to new vertex and silicon wrapper there * Remove .stl files, add them later in the same way as MDI files * Fixing silicon wrapper path... * Update utils/material_plots.py Co-authored-by: Andre Sailer <[email protected]> --------- Co-authored-by: Armin Fehr <[email protected]> Co-authored-by: Juan Miguel Carceller <[email protected]> Co-authored-by: Armin Ilg <[email protected]> Co-authored-by: Andre Sailer <[email protected]>
- Loading branch information
5 people
committed
Sep 19, 2024
1 parent
8a7c232
commit 72c9480