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.

Sign up for GitHub

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

Jump to bottom

A/E and calibration changes #514

Merged
merged 22 commits into from
Nov 2, 2023
Merged

A/E and calibration changes #514

merged 22 commits into from
Nov 2, 2023

Conversation

ggmarshall
Copy link
Collaborator

Rewrite of a/e code, better calibration fitting with bias on tail to remove degeneracies.
Improved all results dictionaries to specify function fitted where it is found and parameters/errors as dictionaries.

@codecov
Copy link

codecov bot commented Sep 29, 2023 •
edited
Loading

Codecov Report

Attention: 584 lines in your changes are missing coverage. Please review.

Files Coverage Δ
src/pygama/pargen/AoE_cal.py 0.00% <ø> (ø)
src/pygama/pargen/extract_tau.py 0.00% <0.00%> (ø)
src/pygama/math/peak_fitting.py 25.70% <0.00%> (-0.81%) ⬇️
src/pygama/pargen/energy_optimisation.py 6.42% <0.00%> (-0.02%) ⬇️
src/pygama/pargen/utils.py 12.12% <12.12%> (ø)
src/pygama/pargen/energy_cal.py 12.34% <6.28%> (-0.82%) ⬇️
src/pygama/pargen/ecal_th.py 0.00% <0.00%> (ø)

📢 Thoughts on this report? Let us know!.

@gipert
Copy link
Member

gipert commented Oct 1, 2023 •
edited
Loading

Is this ready to merge? You could mark the PR as "draft" and set it to "ready to be merged" when you want us to review and merge.

Also please install the pre-commit hooks locally with pre-commit install. In general, we want to avoid having these pre-commit commits in the Git history. It would be nice if you could rewrite the current commit history by squashing the auto commits into the previous ones with git rebase -i.

@ggmarshall ggmarshall marked this pull request as draft October 2, 2023 12:31
@gipert gipert added the pargen Generation of analysis parameters (calibrations etc.) label Oct 3, 2023
@ggmarshall
added more possible length combinations for getting parameters
5328db6
@ggmarshall
updated for changes to calibrations
fc8b129
@ggmarshall
rewrote fitting to fit in stages dropping tail if unnecessary with pr…
56136ff 
…ior on tail to remove degeneracy, added check on guess so no guess params are none, bounded mu to be in fit range, improved validity checks
@ggmarshall
changes for new cal fitting, added high stats fitting for super calib…
25ce6a1 
…rations, wrote resolution fitting to include both linear and quadratic fits, changed results output for clarity
@ggmarshall
rewrite of aoe routines, better handling of guesses, improved clarity…
011838a 
… of results, split out plots into own functions
@ggmarshall
split loading routine into own file as well as function to handle fai…
dfca8a0 
…led fits
@ggmarshall
bugfix on selection when nan values from fit
4c55f01
@ggmarshall
added ability to change tail weighting and changed binning on high st…
4dc8272 
…ats fitting
@ggmarshall
bugfix for partitiona ecal
0c6ddbe
@ggmarshall
fixed pars to params to eres fit
64a45a1
@ggmarshall
partition ecal naming fix
a71479d
@ggmarshall
updated units in fwhm to convention
9cd6853
@ggmarshall
corrected units to _in_keV
5a623db
@ggmarshall
moved aoe_calibration function to dataflow
193fac5
@ggmarshall
moved top level funcs to dataflow added pulser field to plot arguments
a7ceeab
@ggmarshall
added option to pass pulser mask to event selection if not calculate …
1183817 
…itself
@ggmarshall
added pulser mask to load data, modified to have the data loading ext…
91e7b60 
…ernal to main function
@ggmarshall
switched fit escale and ecal to iminuit and add errors as outputs
d3753ae
@ggmarshall
removed tag_pulser and cut import as had circular dependencies, renam…
f6fea9e 
…ed get_pulser_ids to get_tcm_pulser_ids, added ability to return mask for load_data
@ggmarshall
added default arguments, changed timestamp to run_timestamp to differ…
54af535 
…entiate from normal timestamp
@ggmarshall
cleaned up imports, removing * imports and removing unnecessary argum…
9783990 
…ents
@ggmarshall
bugfix for tcm pulser where channel was incorrectly hardcoded
894e60b
@ggmarshall ggmarshall marked this pull request as ready for review November 2, 2023 14:39
@ggmarshall
Copy link
Collaborator Author

I think this is ready to be merged now, there are more changes I want to make but I'll save them for other prs

@ggmarshall
Copy link
Collaborator Author

I've also now changed the loading routines so we can use the tcm for pulser removal

@gipert
Copy link
Member

gipert commented Nov 2, 2023

I have just realized some pre-commit checks don't get ran because the pargen directory is excluded in .pre-commit-config.yaml. It would be good to remove those exceptions. Merging this now.

@gipert gipert merged commit 29cce25 into legend-exp:main Nov 2, 2023
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
pargen Generation of analysis parameters (calibrations etc.)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ggmarshall @gipert