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

Migration of Theta module from FCCDetector repository #293

Merged
merged 15 commits into from
Nov 3, 2023
Merged

Migration of Theta module from FCCDetector repository #293

merged 15 commits into from
Nov 3, 2023

Conversation

atolosadelgado
Copy link
Collaborator

@atolosadelgado atolosadelgado commented Oct 26, 2023 •
edited by andresailer
Loading

BEGINRELEASENOTES

  • This PR is the equivalent to PR56 in FCCDetectors
    • New segmentation imported from FCCDetectors, refactored as FCCSWGridModuleThetaMerged_k4geo
    • New version of ALLEGRO_o1_v02, evolving the ECAL barrel to include the new segmentation

ENDRELEASENOTES

@atolosadelgado
Copy link
Collaborator Author

Hi,

I have imported the geometry and new segmentation class from FCCDetectors, and refactored it to avoid collision k4geo-FCCDetectors.

There are other PRs waiting for this migration, so it would be great to be merged as soon as possible :)

Cheers,
Alvaro

@atolosadelgado
Merging Giovanni changes of ECal barrel inclined constructor
d7663aa 
into the refactored new constructor
ECalBarrel_NobleLiquid_InclinedTrapezoids_o1_v01_geo.cpp
@atolosadelgado
Typo in comment fixed
84b54be
BrieucF
BrieucF reviewed Nov 2, 2023
View reviewed changes
Copy link
Contributor

@BrieucF BrieucF left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also confirm that the code actually runs?

FCCee/ALLEGRO/compact/ALLEGRO_o1_v02/FCCee_ECalBarrel_thetamodulemerged.xml Outdated
</readouts>

<detectors>
<detector id="BarECal_id" name="ECalBarrel" type="ECalBarrel_NobleLiquid_InclinedTrapezoids_o1_v01" readout="ECalBarrelModuleThetaMerged">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should use ECalBarrel_NobleLiquid_InclinedTrapezoids_o1_v02 here

detector/calorimeter/ECalBarrel_NobleLiquid_InclinedTrapezoids_o1_v02_geo.cpp Outdated Show resolved Hide resolved
@atolosadelgado
Copy link
Collaborator Author

I forgot to add the new segmentation into the segmentation factory. Now geoDisplay works.

I have added the other two comments as well.

@BrieucF
Copy link
Contributor

BrieucF commented Nov 2, 2023

Thanks Alvaro!

@jmcarcell jmcarcell merged commit 1997bfd into key4hep:master Nov 3, 2023
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmcarcell jmcarcell jmcarcell left review comments

@BrieucF BrieucF BrieucF approved these changes

@andresailer andresailer andresailer approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@atolosadelgado @BrieucF @andresailer @jmcarcell