WIP: Update pctpairprotons to handle all return types of Uproot#74
Open
acoussat wants to merge 3 commits intoRTKConsortium:mainfrom
Open
WIP: Update pctpairprotons to handle all return types of Uproot#74acoussat wants to merge 3 commits intoRTKConsortium:mainfrom
pctpairprotons to handle all return types of Uproot#74acoussat wants to merge 3 commits intoRTKConsortium:mainfrom
Conversation
acoussat
force-pushed
the
pctpairprotons-uproot
branch
from
d1a43af to
f319a8e
Compare
acoussat
changed the title
pctpairprotons to support more uproot versionspctpairprotons to support more uproot versions
acoussat
changed the title
pctpairprotons to support more uproot versionspctpairprotons to handle all return types of Uproot
acoussat
force-pushed
the
pctpairprotons-uproot
branch
from
f319a8e to
7ee0939
Compare
acoussat
force-pushed
the
pctpairprotons-uproot
branch
from
7ee0939 to
ad01834
Compare
acoussat
changed the title
pctpairprotons to handle all return types of Uprootpctpairprotons to handle all return types of Uproot
acoussat
commented
Apr 15, 2026
Comment on lines
+8
to
+11
| return ( | ||
| "/home/acoussat/Software/dev/PCT/PCT/output/PhaseSpaceIn.root", | ||
| "/home/acoussat/Software/dev/PCT/PCT/output/PhaseSpaceOut.root", | ||
| ) |
Collaborator
Author
There was a problem hiding this comment.
This is obviously temporary. Where should I get the data from? In RTK data are either generated from scratch, or downloaded from a remote location. In my case I have two ROOT files that need to serve as inputs to pctpairprotons.
Collaborator
There was a problem hiding this comment.
I'd say downloaded from RTK's Girder collection, there is already a folder there.
Collaborator
There was a problem hiding this comment.
The generation test should be in Gate.
Collaborator
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
It seems that depending on Uproot's version, the
arraysmethod sometimes returns a Pythondict, and sometimes anumpy.ndarray. This PR generalizes the code to handle both cases.As a first attempt to avoid future regressions, I have also added a small test that runs the
pctpairprotonsapplications. I still need to check if it runs correctly on the CI.I have also updated the documentation with a paragraph about the installation of Uproot, but I am wondering if Uproot shouldn't become a mandatory dependency of PCT as it is very unlikely that anyone will run PCT without using
pctpairprotons.Let me know if any part of the above should be in a separate PR.
This PR is still a WIP because it needs further testing (from Laura, but also from me).