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

force r to be int #79

Merged
merged 2 commits into from
Jul 1, 2021
Merged

force r to be int #79

merged 2 commits into from
Jul 1, 2021

Conversation

jlaehne
Copy link
Contributor

@jlaehne jlaehne commented Jun 7, 2021

Description of the change

Due to hyperspy/hyperspy#2765, I realized that the overlap parameter r in join_spectra could be non integer, so forcing a conversion if it should be of a different type.

Progress of the PR

  • Change implemented (can be split into several points),
  • add tests,
  • ready for review.

@jlaehne
Copy link
Contributor Author

jlaehne commented Jun 8, 2021

Once hyperspy/hyperspy#2765 is merged, the failing test should be OK as well - we should maybe wait for that before merging this one.

@ericpre ericpre merged commit b81a6a5 into LumiSpy:master Jul 1, 2021
@jlaehne jlaehne deleted the join_spectra_fix branch July 1, 2021 21:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants