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

Py separation #147

Open
wants to merge 133 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
133 commits
Select commit Hold shift + click to select a range
f708c58
First submission
RGBYCP Jun 10, 2022
0003b18
plot_fluo_spectrum_selection implemented
gudlot Jun 14, 2022
2cba870
plot_fluo_spectrum_selection implemented in nurf.py
gudlot Jun 14, 2022
3309d04
Removed source code for the plot_fluo_spectrum_selection and added co…
gudlot Jun 14, 2022
1bbfe4f
Renaming function plot_multiple_peak_int to plot_fluo_multiple_peak_int
gudlot Jun 14, 2022
9babb86
Renaming function plot_multiple_peak_int to plot_fluo_multiple_peak_int
gudlot Jun 14, 2022
c3b0fd6
Refinement of plot_fluo_multiple_peak_int
gudlot Jun 14, 2022
c3c457d
Added import of itertools at the top
gudlot Jun 14, 2022
6d8fe6b
Removing errors in certain functions
gudlot Jun 14, 2022
9f8f009
removed function dev into nurf.py
gudlot Jun 14, 2022
4835688
Work in progress, working on docs strings
gudlot Jun 14, 2022
f1bbc92
Snapshot of plot_fluo_spectrum_selection before rewriting this function
gudlot Jun 15, 2022
83c8d47
Clean up of plot_fluo_spectrum_selection
gudlot Jun 15, 2022
313233d
Added cleaned function plot_fluo_spectrum_selection
gudlot Jun 15, 2022
4b511df
On the way to zero flake8 errors
gudlot Jun 17, 2022
cb436c9
Start first round ob feedback from ESS
gudlot Jun 21, 2022
f4a528c
Correction of order of library import order
gudlot Jun 21, 2022
ba872cd
Added a TODO for function single_contributions
gudlot Jun 21, 2022
2f790ef
Test Hallo_Welt
gudlot Jun 21, 2022
8f166c3
Remove hello world
gudlot Jun 21, 2022
4ac3eaa
Cleaned all outputs of all cells in jupyter notebook
gudlot Jun 21, 2022
d12c2ae
Removed copy error git
gudlot Jun 21, 2022
3014210
Removed output from jupyter notebook
gudlot Jun 21, 2022
4a3f45f
Removed prints about scipp versions
gudlot Jun 22, 2022
f01f8cf
Start to transfer ILL related functions into this file
gudlot Jun 22, 2022
5a92afd
Added the functions to extract data from ILL format and writes it int…
gudlot Jun 22, 2022
01d96e5
Exchanged is_data for is_sample in the NeXus Loki file
gudlot Jun 22, 2022
1c8d270
Exchange is_data for is_sample
gudlot Jun 22, 2022
b84b832
Renamed separate_contributions to split_contributions
gudlot Jun 22, 2022
2232713
single_contributions renamed to split_sample_dark_reference
gudlot Jun 22, 2022
e0748b6
Removed comment in normalize_uv
gudlot Jun 22, 2022
5061a14
Renamed variable data into sample in split_sample_dark_reference
gudlot Jun 22, 2022
bb9b1c6
Dict in normalize_uv has new key sample instead of data
gudlot Jun 22, 2022
fec2ef5
Renamed key data to sample in normalize_fluo
gudlot Jun 22, 2022
ca0d982
Removed method on normalized from docstring in process_uv
gudlot Jun 22, 2022
4d5e9a4
Removed in-line comment in process_uv
gudlot Jun 22, 2022
f07183d
Renamed data to sample in normalize_fluo, docstring and function body
gudlot Jun 22, 2022
e6764ef
normalize_uv: exchange sc.log for sc.log10, now correct
gudlot Jun 22, 2022
ab41af7
Replaced code with a function process_uv in export_uv
gudlot Jun 22, 2022
d6ee6c5
Reversed changes in export_uv
gudlot Jun 22, 2022
9672a85
Manipulated data_to_save variable
gudlot Jun 22, 2022
6bd13ac
Removed comment in fluo_maxint_max_wavelen about import of defaultdic
gudlot Jun 22, 2022
966d2a6
fluo_maxint_max_wavelen: replacing hardcoded unit values with the key…
gudlot Jun 22, 2022
258320f
fluo_maxint_max_wavelen: removed in-line comments
gudlot Jun 22, 2022
2e95d85
Remove inline comment in apply_medfilter
gudlot Jun 22, 2022
fa9db9d
fluo_filt.values is equivalent to fluo_filt.data.values
gudlot Jun 22, 2022
27443ea
normalized_avg.values for normalized_avg.data.values
gudlot Jun 22, 2022
d95e132
Added functionality to convert from ILL.nxs format to Loki.nxs format
gudlot Jun 23, 2022
b7b5ba9
A ipynb to convert ILL.nxs to Loki.nxs
gudlot Jun 23, 2022
6f0541c
Reversed is_sample back to is_data
gudlot Jun 23, 2022
a32f7d3
Fixed error in uv_multi_turbidity_fit
gudlot Jun 23, 2022
e87f415
Added a cell to show what happens if a Loki.nxs is loaded
gudlot Jun 23, 2022
a4ac93f
Correction of docstring in load_uv, returned keys: sample
gudlot Jun 29, 2022
6a05264
Modified export_uv. Exports darf, ref, raw sample uv, corrected sampl…
gudlot Jun 29, 2022
2a6af0c
Corrected docstring in export_uv
gudlot Jun 29, 2022
a2fd750
Extended docstring in export_uv
gudlot Jun 29, 2022
9488703
Adapted export_fluo to client's wish
gudlot Jun 29, 2022
7e27eea
Cleaned jupyter notebook
gudlot Jun 29, 2022
b6ca0b6
Removed print in export_fluo
gudlot Jun 29, 2022
8358b17
Start of separation into various files
gudlot Jun 30, 2022
9047c7b
New file for plot functions
gudlot Jun 30, 2022
d1c4d12
New file for utils functions
gudlot Jun 30, 2022
e6b5215
New file for uv functions
gudlot Jun 30, 2022
8e68969
New file for fluo functions
gudlot Jun 30, 2022
1bb926f
Add Python libraries here
gudlot Jun 30, 2022
d04cb27
Transfer of split_sample_dark_reference
gudlot Jun 30, 2022
9798bbf
New unified function to load a Nurf LoKI file and extract meth data
gudlot Jun 30, 2022
387ec7f
Type in string corrected
gudlot Jun 30, 2022
50f5f04
Added as import utils.py and added a testing ground
gudlot Jun 30, 2022
89d7ac8
Added deprecated.py
gudlot Jun 30, 2022
2cbb284
Contains now load_uv and load_fluo
gudlot Jun 30, 2022
a2fa098
Transfer of all fluo functions, not yet tested
gudlot Jun 30, 2022
8a1ead7
Transfer of all uv functions, not yet tested
gudlot Jun 30, 2022
6187987
Transfer of plot functions, not yet tested
gudlot Jun 30, 2022
6cc1452
Transfer of utility functions, not yet tested
gudlot Jun 30, 2022
b063912
Emptied the nurf.py
gudlot Jun 30, 2022
4de9913
Emptied the nurf.py
gudlot Jun 30, 2022
f523a25
Moved files to a different folder
gudlot Jun 30, 2022
7d2fc08
Moved plot.py here
gudlot Jun 30, 2022
84604cc
Moved .py files here
gudlot Jun 30, 2022
afcdfc6
Moved *.ipynb here
gudlot Jun 30, 2022
e44530c
Added a wrapper for scipp.ndimage.median_filter
gudlot Aug 25, 2022
92fc2df
Before refactoring uv_multi_turbidity_fit
gudlot Aug 26, 2022
c52122a
Update uv_multi_turbidity_fit, takes now a dict of sc.DataArrays
gudlot Aug 26, 2022
9f7adf0
Removed loading part from uv_mutli_turbidity fit
gudlot Aug 26, 2022
b2111dc
Snapshot 26.8.2022
gudlot Aug 26, 2022
624cbb5
This is the uv_demonstration notebook
gudlot Aug 26, 2022
5a50dd2
This is the fluo_demonstration notebook, but needs more work
gudlot Aug 26, 2022
a4b1696
plot.py status 26.8.2022
gudlot Aug 26, 2022
c621587
status 26.8.2022
gudlot Aug 26, 2022
a676fd1
Removed some .py files from docs/instruments/loki/nurf
gudlot Aug 26, 2022
ac8c678
Remove old notebooks
gudlot Aug 26, 2022
6f8077a
Added source filename to load_nurfloki_file function
gudlot Aug 26, 2022
5ab641c
Added source filename to load_nurfloki_file function, broadcasted to …
gudlot Aug 26, 2022
460dc3f
Modification of split_sample_dark_reference
gudlot Aug 29, 2022
7e709f2
Clean up in split_sample_dark_reference
gudlot Aug 29, 2022
951c9c8
Capture test trials for source attribute when loading Loki files
gudlot Aug 29, 2022
eaebb7f
Clean up again fluo_demonstration.ipynb
gudlot Aug 29, 2022
1f95f04
Removed display single arrays from normalize_fluo
gudlot Aug 29, 2022
2f77f00
Clean up in load cell, added plotting function
gudlot Aug 29, 2022
46dc601
Added a comment about indirect assumption
gudlot Aug 29, 2022
4b0103b
clean output
gudlot Aug 29, 2022
b091a6f
clean output
gudlot Aug 29, 2022
63d2d8e
Snapshot before cleaning up
gudlot Aug 29, 2022
69fee13
Modified markers functions to accommodate more spectra
gudlot Aug 29, 2022
fd322bf
Cleaned fluo ipynb
gudlot Aug 29, 2022
9a65c92
Cleaned up and emptied
gudlot Aug 29, 2022
b448021
Some clean up with the graphs
gudlot Sep 23, 2022
5766cb4
Modified the fluo plots
gudlot Sep 23, 2022
e69351f
Work in fluo_peak_int
gudlot Sep 23, 2022
01c6e06
Removed separation of units from wavelength and updated check for wav…
gudlot Sep 23, 2022
f7af23a
Updated func call fluo_peak_int in plot.py
gudlot Sep 23, 2022
c324b4a
Snapshot Frid afternoon 23.9
gudlot Sep 23, 2022
46c6698
Added source attr to each data entry in dataset of fluo_filt_max
gudlot Sep 26, 2022
07eb336
More xticks_lables for the fluo plots
gudlot Sep 26, 2022
8fea291
updated fluo demo notebook
gudlot Sep 26, 2022
4ae7292
Commented out poster option
gudlot Sep 26, 2022
7241411
removed output
gudlot Sep 26, 2022
39f2e85
Snapshort 26.9.2022
gudlot Sep 26, 2022
79679fb
No more scipp median filter in first cell
gudlot Sep 26, 2022
d6ff3eb
No more scipp median filter in first cell
gudlot Sep 26, 2022
6eda838
An auxilliary notebook to plot SANS data collected at ILL
gudlot Oct 3, 2022
7151582
SANS notebook in development modus
gudlot Oct 4, 2022
f3bc957
Fluo and UV notebooks work, demonstration of single commands
gudlot Oct 4, 2022
4ede64a
Snapshot 28.10.22 before including changes of scipp 0.17.0
gudlot Oct 28, 2022
6ba26ff
Snapshot SANS demo not finished
gudlot Nov 30, 2022
4aeb7c7
Cleared outputs
gudlot Nov 30, 2022
7142bad
Expanded .gitignore for MacOS
gudlot Nov 6, 2023
24600f1
scipp.ndimage was moved to scipp.scipy.ndimage
gudlot Nov 6, 2023
0f5fcf6
For module
gudlot Nov 6, 2023
e7b7730
Change from scipp.ndimage.median_filter to scipp.scipy.ndimage.median…
gudlot Nov 6, 2023
13fc223
Remove unnecessary import from utils.py
gudlot Nov 6, 2023
3676422
Fix of logical error in nurf_median_filter func
gudlot Nov 6, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,44 @@ src/ess/_version.py
.mypy_cache
.virtual_documents
__pycache__


# Created by https://www.toptal.com/developers/gitignore/api/macos
# Edit at https://www.toptal.com/developers/gitignore?templates=macos

### macOS ###
# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### macOS Patch ###
# iCloud generated files
*.icloud

# End of https://www.toptal.com/developers/gitignore/api/macos


Loading