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

Bruker XRF #2694

Merged
merged 5 commits into from Apr 7, 2021
Merged

Bruker XRF #2694

merged 5 commits into from Apr 7, 2021

Conversation

ericpre
Copy link
Member

@ericpre ericpre commented Apr 1, 2021

Add support for XRF bruker file as described by @ffsedd and speed up setting conda environment by removing unnecessary dependencies.

Progress of the PR

@ericpre ericpre changed the base branch from RELEASE_next_minor to RELEASE_next_patch April 1, 2021 19:53
@ericpre ericpre added this to the v1.6.2 milestone Apr 1, 2021
@ericpre ericpre linked an issue Apr 1, 2021 that may be closed by this pull request
@codecov
Copy link

codecov bot commented Apr 1, 2021

Codecov Report

Merging #2694 (fcab16b) into RELEASE_next_patch (64698e6) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@                 Coverage Diff                 @@
##           RELEASE_next_patch    #2694   +/-   ##
===================================================
  Coverage               76.93%   76.94%           
===================================================
  Files                     201      201           
  Lines                   29706    29711    +5     
  Branches                 6513     6515    +2     
===================================================
+ Hits                    22854    22860    +6     
  Misses                   5105     5105           
+ Partials                 1747     1746    -1     
Impacted Files Coverage Δ
hyperspy/io_plugins/bruker.py 88.81% <100.00%> (+0.24%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 64698e6...fcab16b. Read the comment docs.

Copy link
Contributor

@sem-geologist sem-geologist left a comment

Choose a reason for hiding this comment

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

I don't know what goes with azure and matplotlib, but bruker side looks good to me;
Albeit, I wish there some note would go somewhere in the hyperspy metadata that this is not electron based EDS but X-ray excitation based EDS. (As Far I can remember there was some PR/issue to make new signal for XRF)

@ericpre
Copy link
Member Author

ericpre commented Apr 7, 2021

Thanks @sem-geologist for the review, indeed the metadata needs some changes!

…ion in conda_environment.yml: issues with anaconda defaults packages.
@ericpre ericpre merged commit 97a2075 into hyperspy:RELEASE_next_patch Apr 7, 2021
@ericpre ericpre deleted the fix_bruker_XRF branch April 8, 2021 18:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bruker M6 Jetstream SPX file type not supported
2 participants