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

deerload: Fix bug when loading BES3T files with entries in manipulation history layer #164

Merged
merged 8 commits into from
Apr 27, 2021

Conversation

luisfabib
Copy link
Collaborator

This patches a bug in the deerload function that happens in certain BES3T Bruker spectrometer files, where there are entries under the MANIPULATION HISTORY LAYER section at the end of the descriptor file.

The function now breaks the keyword parsing of the descriptor file when reaching this section to avoid the error.

@luisfabib luisfabib added the bugfix Patches something that isn't working label Apr 23, 2021
@luisfabib luisfabib added this to the 0.14.0 milestone Apr 23, 2021
@luisfabib luisfabib requested a review from stestoll April 23, 2021 05:55
@luisfabib
Copy link
Collaborator Author

This will be patched into v0.13.1 as well.

Copy link
Collaborator

@stestoll stestoll left a comment

Choose a reason for hiding this comment

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

Add deerload tests

@luisfabib luisfabib requested a review from stestoll April 25, 2021 16:32
Copy link
Collaborator

@stestoll stestoll left a comment

Choose a reason for hiding this comment

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

Rename data files to indicate deerload-relevant features of the files.

@stestoll stestoll merged commit 200320e into main Apr 27, 2021
@stestoll stestoll deleted the fix/deerload_manip branch April 27, 2021 20:57
luisfabib added a commit that referenced this pull request May 18, 2021
* deploy_ghpages.yml: add missing dependency (#161)

* Bump VERSION to v0.14.0-dev (#162)

* bump VERSION to 0.14.0-dev
* add Python 3.9 to conda build

* Removed Ctot from second order term in chemicalequalibrium polynomial (#163)

* Fix prescaling of data and vanishing confidence intervals in `snlls` (#166)

* parse_multidatasets: fix bug in parsing so that prescaling works also for single signals

* tests: fix snlls test

* fitregmodel: adapt to changes in parse_multidatasets

* tests: refactor test as relative assertion

* Update README.md (#167)

* deerload: Fix bug when loading BES3T files with entries in manipulation history layer (#164)

* deerload: fix bug when loading BES3T files with entries in manipulation history layer

* add unit tests for deerload

* deerload: fix error in parsing of XGF files

* rename test data files consistently

* fix tests

Co-authored-by: Stefan Stoll <stestoll@users.noreply.github.com>

* Fix behavior of weights in global fitting  (#171)

* fitregmodel: fix behaviour of weights in global fitting

* fitparamodel: add test for global weights behaviour

* lsqcomponents: fix usage of global weights

* fitmultimodel: fix behaviour of weights in global fitting

* fitmultimodel: return list of fitted signals instead of single array, fix scaling of output fit signals and UQ, fix plotting

* fitmultimodel: fix scaling issue in global fitting

* snlls: fix behaviour of weights in global fitting

* fitmodel: add tests to check behaviour of weights in global fitting

* fitmultimodel: fix error when plotting single dataset fits

* fitmultimodel: fix bug in plottin of single dataset fits

* fitmultimodel: fix error in previous commit

* fitmodel: Fix uncertainty quantification when fitting dipolar evolution functions (#172)

* fitmodel: fix errors in uncertainty quantification for dipolar evolution functions

* modify tests that missed the error

* fitmodel: fixed error found by tests

* fitparamodel: fix scale of output fit.model and its uncertainty (#173)

* snlls: allow `extrapenalty` to take linear parameters as input (#175)

* snlls: allow `extrapenalty` to take linear parameters as input

* snlls: fix order of concatenation of Jacobians

* Optimize default weights in global fitting according to the datasets noise levels (#174)

* optimize default weights in global fitting according to the datasets noise levels

* add tests

* fix bug in calculation of default weights for arbitrary scales

* refactor DER_SNR method, add reference

Co-authored-by: Stefan Stoll <stestoll@users.noreply.github.com>

* VERSION: bump to v0.13.1

* CHANGELOG: update for v0.13.1

* CHANGELOG: minor edits

* fix GHA to run on a PR to merge into any branch

* fix GHA to run docs CI on PR to merge into any branch

Co-authored-by: Maxx Tessmer <mhtessmer@gmail.com>
Co-authored-by: Stefan Stoll <stestoll@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix Patches something that isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants