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

Add docs on scan #31

Closed mpmdean closed 5 years ago

mpmdean commented 5 years ago

Describe the 4D nature of scan in the documentation.

codecov-io commented 5 years ago

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master      #31   +/-   ##
=======================================
  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 64b838e...0f4263e. Read the comment docs.

awalter-bnl commented 5 years ago

@mpmdean this has a conflicting file (usage.rst) that needs to be resolved.

mpmdean commented 5 years ago

@awalter-bnl I must have had something wrong with the git workflow to generate this merge conflict, but this is now resolved.

awalter-bnl commented 5 years ago

I suspect a previous merge I did this morning may have created the conflict. No problem I am merging now.