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

Add support for XRD files that have indeterminate headers (e.g., diffrac.eva export) #905

Merged
merged 3 commits into from
Oct 5, 2024

Conversation

ml-evs
Copy link
Member

@ml-evs ml-evs commented Oct 2, 2024

Closes #903 by trying to load xy/xye files iteratively, ignoring any lines that do not fit the expect number of floats (and crashing out if the header is more than 10,000 lines).

cc @jmas5

Probably one for @jdbocarsly to check with some of his group's files to make sure nothing breaks (I added test cases, but you never know...)

@ml-evs ml-evs requested a review from jdbocarsly October 2, 2024 23:09
@ml-evs ml-evs added enhancement New feature or request datablock An issue pertaining to a specific datablock labels Oct 2, 2024
Copy link

codecov bot commented Oct 2, 2024

Codecov Report

Attention: Patch coverage is 86.66667% with 2 lines in your changes missing coverage. Please review.

Project coverage is 68.34%. Comparing base (640958c) to head (7387b8e).
Report is 120 commits behind head on main.

Files with missing lines Patch % Lines
pydatalab/pydatalab/apps/xrd/blocks.py 86.66% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #905      +/-   ##
==========================================
+ Coverage   68.22%   68.34%   +0.12%     
==========================================
  Files          62       62              
  Lines        3909     3921      +12     
==========================================
+ Hits         2667     2680      +13     
+ Misses       1242     1241       -1     
Files with missing lines Coverage Δ
pydatalab/pydatalab/apps/xrd/blocks.py 64.13% <86.66%> (+6.63%) ⬆️

@ml-evs ml-evs force-pushed the ml-evs/bruker-evadiffract branch from d72afe6 to 95cc09d Compare October 2, 2024 23:20
Copy link

cypress bot commented Oct 2, 2024

datalab    Run #2496

Run Properties:  status check passed Passed #2496  •  git commit 266920692b ℹ️: Merge 7387b8eb89120f347025df21349ff6a09ef66b0a into 640958cad5167d1690c0af3622d2...
Project datalab
Branch Review ml-evs/bruker-evadiffract
Run status status check passed Passed #2496
Run duration 11m 03s
Commit git commit 266920692b ℹ️: Merge 7387b8eb89120f347025df21349ff6a09ef66b0a into 640958cad5167d1690c0af3622d2...
Committer Matthew Evans
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 0
Tests that did not run due to a developer annotating a test with .skip  Pending 0
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 396
View all changes introduced in this branch ↗︎

@ml-evs ml-evs requested a review from BenjaminCharmes October 3, 2024 12:24
@ml-evs ml-evs requested a review from jdbocarsly October 3, 2024 21:20
@ml-evs ml-evs force-pushed the ml-evs/bruker-evadiffract branch from 3f4965e to 7387b8e Compare October 4, 2024 23:36
@ml-evs ml-evs changed the title Add support for XRD files that have indeterminate headers Add support for XRD files that have indeterminate headers (e.g., diffrac.eva export) Oct 5, 2024
@ml-evs ml-evs merged commit 43b9967 into main Oct 5, 2024
20 checks passed
@ml-evs ml-evs deleted the ml-evs/bruker-evadiffract branch October 5, 2024 12:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
datablock An issue pertaining to a specific datablock enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support for Bruker's diffrac.eva .xy files
2 participants