Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changed xaxis label for updated SESANS nomenclature from z to delta #60

Merged
merged 4 commits into from
Mar 12, 2024
Merged

changed xaxis label for updated SESANS nomenclature from z to delta #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
feae36d
changed xaxis label for updated SESANS nomenclature from z to delta
caitwolf Jan 19, 2024
79ec5ac
updated docs to reflect change from z to delta for spin-echo length o…
caitwolf Jan 19, 2024
e101488
Merge branch 'master' into 59-update-nomenclature-for-sesans
caitwolf Feb 13, 2024
e90a5b2
Merge branch 'release_0.9.0' into 59-update-nomenclature-for-sesans
butlerpd Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docs/source/rst_prolog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions docs/source/user/data/data_formats_help.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
- 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)
Expand Down
2 changes: 1 addition & 1 deletion sasdata/dataloader/readers/sesans_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions sasdata/example_data/media/testdata_help.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 < |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 < |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 < |delta| < 200000 |Ang| .

.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ

Expand Down
Loading