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

feat: associate MC photons in PhotoMultiplierHitDigi output #599

Merged
merged 18 commits into from
May 1, 2023

Conversation

c-dilks
Copy link
Member

@c-dilks c-dilks commented Apr 11, 2023

Briefly, what does this PR introduce?

Use edm4eic::MCRecoTrackerHitAssociation along with edm4eic::RawTrackerHit, to include the MC photon information in the output of PhotoMultiplierHitDigi

What kind of change does this PR introduce?

  • Bug fix (issue #__)
  • New feature (issue #__)
  • Documentation update
  • Other: __

Please check if this PR fulfills the following:

  • Tests for the changes have been added
  • Documentation has been added / updated
  • Changes have been communicated to collaborators

Does this PR introduce breaking changes? What changes might users need to make to their code?

In general no breaking changes, but:

  • until a new version of EDM4eic is released, which includes datatype MCRecoTrackerHitAssociation, this will not build in eic-shell
  • may introduce conflicts with Noise injection in DRICH simulation #555, but likely straightforward to resolve

Does this PR change default behavior?

only for the dRICH (the only user of PhotoMultiplierHitDigi)

@c-dilks
Copy link
Member Author

c-dilks commented Apr 11, 2023

Ready when new version of EDM4eic is released; until then CI build will not succeed.

@c-dilks c-dilks marked this pull request as ready for review April 11, 2023 20:51
@c-dilks c-dilks mentioned this pull request Apr 13, 2023
30 tasks
@c-dilks c-dilks requested review from DraTeots and wdconinc April 13, 2023 17:34
src/algorithms/digi/PhotoMultiplierHitDigi.cc Outdated Show resolved Hide resolved
src/algorithms/digi/PhotoMultiplierHitDigi.h Outdated Show resolved Hide resolved
src/algorithms/digi/PhotoMultiplierHitDigiConfig.h Outdated Show resolved Hide resolved
src/detectors/DRICH/DRICH.cc Outdated Show resolved Hide resolved
src/global/digi/PhotoMultiplierHitDigi_factory.cc Outdated Show resolved Hide resolved
src/global/digi/PhotoMultiplierHitDigi_factory.h Outdated Show resolved Hide resolved
src/algorithms/digi/PhotoMultiplierHitDigi.cc Outdated Show resolved Hide resolved
src/detectors/DRICH/DRICH.cc Outdated Show resolved Hide resolved
src/algorithms/digi/PhotoMultiplierHitDigiConfig.h Outdated Show resolved Hide resolved
src/algorithms/digi/PhotoMultiplierHitDigi.cc Outdated Show resolved Hide resolved
src/algorithms/digi/PhotoMultiplierHitDigi.cc Outdated Show resolved Hide resolved
@c-dilks
Copy link
Member Author

c-dilks commented Apr 14, 2023

Next commits will use the new MultiFactory

@c-dilks
Copy link
Member Author

c-dilks commented Apr 14, 2023

Next commits will use the new MultiFactory

Working on #612 to keep this cleaner. Doesn't work yet...

@c-dilks
Copy link
Member Author

c-dilks commented Apr 18, 2023

Looks like all conversations are resolved. Let's wait til EDM4eic 2.0.0 makes it to the CVMFS image so the CI checks run.

@wdconinc
Copy link
Contributor

Let's wait til EDM4eic 2.0.0 makes it to the CVMFS image

It builds... but poor scaling on a new build mechanism is causing the eic_container to eats its own tail in the scheduled nightly jobs... Working on that.

@wdconinc
Copy link
Contributor

cvmfs sync fixed; restarted check.

@c-dilks
Copy link
Member Author

c-dilks commented Apr 20, 2023

CI passed, updating w.r.t. main

@c-dilks
Copy link
Member Author

c-dilks commented Apr 20, 2023

And confirmed these files are all identical to the ones on my irt-algo dev branch, where I do the real testing with the dRICH.

@c-dilks c-dilks requested a review from wdconinc April 21, 2023 18:05
@c-dilks c-dilks self-assigned this Apr 27, 2023
Copy link
Contributor

@wdconinc wdconinc left a comment

Choose a reason for hiding this comment

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

Just minor comments.

src/algorithms/digi/PhotoMultiplierHitDigi.cc Outdated Show resolved Hide resolved
@wdconinc wdconinc enabled auto-merge (squash) May 1, 2023 20:14
@wdconinc wdconinc merged commit 429cb00 into main May 1, 2023
@wdconinc wdconinc deleted the pmt-associations branch May 1, 2023 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants