NSLS-II-SIX / sixtools

Software for performing resonant inelastic xray scattering analysis at NSLS-II

https://pypi.org/project/sixtools

Other

1 stars 2 forks source link

GUI #15

Closed mpmdean closed 6 years ago

mpmdean commented 6 years ago

This adds a scan browser built from ipywidgets separate from the analysis code .

codecov-io commented 6 years ago

Codecov Report

Merging #15 into master will not change coverage. The diff coverage is n/a.

@@           Coverage Diff           @@
##           master      #15   +/-   ##
=======================================
  Coverage   43.26%   43.26%           
=======================================
  Files           3        3           
  Lines         282      282           
=======================================
  Hits          122      122           
  Misses        160      160

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 352208c...2046131. Read the comment docs.

mpmdean commented 6 years ago

I corrected the spelling mistake as discussed.

I would propose to keep the functions discussed in sixtools in order to maintain a simple x,y,I API into scikit-beam/rixs.

I would need more advice if we need to exclude the changes form the other pull request.

awalter-bnl commented 6 years ago

Hi Mark, I will think a little more about where to place the different functions, and provide feedback later. I am coming around to your way of thinking but just haven;t completely convinced myself yet.

As the other PR has been merged the easiest way is to rebase this one. This essentially moves the 'branch' point to after the recent merge. A discussion about this I found useful is here (https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase). If not I am happy to sit down with you and go over how to do this (although I am not an expert mysefl !-) ). Finally if you think it is too much for you to handle I can attempt the rebase myself, although I definitely haven't tried that on someone elses branch myself.

mpmdean commented 6 years ago

I thought I had rebased it and committed it back into this pull request, but the diffs view seems the same. Could we sit down to look at this at say 3?

awalter-bnl commented 6 years ago

sorry for the late response, I just saw this. discussing at 3 is fine with me.