-
Notifications
You must be signed in to change notification settings - Fork 17
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
UPDATED: Adding capability to deconvolve using channel-by-channel templates #69
base: develop
Are you sure you want to change the base?
Conversation
…plates" This reverts commit 7eb23d6.
…n. Changing only the part for PDHD.
… channels. Default channe = -1. Add default configuration table for FD.
… will create the same configuration as before the upgrade of the module. Added configuration table for ProtoDUNE MC.
…e explanatory names. Moving PDHD MC template mapping to dune_opdet_channels.fcl.
trigger build |
Darn it, this did not trigger the CI for me. @aolivier23 how do I trigger the CI within dune's organisation? |
✔️ CI build for LArSoft Succeeded on slf7 for e26:prof -- details available through the CI dashboard |
✔️ CI build for LArSoft Succeeded on slf7 for c14:prof -- details available through the CI dashboard |
❌ CI build for DUNE Failed at phase ci_tests DUNE on slf7 for c14:prof -- details available through the CI dashboard 🚨 For more details about the failed phase, check the ci_tests DUNE phase logs parent CI build details are available through the CI dashboard |
❌ CI build for DUNE Failed at phase ci_tests DUNE on slf7 for e26:prof -- details available through the CI dashboard 🚨 For more details about the failed phase, check the ci_tests DUNE phase logs parent CI build details are available through the CI dashboard |
Thanks @vpec0, can you make a PR in dunesw with the changes you mention? |
There were some configurable name changes which I had not propagated fully. This is fixed in the latest commit (72e0166). I have tested building the code and run successfully the reco job used in the CI tests: |
@jroto There are these fhicl files which reference
I assume I can change How do I make sure that I don't break anything? |
I thought @YoannKermaidic got rid of the cold box's deconvolution. As they don't have such a big undershoot, they don't need to deconvolve the signals. Yes, I wouldn't touch those. If I understood correctly, this deconvolution module has been already tested with data, although not with the new simulation digitizer. Then we need to wait for @mjdelgadog to update the SPE templates of all channels (she told me we would have it by next Monday). Should we wait for Maritza before merging? |
I can confirm, that the code was not tested with PDHD sims, only with data. Treatment of full streaming channels is not implemented and those channels should be ignored. This PR does not need to wait for the templates to be ready. This is functionality implementation and configuration for reading out the templates from stashcache can be added later. |
# For backwards compatibility. This table is currently used in many workflows for different detectors, data and MC. | ||
dune_deconvolution: @local::generic_dune_deconvolution | ||
dune_deconvolution.SPETemplateFiles: ["SPE_DAPHNE2_FBK_2022.dat"] | ||
# Set SPE template channel map: channel = -1 for all channels |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good, thanks, Viktor.
Can we merge this already? should we run again the CI tests? @absolution1 @aolivier23 |
trigger build |
✔️ CI build for LArSoft Succeeded on slf7 for e26:prof -- details available through the CI dashboard |
✔️ CI build for LArSoft Succeeded on slf7 for c14:prof -- details available through the CI dashboard |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, thank you
❌ CI build for DUNE Failed at phase ci_tests DUNE on slf7 for c14:prof -- details available through the CI dashboard 🚨 For more details about the failed phase, check the ci_tests DUNE phase logs parent CI build details are available through the CI dashboard |
🚨 For more details about the warning phase, check the ci_tests DUNE phase logs parent CI build details are available through the CI dashboard |
I can't interpret the results from the CI tests. From a quick look, I don't see how the warnings and failures are related to the PR. |
I've just had a look. I think we're due an update of the reference files. I've asked on slack if we can get an update of the refs. |
This is a reopening of #61.
#61 was merged, caused issues, and reverted in develop.
This PR contains the same commits and additional commits which should resolve the issues in CI tests. FHICL configurations were updated so that they were backwards compatible.
However, FD reco workflows should switch to using table
dune_fd_deconvolution
fromDeconvolution.fcl
and ProtoDUNE HD should switch to tableprotodunehd_deconvolution
orprotodunehd_mc_deconvolution
.CI tests should be run before the pull, I haven't tested this on FD sims.