Code

Py separation#147

Code

Open

gudlot wants to merge 133 commits intoscipp:mainscipp/ess:mainfrom gudlot:py_separationgudlot/ess:py_separationCopy head branch name to clipboard

+6,048

Commits

Commits on Jun 10, 2022

• First submission

  RGBYCP

  committed
  f708c58

  Copy full SHA for f708c58

Commits on Jun 14, 2022

• plot_fluo_spectrum_selection implemented

  gudlot

  committed
  0003b18

  Copy full SHA for 0003b18

• plot_fluo_spectrum_selection implemented in nurf.py

  gudlot

  committed
  2cba870

  Copy full SHA for 2cba870

• Removed source code for the plot_fluo_spectrum_selection and added comments

  gudlot

  committed
  3309d04

  Copy full SHA for 3309d04

• Renaming function plot_multiple_peak_int to plot_fluo_multiple_peak_int

  gudlot

  committed
  1bbfe4f

  Copy full SHA for 1bbfe4f

• Renaming function plot_multiple_peak_int to plot_fluo_multiple_peak_int

  gudlot

  committed
  9babb86

  Copy full SHA for 9babb86

• Refinement of plot_fluo_multiple_peak_int

  gudlot

  committed
  c3b0fd6

  Copy full SHA for c3b0fd6

• Added import of itertools at the top

  gudlot

  committed
  c3c457d

  Copy full SHA for c3c457d

• Removing errors in certain functions

  gudlot

  committed
  6d8fe6b

  Copy full SHA for 6d8fe6b

• removed function dev into nurf.py

  gudlot

  committed
  9f8f009

  Copy full SHA for 9f8f009

• Work in progress, working on docs strings

  gudlot

  committed
  4835688

  Copy full SHA for 4835688

Commits on Jun 15, 2022

• Snapshot of plot_fluo_spectrum_selection before rewriting this function

  gudlot

  committed
  f1bbc92

  Copy full SHA for f1bbc92

• Clean up of plot_fluo_spectrum_selection

  gudlot

  committed
  83c8d47

  Copy full SHA for 83c8d47

• Added cleaned function plot_fluo_spectrum_selection

  gudlot

  committed
  313233d

  Copy full SHA for 313233d

Commits on Jun 17, 2022

• On the way to zero flake8 errors

  gudlot

  committed
  4b511df

  Copy full SHA for 4b511df

Commits on Jun 21, 2022

• Start first round ob feedback from ESS

  gudlot

  committed
  cb436c9

  Copy full SHA for cb436c9

• Correction of order of library import order

  gudlot

  committed
  f4a528c

  Copy full SHA for f4a528c

• Added a TODO for function single_contributions

  gudlot

  committed
  ba872cd

  Copy full SHA for ba872cd

• Test Hallo_Welt

  gudlot

  committed
  2f790ef

  Copy full SHA for 2f790ef

• Remove hello world

  gudlot

  committed
  8f166c3

  Copy full SHA for 8f166c3

• Cleaned all outputs of all cells in jupyter notebook

  gudlot

  committed
  4ac3eaa

  Copy full SHA for 4ac3eaa

• Removed copy error git

  gudlot

  committed
  d12c2ae

  Copy full SHA for d12c2ae

• Removed output from jupyter notebook

  gudlot

  committed
  3014210

  Copy full SHA for 3014210

Commits on Jun 22, 2022

• Removed prints about scipp versions

  gudlot

  committed
  4a3f45f

  Copy full SHA for 4a3f45f

• Start to transfer ILL related functions into this file

  gudlot

  committed
  f01f8cf

  Copy full SHA for f01f8cf

• Added the functions to extract data from ILL format and writes it into the proposed new NeXus format for LoKI

  gudlot

  committed
  5a92afd

  Copy full SHA for 5a92afd

• Exchanged is_data for is_sample in the NeXus Loki file

  gudlot

  committed
  01d96e5

  Copy full SHA for 01d96e5

• Exchange is_data for is_sample

  gudlot

  committed
  1c8d270

  Copy full SHA for 1c8d270

• Renamed separate_contributions to split_contributions

  gudlot

  committed
  b84b832

  Copy full SHA for b84b832

• single_contributions renamed to split_sample_dark_reference

  gudlot

  committed
  2232713

  Copy full SHA for 2232713

• Removed comment in normalize_uv

  gudlot

  committed
  e0748b6

  Copy full SHA for e0748b6

• Renamed variable data into sample in split_sample_dark_reference

  gudlot

  committed
  5061a14

  Copy full SHA for 5061a14

• Dict in normalize_uv has new key sample instead of data

  gudlot

  committed
  bb9b1c6

  Copy full SHA for bb9b1c6

• Renamed key data to sample in normalize_fluo

  gudlot

  committed
  fec2ef5

  Copy full SHA for fec2ef5

• Removed method on normalized from docstring in process_uv

  gudlot

  committed
  ca0d982

  Copy full SHA for ca0d982

• Removed in-line comment in process_uv

  gudlot

  committed
  4d5e9a4

  Copy full SHA for 4d5e9a4

• Renamed data to sample in normalize_fluo, docstring and function body

  gudlot

  committed
  f07183d

  Copy full SHA for f07183d

• normalize_uv: exchange sc.log for sc.log10, now correct

  gudlot

  committed
  e6764ef

  Copy full SHA for e6764ef

• Replaced code with a function process_uv in export_uv

  gudlot

  committed
  ab41af7

  Copy full SHA for ab41af7

• Reversed changes in export_uv

  gudlot

  committed
  d6ee6c5

  Copy full SHA for d6ee6c5

• Manipulated data_to_save variable

  gudlot

  committed
  9672a85

  Copy full SHA for 9672a85

• Removed comment in fluo_maxint_max_wavelen about import of defaultdic

  gudlot

  committed
  6bd13ac

  Copy full SHA for 6bd13ac

• fluo_maxint_max_wavelen: replacing hardcoded unit values with the key argument

  gudlot

  committed
  966d2a6

  Copy full SHA for 966d2a6

• fluo_maxint_max_wavelen: removed in-line comments

  gudlot

  committed
  258320f

  Copy full SHA for 258320f

• Remove inline comment in apply_medfilter

  gudlot

  committed
  2e95d85

  Copy full SHA for 2e95d85

• fluo_filt.values is equivalent to fluo_filt.data.values

  gudlot

  committed
  fa9db9d

  Copy full SHA for fa9db9d

• normalized_avg.values for normalized_avg.data.values

  gudlot

  committed
  27443ea

  Copy full SHA for 27443ea

Commits on Jun 23, 2022

• Added functionality to convert from ILL.nxs format to Loki.nxs format

  gudlot

  committed
  d95e132

  Copy full SHA for d95e132

• A ipynb to convert ILL.nxs to Loki.nxs

  gudlot

  committed
  b7b5ba9

  Copy full SHA for b7b5ba9

• Reversed is_sample back to is_data

  gudlot

  committed
  6f0541c

  Copy full SHA for 6f0541c

• Fixed error in uv_multi_turbidity_fit

  gudlot

  committed
  a32f7d3

  Copy full SHA for a32f7d3

• Added a cell to show what happens if a Loki.nxs is loaded

  gudlot

  committed
  e87f415

  Copy full SHA for e87f415

Commits on Jun 29, 2022

• Correction of docstring in load_uv, returned keys: sample

  gudlot

  committed
  a4ac93f

  Copy full SHA for a4ac93f

• Modified export_uv. Exports darf, ref, raw sample uv, corrected sample uv

  gudlot

  committed
  6a05264

  Copy full SHA for 6a05264

• Corrected docstring in export_uv

  gudlot

  committed
  2a6af0c

  Copy full SHA for 2a6af0c

• Extended docstring in export_uv

  gudlot

  committed
  a2fd750

  Copy full SHA for a2fd750

• Adapted export_fluo to client's wish

  gudlot

  committed
  9488703

  Copy full SHA for 9488703

• Cleaned jupyter notebook

  gudlot

  committed
  7e27eea

  Copy full SHA for 7e27eea

• Removed print in export_fluo

  gudlot

  committed
  b6ca0b6

  Copy full SHA for b6ca0b6

Commits on Jun 30, 2022

• Start of separation into various files

  gudlot

  committed
  8358b17

  Copy full SHA for 8358b17

• New file for plot functions

  gudlot

  committed
  9047c7b

  Copy full SHA for 9047c7b

• New file for utils functions

  gudlot

  committed
  d1c4d12

  Copy full SHA for d1c4d12

• New file for uv functions

  gudlot

  committed
  e6b5215

  Copy full SHA for e6b5215

• New file for fluo functions

  gudlot

  committed
  8e68969

  Copy full SHA for 8e68969

• Add Python libraries here

  gudlot

  committed
  1bb926f

  Copy full SHA for 1bb926f

• Transfer of split_sample_dark_reference

  gudlot

  committed
  d04cb27

  Copy full SHA for d04cb27

• New unified function to load a Nurf LoKI file and extract meth data

  gudlot

  committed
  9798bbf

  Copy full SHA for 9798bbf

• Type in string corrected

  gudlot

  committed
  387ec7f

  Copy full SHA for 387ec7f

• Added as import utils.py and added a testing ground

  gudlot

  committed
  50f5f04

  Copy full SHA for 50f5f04

• Added deprecated.py

  gudlot

  committed
  89d7ac8

  Copy full SHA for 89d7ac8

• Contains now load_uv and load_fluo

  gudlot

  committed
  2cbb284

  Copy full SHA for 2cbb284

• Transfer of all fluo functions, not yet tested

  gudlot

  committed
  a2fa098

  Copy full SHA for a2fa098

• Transfer of all uv functions, not yet tested

  gudlot

  committed
  8a1ead7

  Copy full SHA for 8a1ead7

• Transfer of plot functions, not yet tested

  gudlot

  committed
  6187987

  Copy full SHA for 6187987

• Transfer of utility functions, not yet tested

  gudlot

  committed
  6cc1452

  Copy full SHA for 6cc1452

• Emptied the nurf.py

  gudlot

  committed
  b063912

  Copy full SHA for b063912

• Emptied the nurf.py

  gudlot

  committed
  4de9913

  Copy full SHA for 4de9913

• Moved files to a different folder

  gudlot

  committed
  f523a25

  Copy full SHA for f523a25

• Moved plot.py here

  gudlot

  committed
  7d2fc08

  Copy full SHA for 7d2fc08

• Moved .py files here

  gudlot

  committed
  84604cc

  Copy full SHA for 84604cc

• Moved *.ipynb here

  gudlot

  committed
  afcdfc6

  Copy full SHA for afcdfc6

Commits on Aug 25, 2022

• Added a wrapper for scipp.ndimage.median_filter

  gudlot

  committed
  e44530c

  Copy full SHA for e44530c

Commits on Aug 26, 2022

• Before refactoring uv_multi_turbidity_fit

  gudlot

  committed
  92fc2df

  Copy full SHA for 92fc2df

• Update uv_multi_turbidity_fit, takes now a dict of sc.DataArrays

  gudlot

  committed
  c52122a

  Copy full SHA for c52122a

• Removed loading part from uv_mutli_turbidity fit

  gudlot

  committed
  9f7adf0

  Copy full SHA for 9f7adf0

• Snapshot 26.8.2022

  gudlot

  committed
  b2111dc

  Copy full SHA for b2111dc

• This is the uv_demonstration notebook

  gudlot

  committed
  624cbb5

  Copy full SHA for 624cbb5

• This is the fluo_demonstration notebook, but needs more work

  gudlot

  committed
  5a50dd2

  Copy full SHA for 5a50dd2

• plot.py status 26.8.2022

  gudlot

  committed
  a4b1696

  Copy full SHA for a4b1696

• status 26.8.2022

  gudlot

  committed
  c621587

  Copy full SHA for c621587

• Removed some .py files from docs/instruments/loki/nurf

  gudlot

  committed
  a676fd1

  Copy full SHA for a676fd1

• Remove old notebooks

  gudlot

  committed
  ac8c678

  Copy full SHA for ac8c678

• Added source filename to load_nurfloki_file function

  gudlot

  committed
  6f8077a

  Copy full SHA for 6f8077a

• Added source filename to load_nurfloki_file function, broadcasted to number of spectra in file

  gudlot

  committed
  5ab641c

  Copy full SHA for 5ab641c

Commits on Aug 29, 2022

• Modification of split_sample_dark_reference

  gudlot

  committed
  460dc3f

  Copy full SHA for 460dc3f

• Clean up in split_sample_dark_reference

  gudlot

  committed
  7e709f2

  Copy full SHA for 7e709f2

• Capture test trials for source attribute when loading Loki files

  gudlot

  committed
  951c9c8

  Copy full SHA for 951c9c8

• Clean up again fluo_demonstration.ipynb

  gudlot

  committed
  eaebb7f

  Copy full SHA for eaebb7f

• Removed display single arrays from normalize_fluo

  gudlot

  committed
  1f95f04

  Copy full SHA for 1f95f04

• Clean up in load cell, added plotting function

  gudlot

  committed
  2f77f00

  Copy full SHA for 2f77f00

• Added a comment about indirect assumption

  gudlot

  committed
  46dc601

  Copy full SHA for 46dc601

• clean output

  gudlot

  committed
  4b0103b

  Copy full SHA for 4b0103b

• clean output

  gudlot

  committed
  b091a6f

  Copy full SHA for b091a6f

• Snapshot before cleaning up

  gudlot

  committed
  63d2d8e

  Copy full SHA for 63d2d8e

• Modified markers functions to accommodate more spectra

  gudlot

  committed
  69fee13

  Copy full SHA for 69fee13

• Cleaned fluo ipynb

  gudlot

  committed
  fd322bf

  Copy full SHA for fd322bf

• Cleaned up and emptied

  gudlot

  committed
  9a65c92

  Copy full SHA for 9a65c92

Commits on Sep 23, 2022

• Some clean up with the graphs

  gudlot

  committed
  b448021

  Copy full SHA for b448021

• Modified the fluo plots

  gudlot

  committed
  5766cb4

  Copy full SHA for 5766cb4

• Work in fluo_peak_int

  gudlot

  committed
  e69351f

  Copy full SHA for e69351f

• Removed separation of units from wavelength and updated check for wavelength range

  gudlot

  committed
  01c6e06

  Copy full SHA for 01c6e06

• Updated func call fluo_peak_int in plot.py

  gudlot

  committed
  f7af23a

  Copy full SHA for f7af23a

• Snapshot Frid afternoon 23.9

  gudlot

  committed
  c324b4a

  Copy full SHA for c324b4a

Commits on Sep 26, 2022

• Added source attr to each data entry in dataset of fluo_filt_max

  gudlot

  committed
  46c6698

  Copy full SHA for 46c6698

• More xticks_lables for the fluo plots

  gudlot

  committed
  07eb336

  Copy full SHA for 07eb336

• updated fluo demo notebook

  gudlot

  committed
  8fea291

  Copy full SHA for 8fea291

• Commented out poster option

  gudlot

  committed
  4ae7292

  Copy full SHA for 4ae7292

• removed output

  gudlot

  committed
  7241411

  Copy full SHA for 7241411

• Snapshort 26.9.2022

  gudlot

  committed
  39f2e85

  Copy full SHA for 39f2e85

• No more scipp median filter in first cell

  gudlot

  committed
  79679fb

  Copy full SHA for 79679fb

• No more scipp median filter in first cell

  gudlot

  committed
  d6ff3eb

  Copy full SHA for d6ff3eb

Commits on Oct 3, 2022

• An auxilliary notebook to plot SANS data collected at ILL

  gudlot

  committed
  6eda838

  Copy full SHA for 6eda838

Commits on Oct 4, 2022

• SANS notebook in development modus

  gudlot

  committed
  7151582

  Copy full SHA for 7151582

• Fluo and UV notebooks work, demonstration of single commands

  gudlot

  committed
  f3bc957

  Copy full SHA for f3bc957

Commits on Oct 28, 2022

• Snapshot 28.10.22 before including changes of scipp 0.17.0

  gudlot

  committed
  4ede64a

  Copy full SHA for 4ede64a

Commits on Nov 30, 2022

• Snapshot SANS demo not finished

  gudlot

  committed
  6ba26ff

  Copy full SHA for 6ba26ff

• Cleared outputs

  gudlot

  committed
  4aeb7c7

  Copy full SHA for 4aeb7c7

Commits on Nov 6, 2023

• Expanded .gitignore for MacOS

  gudlot

  committed
  7142bad

  Copy full SHA for 7142bad

• scipp.ndimage was moved to scipp.scipy.ndimage

  gudlot

  committed
  24600f1

  Copy full SHA for 24600f1

• For module

  gudlot

  committed
  0f5fcf6

  Copy full SHA for 0f5fcf6

• Change from scipp.ndimage.median_filter to scipp.scipy.ndimage.median_filter

  gudlot

  committed
  e7b7730

  Copy full SHA for e7b7730

• Remove unnecessary import from utils.py

  gudlot

  committed
  13fc223

  Copy full SHA for 13fc223

• Fix of logical error in nurf_median_filter func

  gudlot

  committed
  3676422

  Copy full SHA for 3676422