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

Change adc range from 12 to 14 bits, new DAQ standard #88

Merged
merged 5 commits into from
Mar 21, 2025
Merged

Conversation

emanuele-villa
Copy link
Member

This shall go in only after changes in dunereco/DUNEWirecell, where we're moving from 12 to 14 as well.

Note that the DAQ standard has been 14 for a long time now, but the value was never updated.

(duplicate of another MR that was reverted, this shall remain a draft for a while)

@emanuele-villa emanuele-villa added the bug Something isn't working label Mar 3, 2025
@emanuele-villa emanuele-villa marked this pull request as draft March 3, 2025 14:39
@emanuele-villa
Copy link
Member Author

After this commit, this MR shall go in develop after DUNE/dunecore#141

@emanuele-villa
Copy link
Member Author

By testing I realised I was making a mistake: can't include in a tools fcl. Therefore, I just updated the Nbit value with a comment.

@emanuele-villa emanuele-villa marked this pull request as ready for review March 14, 2025 13:59
@tomjunk tomjunk requested review from calcuttj and yangtj207 March 14, 2025 16:55
@tomjunk
Copy link
Member

tomjunk commented Mar 14, 2025

A question -- does this affect PDSP MC? I think we simulated some new MC recently for PDSP.

@tomjunk
Copy link
Member

tomjunk commented Mar 14, 2025

Added Jake and Tingjun as reviewers.

@tomjunk
Copy link
Member

tomjunk commented Mar 14, 2025

Looks like dunecore PR 141 adds legacy support.

@emanuele-villa
Copy link
Member Author

A question -- does this affect PDSP MC? I think we simulated some new MC recently for PDSP.

I left the value of Nbit = 12 in all pdsp fcl configuration in wirecell_dune.sh. Given that now Nbit (aka resolution) is always read from fcl, there should be no problem.

@tomjunk tomjunk self-requested a review March 20, 2025 19:05
Copy link
Member

@tomjunk tomjunk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved

@aolivier23
Copy link
Contributor

trigger build

@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

@aolivier23
Copy link
Contributor

trigger build

@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 LArSoft Succeeded on slf7 for c14:prof -- details available through the CI dashboard

@FNALbuild
Copy link
Collaborator

⚠️ CI build for DUNE Succeeded with warning at phase build on slf7 for c14:prof - ignored failure for unit_test - ignored warnings for build -- details available through the CI dashboard

parent CI build details are available through the CI dashboard

@aolivier23
Copy link
Contributor

This PR fails a regression test. You can see an example here:
36: test_IdealAdcSimulator: /scratch/workspace/dune_ci/label_exp/swarm/label_exp2/swarm/DUNE/srcs/dunesim/dunesim/DetSim/Tool/test/test_IdealAdcSimulator.cxx:34: void checkEqual(T1, T2, std::string) [T1 = unsigned short, T2 = unsigned short]: Assertion `false' failed.

@tomjunk do you know what that regression test is testing for? Can we get around it somehow?

@FNALbuild
Copy link
Collaborator

⚠️ CI build for DUNE Warning at phase ci_tests DUNE on slf7 for e26:prof - ignored failure for unit_test - ignored warnings for build -- details 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

@FNALbuild
Copy link
Collaborator

⚠️ CI build for DUNE Warning at phase ci_tests DUNE on slf7 for e26:prof - ignored failure for unit_test - ignored warnings for build -- details 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

@FNALbuild
Copy link
Collaborator

⚠️ CI build for DUNE Succeeded with warning at phase build on slf7 for c14:prof - ignored failure for unit_test - ignored warnings for build -- details available through the CI dashboard

parent CI build details are available through the CI dashboard

@aolivier23
Copy link
Contributor

Realized that this PR depends on 1 or more other PRs. I'll merge them all then try again and deal with the consequences.

@aolivier23 aolivier23 merged commit 1d1b5f2 into develop Mar 21, 2025
4 checks passed
@aolivier23
Copy link
Contributor

@emanuele-villa I had to revert this because it breaks a regression test. Looks like an easy fix with your knowledge of how the ADCs work. You have to create a new PR with the branch from this PR and go back through the PR process. Sorry for the mess, I merged this hoping the new Wirecell version would let me fix some problems.

@emanuele-villa
Copy link
Member Author

I suspect it could be because there is a comment after the value Nbit: 14...

@emanuele-villa
Copy link
Member Author

this PR in the end does not depend on any other, so it should not be the problem

@@ -59,7 +59,7 @@ int test_IdealAdcSimulator(bool useExistingFcl) {
fout << "mytool: {" << endl;
fout << " tool_type: IdealAdcSimulator" << endl;
fout << " Vsen: 2.0" << endl;
fout << " Nbit: 12" << endl;
fout << " Nbit: 14" << endl;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the problematic line with the unit test is here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants