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

Fix printout issues in turbine endcap geometry; also add v02 of the geometry #379

Merged
merged 68 commits into from
Sep 18, 2024
Merged

Fix printout issues in turbine endcap geometry; also add v02 of the geometry #379

merged 68 commits into from
Sep 18, 2024

Conversation

varnes
Copy link
Contributor

@varnes varnes commented Aug 22, 2024 •
edited by BrieucF
Loading

BEGINRELEASENOTES

  • ECalEndcap_Turbine_o1_v01_geo: Fix issues with printout (to allow verbosity to be controlled from run script).
  • Add ECalEndcap_Turbine_o1_v02_geo of the "turbine" endcap geometry: which allows for more flexibility than v01 (for example, one can set different blade angles for the three wheels in v02). As v02 is still a work in progress, the default xml points to v01.

ENDRELEASENOTES

@varnes varnes changed the title Turbinev2 fixprintout Fix printout issues in turbine endcap geometry; also add v02 of the geometry Aug 22, 2024
@giovannimarchiori
Copy link
Contributor

Hi @varnes,
what's the status of this PR? Do you still need to further modifications to v02 or is it ready to go?
Can you rebase and fix the conflicts so that the tests can be run?
Also, can you please add comments in the main xml to describe the CellID encoding bitfield?
Thanks a lot,
Giovanni

@giovannimarchiori
Copy link
Contributor

@BrieucF I would really like to merge soon this PR so that we can get rid of the tons of debug messages in regular output. Maybe we move ahead with this (after rebasing) and leave it to a future PR further developments on v02 (if any)?

@andresailer
Copy link
Contributor

@varnes you need to rebase and fix conflicts

@BrieucF
Copy link
Contributor

BrieucF commented Sep 16, 2024

Hi Giovanni, yes, let's merge this asap. @varnes while you rebase and fix the conflicts, would you mind updating the relevant README with information about v02: https://github.com/key4hep/k4geo/tree/main/detector/calorimeter#ecalendcap_turbine, https://github.com/key4hep/k4geo/tree/main/FCCee/ALLEGRO/compact#allegro ?

@BrieucF BrieucF mentioned this pull request Sep 17, 2024
Closed
19 tasks
mmlynari and others added 28 commits September 17, 2024 16:12
@mmlynari
fix failing test and remove unused phi segmentation
d341a1e
@mmlynari
fix endcap bitfields and improve readibility
7a2d014
@mmlynari
keep ALLEGRO v03 xml file unchanged
2d40d86
@mmlynari
adding version nr also for the barrel xml
5ac8f83
@mmlynari
update hcal xml files to v02
d0bf78b
@mmlynari
add back ECalEndcaps_Turbine
f55bdd5
@mmlynari
remove unused hcal v01 xml files
042f6f6
@mmlynari
update READMEs
a7199de
@mmlynari
add HCalTileBarrel_o1_v02_geo.cpp
557ae09
@andresailer
CLD_o2_v07: start with new lumical to fix overlaps
ceb15aa
@andresailer
CLD_o2_v07: fix overlaps in the LumiCal itself
25629c6 
Add a lumical_max_z_prime parameter to get the actual end place of the lumical
add 7 micron meter to the envelopes.
Fix the location and rotation to use the max_z_prime values
@andresailer
CLD_o2_v07: remove old lumical xml
a082a1b
@andresailer
CLD_o2_v07: InnerTracker: fix envelope overlap between lumical and in…
e27f504 
…nertracker
@andresailer
Tests: move CLD test to latest model
3bab7cd
@andresailer
CLD_o2_v07: account for lumical positioning with difference between p…
00194d5 
…rimed and unprimed
@andresailer
Fields: correct type to field_type, changed variable name in DD4hep, …
4b35150 
…type still exists as part of handle
@andresailer
Tests: move one test to something with fieldmaps
96f71f4
@jmcarcell
Do not link against podio and EDM4hep dictionaries (key4hep#386)
822d54a
@jmcarcell
Add a Key4hepConfig file
7c29164
@jmcarcell
Update Key4hepConfig.cmake with fixes from key4hep/key4hep-dev-utils#7
3f99506
@jmcarcell
Use the Key4hepConfig flag to set the standard, compiler flags (key4h…
ee45761 
…ep#387)
@andresailer
CLD_o2_v07: LumiCalBackShield: change envelope to an assembly instead…
0a70e03 
… of algobal union of intersections...

No overlaps detected and the finding points on surface does not complain any more
@andresailer
CLD_o2_v07: LumiCal: replace all envelopes with assemblies
ae23a93 
at least the lumical specific overlap check with /geometry/test/resolution 300000 is much faster now as well???
@danieljeans
ILD models: apply Tracker_limits to the volume inside of beampipe and…
d0fb0bc 
… MDI (key4hep#388)

* apply Tracker_limits to the volume inside of beampipe and related MDI elements

---------

Co-authored-by: JEANS Daniel Thomelin Dietrich <[email protected]>
Remove unused variable, and add information about o1_v02 to the READM…
97700fc 
…E file
Fix merge conflict
4a8d399
Initialize all variables
38c1db6
Initialize all variables
7ecbee3
@varnes
Copy link
Contributor Author

varnes commented Sep 18, 2024

Hi @BrieucF and @giovannimarchiori ,

Sorry for being slow on this (some combination of a family event and the messages ending up in my spam folder contributed). But I think it's ready now...

@BrieucF BrieucF merged commit 8a7c232 into key4hep:main Sep 18, 2024
5 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@varnes @giovannimarchiori @andresailer @BrieucF @atolosadelgado @jmcarcell @Victor-Schwan @Zehvogel @mmlynari @danieljeans