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: update pfrich branch with respect to main #35

Open
wants to merge 22 commits into
base: pfrich
Choose a base branch
from

Conversation

c-dilks
Copy link
Member

@c-dilks c-dilks commented May 7, 2023

Briefly, what does this PR introduce?

Merging pfrich into main is not straightforward and risks breaking dependent code. Therefore, let's first merge main into pfrich, and make sure all important patches are applied to all new files:

@c-dilks
Copy link
Member Author

c-dilks commented May 7, 2023

@alexander-kiselev this pfrich-update branch is a "prototype" of the merging of your pfrich branch with main.

Could you please do a "smoke test" and make sure your pfRICH usage still basically works on this pfrich-update branch? Check recent pull requests for more details of what has changed on main.

@c-dilks c-dilks marked this pull request as ready for review May 7, 2023 19:25
@alexander-kiselev
Copy link
Collaborator

alexander-kiselev commented May 8, 2023 via email

@c-dilks
Copy link
Member Author

c-dilks commented May 9, 2023

No deadline, I'm also going to try to do some testing with it in EICrecon within the next couple of weeks. I just wanted to make sure recent CMake build changes won't mess up your usage.

@c-dilks c-dilks mentioned this pull request Jun 6, 2023
@kkauder kkauder added the enhancement New feature or request label Oct 17, 2023
@kkauder
Copy link

kkauder commented Dec 8, 2023

@alexander-kiselev This comprises only #ifdef guards and cmake generalizations. I checked that it builds on both my mac and in the EicRoot container.
The simple example in pfrich

root -l './examples/pfrich.C("examples/pfrich.root")'

gives a warning "You should update the version to ClassDef(CherenkovPhotonDetector,7)." but so does the pfrich branch.
The compiled pfrich code works fine. I think it's safe to merge but maybe you want to double-check.

@kkauder
Copy link

kkauder commented Jan 22, 2024

@alexander-kiselev Could you check and approve when you have a few minutes?

@alexander-kiselev
Copy link
Collaborator

alexander-kiselev commented Jan 23, 2024 via email

@kkauder
Copy link

kkauder commented Jan 25, 2024

These are changes to the pfrich branch that don't do anything to the logic, just clean up with #ifdef's and so on for better integration with the epic stack.

@alexander-kiselev
Copy link
Collaborator

alexander-kiselev commented Jan 25, 2024 via email

@kkauder
Copy link

kkauder commented Jan 25, 2024

C++ loves to throw warnings if members aren't initialized in the exact order listed in the class, that's all.

@alexander-kiselev
Copy link
Collaborator

alexander-kiselev commented Jan 25, 2024 via email

@kkauder
Copy link

kkauder commented Jan 25, 2024

Remember, this isn't a PR into main but into pfrich. In that branch, you deleted m_ID and Chris restored it (not sure what he needs it for), but in some other place.

@alexander-kiselev
Copy link
Collaborator

alexander-kiselev commented Mar 28, 2024 via email

@kkauder
Copy link

kkauder commented Mar 28, 2024

Reviewing, yes, that was my takeaway. I don't see a need for that m_ID, so we can accept it or not, but it didn't move the needle for significance for me. You feel strongly one way or the other, let's do that. @c-dilks , can you add to the need for
this member?

@c-dilks
Copy link
Member Author

c-dilks commented Mar 28, 2024

Reviewing, yes, that was my takeaway. I don't see a need for that m_ID, so we can accept it or not, but it didn't move the needle for significance for me. You feel strongly one way or the other, let's do that. @c-dilks , can you add to the need for this member?

At least in EICrecon, the primary irt consumer in the spack builds, it appears in 2 places:

It seems this is only used for log printouts, so it may be safe to remove.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request topic: simulation
Projects
Status: In Progress
Development

Successfully merging this pull request may close these issues.

4 participants