merging main updates

slaclab · Jan 23, 2024 · 890dd93 · 890dd93
2 parents 61e18c3 + c432944
commit 890dd93
Show file tree

Hide file tree

Showing 36 changed files with 383 additions and 751 deletions.
diff --git a/...tools/common/matlab2py/cor_plot/README.MD → docs/source/cor_plot.rst b/...tools/common/matlab2py/cor_plot/README.MD → docs/source/cor_plot.rst
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -12,6 +12,9 @@ Welcome to lcls-tools's documentation!
 
    devices.rst
    image_processing.rst
+   cor_plot.rst
+   emit_scan.rst
+
 
 
 Indices and tables

diff --git a/...ools/common/matlab2py/emit_scan/README.MD → docs/source/mat_emit_scan.rst b/...ools/common/matlab2py/emit_scan/README.MD → docs/source/mat_emit_scan.rst
@@ -1,3 +1,6 @@
+Loading Matlab Emittance Scans
+================
+
 This utility can take an emittance scan .mat file and turn it into a python data object. The goal is to present the data from an emittance scan in a meaningful way.  This utility has a test file that is used for testing, but we can use it for examples. All examples are run from this directory. Current example is using Python2.7
 
 Example: 'test_scan.mat'

diff --git a/lcls_tools/common/data_analysis/fitting/fit_gaussian.py b/lcls_tools/common/data_analysis/fitting/fit_gaussian.py