Feature/adding blip to caf #871
Conversation
|
Adding a comment to each of these to track all 4 related PR. 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. |
|
Hi @Jjm321814 can you remove the CRT changes from this PR and instead merge in |
|
Merged in develop. Testing Compile now |
|
Compiled fine |
|
Let me make fcl changes to the cafmaker, but a dumped fcl version worked fine |
|
Pushed all the fcl changes needed to run CAF on data and MC. |
|
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! |
linyan-w
moved this from Expected for validation II
to Waiting on Reviewer
in SBND 2025 Fall Production
|
It is fine for this to be approved, just not merged, before sbnobj PR is ready! |
|
Also @Jjm321814 can you fix the merge conflict here? |
|
I'll check out the files from develop to make sure they are fully copied correctly, then sort the merge conflicts |
|
CRT + Light Correction look fixed and merge conflict should be resolved now |
henrylay97
left a comment
henrylay97
left a comment
There was a problem hiding this comment.
Thanks so much for sorting the extra bits carried into this PR. In general it looks great, I have a few small comments. Would you also mind adding your slides from today's talk to the description, it's always really useful in future to have the documentation linked.
| ROOT::Gdml | ||
| sbndcode_CRTUtils | ||
| sbnobj::Common_CRT | ||
| sbndobj_BlipDataTypes |
There was a problem hiding this comment.
Does this not need an sbnobj:: prefix?
There was a problem hiding this comment.
I could name the library that way in the sbnobj CMAKE, but I chose an underscore. See https://github.com/SBNSoftware/sbnobj/pull/155/files#diff-9952908aa001973cd68cd85ca69225fa254a962de9cdf7cc3c395e0e2a16d762R1
There was a problem hiding this comment.
Yes, it is still good practice in my opinion to have the repository named, even if there is no current naming overlap. i.e. sbnobj::sbndobj_BlipDataTypes
| physics.producers.pandoraShowerRazzle.SimChannelLabel: "simtpc2d:simpleSC" | ||
| physics.producers.pandoraTrackDazzle.SimChannelLabel: "simtpc2d:simpleSC" | ||
| physics.producers.cnnid.WireLabel: "simtpc2d:gauss" | ||
| #physics.producers.cnnid.WireLabel: "simtpc2d:gauss" |
There was a problem hiding this comment.
Why are you commenting out this cnnid line?
There was a problem hiding this comment.
In the new ROI finding scheme we are keeping simtpc2d:dnnsp, but dropping simtpc2d:gauss.
Since this object is dropped I was getting errors trying to run CAFmaker without this comment
There was a problem hiding this comment.
So there's two possibilities here:
- Either, the default for this parameter is already
"simtpc2d:dnnsp"in which case the line can be deleted not commented out. - Or, the default for this parameter is something else and so this line should be kept but point at
"simtpc2d:dnnsp".
|
https://sbn-docdb.fnal.gov/cgi-bin/sso/ShowDocument?docid=44445 talk from today's reco meeting |
| sbnobj::Common_CRT | ||
| #sbndcode_CosmicIdUtils | ||
| sbndcode_BlipUtils | ||
| sbndobj_BlipDataTypes |
sbndcode/BlipRecoSBND/CMakeLists.txt
Outdated
| sbndcode_RecoUtils | ||
| sbndcode_OpDetSim | ||
| sbndcode_BlipUtils | ||
| sbndobj_BlipDataTypes |
There was a problem hiding this comment.
Please fix the indentation: copy the line above verbatim, then adjust the library name.
| #sbndcode_CosmicIdUtils | ||
| ) | ||
|
|
||
| art_dictionary(DICTIONARY_LIBRARIES sbndcode_BlipUtils) |
There was a problem hiding this comment.
No dictionary is produced any more: just remove this art_dictionary line.
There was a problem hiding this comment.
I still want to import BlipUtils.h to the Alg folder though, so don't I still need this dictionary to access functions defined there?
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