Skip to content

Feature/adding blip to caf#871

Open
Jjm321814 wants to merge 79 commits intodevelopfrom
feature/AddingBlipToCAF
Open

Feature/adding blip to caf#871
Jjm321814 wants to merge 79 commits intodevelopfrom
feature/AddingBlipToCAF

Conversation

@Jjm321814
Copy link
Contributor

@Jjm321814 Jjm321814 commented Nov 13, 2025

Moved the blip-related structs and classes to sbnobj.
This PR must not be approved until SBNSoftware/sbnobj#155 is approved/released! Otherwise it will break blip production.
I also had to make a few CRT changes to successfully compile off the current sbnobj file.

https://sbn-docdb.fnal.gov/cgi-bin/sso/ShowDocument?docid=44445

@Jjm321814
Copy link
Contributor Author

Adding a comment to each of these to track all 4 related PR.
sbncode: SBNSoftware/sbncode#603
sbndcode: #871
sbnobj: SBNSoftware/sbnobj#155
sbnanaobj: SBNSoftware/sbnanaobj#173

The changes to sbnobj, and sbnanaobj are fully independent of any other changes, so they can be approved first.

sbndcode changes rely on sbnobj, so it will have to wait for the first approval. A later simple PR will delete the (now duplicated) class files in the BlipUtils folder here

sbncode changes rely on both sbnobj and sbnanaobj, so that will have to wait for both of the first two approvals.

@henrylay97
Copy link
Member

Hi @Jjm321814 can you remove the CRT changes from this PR and instead merge in develop which has the required updates needed to be compatible with the sbnobj changes. Thanks!

@Jjm321814
Copy link
Contributor Author

Merged in develop. Testing Compile now

@Jjm321814
Copy link
Contributor Author

Compiled fine

@Jjm321814
Copy link
Contributor Author

Let me make fcl changes to the cafmaker, but a dumped fcl version worked fine
image

@Jjm321814
Copy link
Contributor Author

Pushed all the fcl changes needed to run CAF on data and MC.
Have only tested on data. We see a 19% increase in the size of a standard CAF data file (3.7 MB to 4.4 MB) because of blips
image

@henrylay97
Copy link
Member

Hi Jacob, I will review properly after tomorrow's reconstruction meeting. In the meanwhile there are still changes to CRT and LightPropagation files that shouldn't be necessary. Can you remove these? Thanks!

@Jjm321814
Copy link
Contributor Author

I fixed the merge conflict.
For the production/sbnd-gen2 should all both of my PR be remade for that one? Or does develop get merged in periodically

@nathanielerowe
Copy link
Contributor

@Jjm321814 Any unmerged PRs for SBN repositories will need to be duplicated. We split off production/sbnd-gen2 following the v10_14_02_02 release, so anything already merged in should be fine. The sbnobj PR mentioned in this description will need to have a separate copy as well. The branch naming convention should be unified for production branches this time around. Apologies for the inconvenience, I put the split off as long as I could.

@Jjm321814
Copy link
Contributor Author

Okay I am make those duplication. To be clear on the 3-related PR in sbncode, sbnobj, and sbnanaobj do I also need to make duplications?

@nathanielerowe
Copy link
Contributor

Yeah, unfortunately 3 more PRs will need to be opened

@Jjm321814
Copy link
Contributor Author

Made copies of all the PR. I tagged Nate as reviewer for each, but the actual reviews should be done in the PR to develop.
What approvals/fixes are we actually waiting for to get this all merged in?

@nathanielerowe
Copy link
Contributor

@Jjm321814 We are still waiting on approval from Gianluca, I will reach out to him again.

@nathanielerowe
Copy link
Contributor

@Jjm321814 He says this one is good to go, but some of the dependencies need some minor changes.

@nathanielerowe
Copy link
Contributor

Approved by Gianluca over slack

@Jjm321814
Copy link
Contributor Author

Outputs of cafmaker look good after all updates

@Jjm321814
Copy link
Contributor Author

All the comments should be addressed now

@nathanielerowe
Copy link
Contributor

trigger build ci_ref=v10_14_02_03 LArSoft/lar*@LARSOFT_SUITE_v10_14_02_02 SBNSoftware/sbndaq-artdaq-core@v1_10_06 SBNSoftware/sbn*@SBN_SUITE_v10_14_02_03

@FNALbuild
Copy link
Collaborator

✔️ CI build for LArSoft Succeeded on slf7 for e26:prof -- details available through the CI dashboard

@FNALbuild
Copy link
Collaborator

❌ CI build for SBND Failed at phase build SBND on slf7 for e26:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the build SBND phase logs

parent CI build details are available through the CI dashboard

@FNALbuild
Copy link
Collaborator

✔️ CI build for LArSoft Succeeded on slf7 for c14:prof -- details available through the CI dashboard

@FNALbuild
Copy link
Collaborator

❌ CI build for SBND Failed at phase build SBND on slf7 for c14:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the build SBND phase logs

parent CI build details are available through the CI dashboard

@nathanielerowe
Copy link
Contributor

trigger build ci_ref=v10_14_02_03 LArSoft/lar*@LARSOFT_SUITE_v10_14_02_02 SBNSoftware/sbndaq-artdaq-core@v1_10_06 SBNSoftware/sbnobj#155 SBNSoftware/sbn*@SBN_SUITE_v10_14_02_03

@FNALbuild
Copy link
Collaborator

✔️ CI build for LArSoft Succeeded on slf7 for c14:prof -- details available through the CI dashboard

@FNALbuild
Copy link
Collaborator

✔️ CI build for LArSoft Succeeded on slf7 for e26:prof -- details available through the CI dashboard

@FNALbuild
Copy link
Collaborator

❌ CI build for SBND Failed at phase build SBND on slf7 for c14:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the build SBND phase logs

parent CI build details are available through the CI dashboard

@FNALbuild
Copy link
Collaborator

❌ CI build for SBND Failed at phase ci_tests SBND on slf7 for e26:prof - ignored warnings for build -- details available through the CI dashboard

🚨 For more details about the failed phase, check the ci_tests SBND phase logs

parent CI build details are available through the CI dashboard

@nathanielerowe
Copy link
Contributor

@Jjm321814 Does this require sequential CI tests? In other words, do data product dependencies between stages change with this PR?

@Jjm321814
Copy link
Contributor Author

So this definitely needs the sbnobj branch from the other R, but it looks like thats being imported in to your tests.
If CAFMaker is run as part of the tests it would also need the sbncode and sbnanaobj changes.

I think it would be most easily tested as
sbnobj CI
sbnanaobj CI
sbncode CI
sbndcode CI
but I am definitely not a CI expert, thats just the logic I followed to test it in my local area.

@nathanielerowe
Copy link
Contributor

@Jjm321814 cafmaker does get run, I will include the PRs listed in one of your follow up comments.

@nathanielerowe
Copy link
Contributor

trigger build ci_ref=v10_14_02_03 LArSoft/lar*@LARSOFT_SUITE_v10_14_02_02 SBNSoftware/sbndaq-artdaq-core@v1_10_06 SBNSoftware/sbncode#603 SBNSoftware/sbnanaobj#173 SBNSoftware/sbnobj#155 SBNSoftware/sbn*@SBN_SUITE_v10_14_02_03

@FNALbuild
Copy link
Collaborator

✔️ CI build for LArSoft Succeeded on slf7 for c14:prof -- details available through the CI dashboard

@FNALbuild
Copy link
Collaborator

❌ CI build for SBND Failed at phase build SBND on slf7 for c14:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the build SBND phase logs

parent CI build details are available through the CI dashboard

@FNALbuild
Copy link
Collaborator

✔️ CI build for LArSoft Succeeded on slf7 for e26:prof -- details available through the CI dashboard

@FNALbuild
Copy link
Collaborator

❌ CI build for SBND Failed at phase ci_tests SBND on slf7 for e26:prof - ignored warnings for build -- details available through the CI dashboard

🚨 For more details about the failed phase, check the ci_tests SBND phase logs

parent CI build details are available through the CI dashboard

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Expected for Later

Development

Successfully merging this pull request may close these issues.

7 participants

Comments