Update DRC geometry migration #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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 * Found way to remove mother volumes in sensitive and passives. Now all overlaps in Endcap gone * 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 scripts * Addressing comments from MR, adding some tests for DDCAD files * Adapting dd4hep::CellID instead of long64 * 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 * 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 * ATLASPix3 modules were 90 degrees rotated, now fixed. Furthermore wrong distance between individual chips fixed * 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 * Moving IDEA scripts to FCCee/scripts as they are generally usable * Fixing paths using a /afs/cern.ch/user/a/afehr/lcgeo global variable * 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 * Using same beampipe as in CLD_o2_v05 * Letting IDEA test run from anywhere * 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 * Multiple properties in one SET_TESTS_PROPERTIES instance * 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 --------- Co-authored-by: Armin Fehr <[email protected]>
This reverts commit 3845670.
*IDEA_o1_v01.xml -> FCCee_DectMaster_v01.xml *element+material copied to local directory following new policy of k4geo *Vertex from CLD copied locally
*LB_o1_v01.xml -> FCCee_DectMaster.xml *element+material copied to local directory following new policy of k4geo *Other compact files that were copied locally: DetFCCeeIDEA/compact/Beampipe.xml DetFCCeeIDEA/compact/BeamInstrumentation.xml DetFCCeeIDEA/compact/LumiCal.xml DetFCCeeIDEA/compact/HOMAbsorber.xml DetFCCeeIDEA/compact/SimplifiedDriftChamber.xml DetFCCeeCLD/compact/FCCee_o2_v02/Vertex.xml DetFCCeeECalInclined/compact/FCCee_EcalBarrel.xml DetFCCeeCalDiscs/compact/FCCee_EcalEndcaps_coneCryo.xml DetFCCeeHCalTile/compact/FCCee_HCalBarrel_TileCal.xml DetFCCeeHCalTile/compact/FCCee_HCalEndcaps_ThreeParts_TileCal.xml
*Calorimeter compact files are now in the folder
drift chamber commented out by recommendation of Brieuc
header, library and components seems to be properly installed
migrated from FCCDetectors, so they will not clash
to use the version existing already in k4geo, as said in key4hep#282 (comment)
Adding the usage of ```MaterialManager``` and ``` LayeredCalorimeterData``` to obtain calorimeter information like Radiation length, interaction length etc. The values of inner thickness, sensitive thickness, outer thickness and absorber thickness has a dummy value temporarily which will be changed.
…imensions. Add materials needed for the LAr There however are overlaps inside of LAr bath which experts on LAr should maybe take care of
…_o1_v01_geo.cpp Co-authored-by: Andre Sailer <[email protected]>
…_o1_v01_geo.cpp Co-authored-by: Andre Sailer <[email protected]>
…_o1_v01_geo.cpp Co-authored-by: Andre Sailer <[email protected]>
…_o1_v01_geo.cpp Co-authored-by: Andre Sailer <[email protected]>
…_o1_v01_geo.cpp Co-authored-by: Andre Sailer <[email protected]>
push_back all layers to keep them for later
… radially which was along the inclined electrode.
Co-authored-by: Andre Sailer <[email protected]>
Co-authored-by: Andre Sailer <[email protected]>
Change from system:4 to system:5
* add pre-commit check-xml test * make SiD pass check-xml * make IDEA pass check-xml * make CLD pass check-xml * make example pass check-xml
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
BEGINRELEASENOTES
exactly as it appears between the two bold lines
ENDRELEASENOTES