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

addExtensionsToHCalAllegro #350

Merged

Conversation

mmlynari
Copy link
Contributor

@mmlynari mmlynari commented Jul 4, 2024

BEGINRELEASENOTES

  • added new HCalEndcaps_ThreeParts_TileCal_v02.xml: migrated to use FCCSWGridPhiTheta_k4geo; fixed radial dimensions, so the outer radius of all three parts is the same; renamed nModules to nsegments for number of layers in the second cylinder; uses geometry CaloThreePartsEndcap_o1_v02

  • added new HCalBarrel_TileCal_v02.xml which uses geometry HCalTileBarrel_o1_v01

  • updated ALLEGRO_o1_v03.xml to include HCalBarrel_TileCal_v02.xml and HCalEndcaps_ThreeParts_TileCal_v02.xml

  • added new HCalThreePartsEndcap_o1_v02_geo.cpp: added extension to store the radii of each radial layer as well as dimensions of cells. These will be used by the CellPositionsHCalPhiThetaSegTool to calculate the radii of each layer. Improved code readability and variables naming

  • updated HCalTileBarrel_o1_v01_geo.cpp: added extension to store the radii of each radial layer as well as dimensions of cells. These will be used by the CellPositionsHCalPhiThetaSegTool to calculate the radii of each layer. Improved code readability and variables naming

ENDRELEASENOTES

@mmlynari
Copy link
Contributor Author

mmlynari commented Jul 4, 2024

Tagging @faltovaj , @giovannimarchiori and @BrieucF to have a look at the proposed changes

@BrieucF
Copy link
Contributor

BrieucF commented Aug 7, 2024

Can you resolve the conflicts so that we can trigger the tests?

@mmlynari
Copy link
Contributor Author

mmlynari commented Aug 8, 2024

Thanks @BrieucF , the conflicts should be fixed now.

@mmlynari mmlynari force-pushed the addExtensionsToHCalAllegro_4July2024 branch from b1720c6 to bec9aa1 Compare August 8, 2024 13:30
@mmlynari
Copy link
Contributor Author

mmlynari commented Aug 8, 2024

Hello @BrieucF , I updated the barrel xml file to have v02, as the version test was failing due to this. I also updated my branch with the recent PRs and updated the Allegro v03 xml file to include v02 of hcal xmls.

@giovannimarchiori
Copy link
Contributor

Hello @mmlynari ,

you need to rebase your branch to pickup some recent PRs that introduced some fixes to remove compiler warnings (that are being treated as errors recently and are making the tests fail)

Cheers, Giovanni

@mmlynari mmlynari force-pushed the addExtensionsToHCalAllegro_4July2024 branch from 8dfec09 to 495d8c6 Compare August 9, 2024 17:32
@BrieucF
Copy link
Contributor

BrieucF commented Aug 13, 2024

Hi Michaela, can you

  • remove the old xml files from the folder? HCalBarrel_TileCal.xml and HCalEndcaps_ThreeParts_TileCal.xml
  • update this README with what you changed to ALLEGRO v03
  • and this README to describe detector/calorimeter/HCalThreePartsEndcap_o1_v02_geo.cpp?

@mmlynari
Copy link
Contributor Author

Hello @BrieucF , thank you. It's done now

@giovannimarchiori
Copy link
Contributor

hi @andresailer,
the PR was approved by @mmlynari. Is there anything else needed (apart from rebasing) for merging?
Thanks a lot!
Giovanni

@andresailer andresailer force-pushed the addExtensionsToHCalAllegro_4July2024 branch from 8e77548 to 7ce79d6 Compare August 28, 2024 12:42
@andresailer andresailer enabled auto-merge (rebase) August 28, 2024 12:43
@andresailer andresailer merged commit 3e7117c into key4hep:main Aug 28, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants