Merge branch 'release_0.9.0' into interpolations_for_data_operations

SasView · Mar 26, 2024 · 339a80f · 339a80f
2 parents 3c3999b + 80f6739
commit 339a80f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/docs/source/rst_prolog b/docs/source/rst_prolog
@@ -1,4 +1,5 @@
 .. Set up some substitutions to make life easier...
 
 .. |Ang| unicode:: U+212B
-.. |Ang^-1| replace:: |Ang|\ :sup:`-1`
+.. |Ang^-1| replace:: |Ang|\ :sup:`-1`
+.. |delta| unicode:: U+03B4
diff --git a/docs/source/user/data/data_formats_help.rst b/docs/source/user/data/data_formats_help.rst
@@ -114,10 +114,10 @@ between users.
 Following the header are up to 8 space-delimited columns of experimental
 variables of which the first 4 columns are required. In order, these are:
 
-- Spin-echo length (z, in Angstroms)
-- Depolarization (:math:`log(P/P_0)/(lambda^2 * thickness)`, in Angstrom :sup:`-1` cm :sup:`-1`\ )
+- Spin-echo length (:math:`\delta`, in Angstroms)
+- Depolarization (:math:`log(P/P_0)/(\lambda^2 * thickness)`, in Angstrom :sup:`-1` cm :sup:`-1`\ )
 - Depolarization error (also in in Angstrom :sup:`-1` cm :sup:`-1`\ ) (i.e. the measurement error)
-- Spin-echo length error (:math:`\Delta`\ z, in Angstroms) (i.e. the experimental resolution)
+- Spin-echo length error (:math:`\Delta \delta`, in Angstroms) (i.e. the experimental resolution)
 - Neutron wavelength (:math:`\lambda`, in Angstroms)
 - Neutron wavelength error (:math:`\Delta \lambda`, in Angstroms)
 - Normalized polarization (:math:`P/P_0`, unitless)

diff --git a/sasdata/dataloader/readers/sesans_reader.py b/sasdata/dataloader/readers/sesans_reader.py
@@ -122,7 +122,7 @@ def get_file_contents(self):
         self.current_datainfo.source.wavelength_unit = lam_unit
         self.current_datainfo.source.wavelength = lam
         self.current_datainfo.filename = self.filepath.name
-        self.current_dataset.xaxis(r"\rm{z}", x_unit)
+        self.current_dataset.xaxis(r"\delta", x_unit)
         # Adjust label to ln P/(lam^2 t), remove lam column refs
         self.current_dataset.yaxis(r"\rm{ln(P)/(t \lambda^2)}", y_unit)
         # Store loading process information

diff --git a/sasdata/example_data/media/testdata_help.rst b/sasdata/example_data/media/testdata_help.rst
@@ -346,15 +346,15 @@ SESANS Test Data
 
 sphere_isis
   - SESANS data from 100nm PMMA latex nanoparticles in h/d-decalin collected on
-    the LARMOR instrument at ISIS over spin-echo lengths 260 < *z* < 19300 |Ang| .
+    the LARMOR instrument at ISIS over spin-echo lengths 260 < :math:`\delta` < 19300 |Ang| .
 
 spheres2micron
   - SESANS data from 2 micron polystyrene spheres in 53% H2O / 47% D2O collected
-    on the LARMOR instrument at ISIS over spin-echo lengths 400 < *z* < 46000 |Ang| .
+    on the LARMOR instrument at ISIS over spin-echo lengths 400 < :math:`\delta` < 46000 |Ang| .
 
 spheres2micron_long
   - SESANS data from 2 micron polystyrene spheres in 53% H2O / 47% D2O collected
-    on the LARMOR instrument at ISIS over spin-echo lengths 400 < *z* < 200000 |Ang| .
+    on the LARMOR instrument at ISIS over spin-echo lengths 400 < :math:`\delta` < 200000 |Ang| .
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ