Adding FCC-SEED as option to all detectors and refactor IDEA/ALLEGRO vertex detector - #612
Adding FCC-SEED as option to all detectors and refactor IDEA/ALLEGRO vertex detector#612armin-ilg wants to merge 46 commits into
Conversation
…barrel. This avoids the use of the 'side' id in GlobalTrackerReadoutID which can lead to problems further downstream (e.g. in bib-studies). Also in the Silicon Wrapper the layer id is now more meaningful (a SiWr with two hits has layers with ids of 0 and 1, not 0 to 3)
…r of pixels is used in segmentation. Change the sensitive thickness in ultra-light vertex to 12 µm following characterisation in https://bib-pubdb1.desy.de/record/638146
…m layerIDfixes-clean2 PR still)
…barrel. This avoids the use of the 'side' id in GlobalTrackerReadoutID which can lead to problems further downstream (e.g. in bib-studies). Also in the Silicon Wrapper the layer id is now more meaningful (a SiWr with two hits has layers with ids of 0 and 1, not 0 to 3)
…r of pixels is used in segmentation. Change the sensitive thickness in ultra-light vertex to 12 µm following characterisation in https://bib-pubdb1.desy.de/record/638146
…st recent versions of FCC-ee vertex detectors. Use separate xml file for kapton layer on beam pipe, host in IDEA_o1_v04 folder
…es that can be combined. Also finally put vertex CAD files correctly into CMakeLists as option (see key4hep#363 (comment)), but don't use them yet (overlaps still with beam pipe and vertex, redesign needed)
…ion to overall DectDimensions files. Changed pitch of ALLEGRO vertex detector and silicon wrapper to be different to that of IDEA. Only use one Silicon Wrapper layer in ALLEGRO for the moment.
…match works for the various vertex detector pieces. Now need to check e.g. for overlaps
|
For CLD I think it would fit our versioning scheme better if you add the FCC-SEED as a new option, i.e. |
The FCC-SEED option is now added as CLD_o5_v01, and the CLD disk material budget fix is CLD_o1_v09 (see #613) |
…y4hep#581) * copy file from DD4hep * update to ROOT XYZVectors * rename things * remove TMath dependence * add DCH as derived struct, move virtual function out layer sub-structure for easier inheritance * renamed DHC_info file, added some annotations * renaming 'multilayer' -> 'superlayer' * first cleaning of wire_info, move DCH specific functions in subclass * Implement the STT info functions, requiring some minimal adatpations / renamings * move form nwires to ncells, as it is more handy (and less confusing) for DCH * remove field wires from LayerInfo * wip:debugging DCH * update ordering of the vertices * Update detector/tracker/StrawTubeTracker_o1_v01_geo.cpp Co-authored-by: Andreas Loeschcke Centeno <53434935+s6anloes@users.noreply.github.com> * Update detector/tracker/WireTracker_info.h Co-authored-by: Andreas Loeschcke Centeno <53434935+s6anloes@users.noreply.github.com> * Update detector/tracker/WireTracker_info.h Co-authored-by: Andreas Loeschcke Centeno <53434935+s6anloes@users.noreply.github.com> * Update detector/tracker/WireTracker_info.h Co-authored-by: Andreas Loeschcke Centeno <53434935+s6anloes@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Andreas Loeschcke Centeno <53434935+s6anloes@users.noreply.github.com> * move twist angle * revert vertices * add ncells * make STT more flexible, allowing variable number of layers per superlayer * add description and bugfix * format * add softlink [TEMPORARY FIX] * simplify dch * format * re-introduce field wires for matching results * fix format * Update detector/tracker/DriftChamber_o1_v02.cpp Co-authored-by: Andreas Loeschcke Centeno <53434935+s6anloes@users.noreply.github.com> * update STT extension * move header --------- Co-authored-by: Andreas Loeschcke Centeno <53434935+s6anloes@users.noreply.github.com>
* Resize ALLEGRO DCH * ALLEGRO_o1_v03 modify the silicon wrapper extent to match the new DCH z length * [ALLEGRO_o1_v03] Tune twist angle to keep similar stereo angle --------- Co-authored-by: Giovanni Marchiori <39376142+giovannimarchiori@users.noreply.github.com>
…key4hep#609) * add method to return number of wheels * add method to return number of wheels * add method to return number of wheels * add method to return number of wheels * fix format
…of support structure thickness
…LD VXDs. Overlaps when using CAD beampipe are still seen (overlaps with CAD beampipe itself)
50b9f0e to
531d33c
Compare
|
Hi. The PR is now ready for review. @Victor-Schwan @tmadlener : Do you want FCC-SEED to be the default vertex detector in ILD? @BrieucF @giovannimarchiori : This PR includes the changes for ALLEGRO (pixel pitches and only one layer of Silicon Wrapper). FCC-SEED can be used for the inner vertex if desired. @lopezzot : For IDEA only the structure of the vertex detector xml file is changed. One can, however, also use FCC-SEED as inner vertex if desired. @andresailer @Zehvogel : The FCC-SEED option is now added as CLD_o5_v01, and the CLD disk material budget fix is CLD_o1_v09 (see #613). |
|
Hi @armin-ilg thank you for the contribution! This is a particularly CLD-centric problem, but I think the PR would benefit from a cleanup of the commit history.
Let me know if you have questions on how to do this. :) |
I think for now we prefer to stay with the current version to not introduce yet another moving part into our efforts of getting a full tracking/reconstruction chain going. We would then switch to this once we have a (technical) baseline in place. Unrelated to ILD, this will almost certainly break the conversion to an Acts geometry that happens in the k4ActsTracking, so also the blueprint building in https://github.com/key4hep/k4ActsTracking/blob/main/k4ActsTracking/src/components/DD4hepBlueprintConstruction.cpp will have to be adapated accordingly. |
…o2_v09, which has the fixed disk mat. budget)
Thanks for the feedback, I changed the default back to the CLD vertex (the one from CLD_o2_v09 with the fixed disk mat. budget). Indeed k4ActsTracking doesn't work yet with all detectors using VertexBarrel_detailed/VertexEndcap_detailed. This is on my to do list and I would tackle it in a future PR (just need to add the two blueprints as you pointed out). |
To ease the review process, please consider the following before opening a pull request:
--ff-only) tok4geo/mainIf you are modifying detector dimensions or adding new xml parameters, also consider the following:
ddsim --compactFile PATH_TO_COMPACT_FILE --runType run --ui.commandsInitialize "/geometry/test/run" > overlapDump.txtBEGINRELEASENOTES
VertexComplete_o1_v04.xml). Ultra-light inner vertex is in a standalone xml file (VertexInnerBarrelUltraLight_o1_v04.xml)ENDRELEASENOTES