Skip to content

Commit

Permalink
Merge branch 'release_0.9.0' into SasData-Counterpart-to-Sasview-Slic…
Browse files Browse the repository at this point in the history 
…erExtension_1344
  • Loading branch information
@butlerpd
butlerpd authored Apr 21, 2024
2 parents 4818b93 + 80f6739 commit 2c010fe
Show file tree
Hide file tree
Showing 14 changed files with 94,468 additions and 123 deletions.
3 changes: 2 additions & 1 deletion docs/source/rst_prolog
View file
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
6 changes: 3 additions & 3 deletions docs/source/user/data/data_formats_help.rst
View file
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)
- 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)
Expand Down
2 changes: 1 addition & 1 deletion sasdata/dataloader/readers/sesans_reader.py
View file
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
105 changes: 105 additions & 0 deletions sasdata/example_data/magnetic_data/S50_15kG_horizSector_RF+.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
0.0111179 7.27845 0.116389 0.00214635
0.0122637 6.917 0.124569 0.00215353
0.0133044 6.67641 0.121596 0.00215824
0.0142695 6.58246 0.0990066 0.00217468
0.0153097 6.19897 0.0952062 0.0021891
0.0164391 5.92162 0.0858106 0.00220081
0.0175642 5.56036 0.0893136 0.00220978
0.018671 5.44436 0.0811117 0.00222896
0.019819 5.28556 0.0859812 0.00224856
0.0208599 4.74469 0.0813528 0.00226266
0.0219009 4.72968 0.0814051 0.00227425
0.0229124 4.31734 0.0711567 0.00229247
0.0238691 4.15703 0.0659863 0.00231264
0.0249094 3.83388 0.0622195 0.00233097
0.0259314 3.54063 0.050994 0.00234616
0.0270286 3.30922 0.0520788 0.00236343
0.0281072 3.03682 0.0471857 0.00239002
0.0292123 2.80118 0.0474372 0.00241299
0.0302523 2.57104 0.0455598 0.00243152
0.0312924 2.28601 0.0430925 0.00244784
0.0323325 2.18288 0.0419826 0.00247655
0.0333725 1.84627 0.0385636 0.0025014
0.0344126 1.70983 0.037105 0.00252312
0.035416 1.60411 0.0318589 0.00254165
0.0365081 1.38664 0.0309317 0.00257011
0.0375614 1.21361 0.0269386 0.00259829
0.0386006 1.07701 0.0256986 0.00262288
0.0396397 0.96008 0.0242338 0.0026448
0.0406788 0.872797 0.0233857 0.00267082
0.041718 0.779462 0.0221108 0.00270137
0.042757 0.67138 0.0209221 0.00272867
0.0437961 0.602752 0.0205557 0.00275324
0.0448351 0.535966 0.0195852 0.00277753
0.045231 0.573528 0.00747213 0.00376592
0.0458741 0.498762 0.0187304 0.00281058
0.0469289 0.459767 0.0171527 0.0028408
0.0479674 0.461399 0.0169186 0.00286774
0.0490297 0.46056 0.0165682 0.0028928
0.0500582 0.434842 0.0156696 0.00292616
0.0510962 0.457578 0.0157622 0.00295809
0.0513766 0.463026 0.00935895 0.00389759
0.0521342 0.455116 0.0157404 0.00298722
0.0531722 0.485569 0.0163063 0.00301389
0.05421 0.533085 0.0166086 0.00304558
0.0552479 0.525686 0.017213 0.00307957
0.0554721 0.560855 0.0103743 0.00398938
0.0562856 0.557377 0.016955 0.00311073
0.0573232 0.581227 0.017594 0.00313941
0.0583839 0.652921 0.0176332 0.00317008
0.0594138 0.685919 0.0176704 0.00320561
0.0595661 0.6734 0.0113103 0.00408522
0.0604509 0.707277 0.0175836 0.00323858
0.0615022 0.73008 0.0173613 0.00326947
0.0625389 0.792362 0.0178895 0.00329773
0.0635755 0.788111 0.0176729 0.00333516
0.0636583 0.82649 0.0127892 0.00418459
0.064612 0.848716 0.0180303 0.00336979
0.0656484 0.842921 0.0181712 0.00340194
0.0664017 0.868429 0.0256048 0.0034239
0.0677487 0.919334 0.0137777 0.00428697
0.0719536 0.94416 0.00989674 0.00430514
0.0760332 0.923015 0.00967703 0.00454924
0.0801111 0.862031 0.00936877 0.00466261
0.0841869 0.741194 0.00855311 0.00469578
0.0882604 0.610844 0.00762803 0.00492299
0.0923314 0.472767 0.0067149 0.00491516
0.0963997 0.369468 0.00591919 0.00513173
0.100465 0.273393 0.00536381 0.00521558
0.104527 0.22622 0.00501629 0.00542648
0.108587 0.196379 0.00479826 0.00540005
0.112642 0.195667 0.00475226 0.00560174
0.116694 0.213378 0.00483945 0.00580325
0.120857 0.243105 0.00416868 0.00590824
0.124898 0.259325 0.00424748 0.00610577
0.128934 0.25816 0.00421884 0.00615501
0.132967 0.251338 0.00416982 0.00634753
0.136996 0.248161 0.00418467 0.0063786
0.141021 0.230785 0.00405622 0.00656598
0.145041 0.205217 0.00390759 0.00675315
0.149056 0.17115 0.00368282 0.00694012
0.153067 0.150404 0.00348856 0.00712686
0.157073 0.120111 0.00335358 0.00731337
0.161074 0.111692 0.00326286 0.00749965
0.165184 0.100348 0.00271856 0.00759196
0.169915 0.0945483 0.00244782 0.00765396
0.17494 0.0978769 0.00234334 0.00788033
0.179947 0.100369 0.00250316 0.00782385
0.184671 0.0993578 0.00256916 0.00802923
0.189027 0.105491 0.00277034 0.00821863
0.192981 0.100213 0.00276534 0.00839053
0.196929 0.0902609 0.00266131 0.00856217
0.20087 0.0862154 0.00265127 0.00873354
0.204805 0.0825386 0.00256142 0.00890463
0.208848 0.0748894 0.00233143 0.00908041
0.212768 0.0678413 0.00228525 0.00925083
0.216681 0.0669027 0.00224416 0.00942097
0.220587 0.0654959 0.00221285 0.00959081
0.224487 0.0569142 0.00222199 0.00976036
0.228379 0.0533512 0.00217913 0.0099296
0.232848 0.0575319 0.0020205 0.0101239
0.237604 0.054073 0.0019038 0.0103307
0.24254 0.0538097 0.00182623 0.0105453
0.247432 0.0503629 0.00204843 0.010758
0.251583 0.0479654 0.00211937 0.0107767
0.255534 0.0502307 0.00193817 0.010946
105 changes: 105 additions & 0 deletions sasdata/example_data/magnetic_data/S50_15kG_horizSector_RF-.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
0.0111168 7.43115 0.117803 0.00214615
0.0122626 6.9737 0.125182 0.00215332
0.0133032 6.84844 0.123457 0.00215803
0.0142682 6.69936 0.100051 0.00217447
0.0153083 6.09289 0.0942477 0.00218889
0.0164376 5.9243 0.0858731 0.00220061
0.0175625 5.76226 0.0911501 0.00220957
0.0186693 5.29421 0.079831 0.00222875
0.0198172 5.1196 0.0843848 0.00224835
0.020858 4.86414 0.0824935 0.00226245
0.0218988 4.61148 0.0802594 0.00227403
0.0229103 4.47579 0.0726155 0.00229225
0.0238668 4.12926 0.0657506 0.00231242
0.024907 3.83876 0.0622623 0.00233075
0.025929 3.53994 0.0509923 0.00234594
0.027026 3.36697 0.0525726 0.00236321
0.0281045 3.03922 0.0471905 0.0023898
0.0292096 2.80125 0.0474724 0.00241277
0.0302495 2.62213 0.0460212 0.00243129
0.0312894 2.33588 0.0435567 0.00244761
0.0323294 2.15835 0.0417599 0.00247631
0.0333694 1.87536 0.0388477 0.00250116
0.0344093 1.79086 0.03794 0.00252289
0.0354127 1.59205 0.031737 0.00254141
0.0365047 1.40386 0.0311089 0.00256986
0.0375579 1.23757 0.0271782 0.00259804
0.0385969 1.14725 0.0264143 0.00262263
0.039636 0.993207 0.0245915 0.00264455
0.040675 0.882715 0.0234975 0.00267057
0.041714 0.802947 0.0223798 0.00270111
0.042753 0.677084 0.0209877 0.00272842
0.043792 0.620295 0.0207717 0.00275298
0.0448309 0.574545 0.0200824 0.00277727
0.0452182 0.585335 0.00754828 0.00376486
0.0458697 0.536345 0.0192274 0.00281032
0.0469244 0.469116 0.0172667 0.00284053
0.0479629 0.470957 0.0170413 0.00286747
0.0490251 0.451136 0.0164527 0.00289253
0.0500534 0.433002 0.0156474 0.00292588
0.0510914 0.467727 0.0158832 0.00295782
0.051362 0.466694 0.00939126 0.00389649
0.0521293 0.443871 0.0156057 0.00298694
0.0531672 0.452008 0.0159011 0.00301361
0.0542049 0.518692 0.0164409 0.0030453
0.0552426 0.493382 0.0168468 0.00307928
0.0554564 0.552421 0.0102929 0.00398825
0.0562803 0.578288 0.0171946 0.00311044
0.0573178 0.608309 0.0178923 0.00313912
0.0583784 0.628432 0.0173676 0.00316978
0.0594082 0.672985 0.0175383 0.0032053
0.0595492 0.687916 0.0114467 0.00408406
0.0604453 0.708307 0.0175986 0.00323828
0.0614964 0.724457 0.0173136 0.00326916
0.062533 0.761532 0.0176065 0.00329742
0.0635695 0.813586 0.0179007 0.00333484
0.0636403 0.826868 0.0127891 0.00418341
0.0646059 0.852271 0.018061 0.00336948
0.0656422 0.871873 0.018424 0.00340162
0.0663954 0.881454 0.0257589 0.00342358
0.0677296 0.913307 0.0137215 0.00428575
0.0719332 0.93518 0.00983685 0.00430393
0.0760117 0.942413 0.00980393 0.00454795
0.0800884 0.856724 0.00933215 0.00466129
0.0841631 0.743031 0.00856751 0.00469445
0.0882354 0.616346 0.00766567 0.0049216
0.0923053 0.482246 0.00678197 0.00491377
0.0963725 0.363632 0.0058777 0.00513028
0.100437 0.280574 0.00541507 0.00521411
0.104498 0.225335 0.00500929 0.00542494
0.108556 0.198579 0.00481458 0.00539852
0.11261 0.2094 0.00485406 0.00560016
0.116661 0.21365 0.00484175 0.00580161
0.120823 0.235254 0.00412119 0.00590657
0.124862 0.245738 0.00416531 0.00610404
0.128898 0.261882 0.00424059 0.00615327
0.13293 0.257302 0.00420575 0.00634573
0.136957 0.243447 0.00415794 0.00637679
0.140981 0.229174 0.00404659 0.00656412
0.145 0.202655 0.00389071 0.00675124
0.149014 0.173565 0.00369866 0.00693815
0.153024 0.148636 0.00347686 0.00712484
0.157028 0.124112 0.00337946 0.00731131
0.161028 0.107379 0.00323403 0.00749753
0.165137 0.103209 0.00273506 0.00758981
0.169867 0.100372 0.00247813 0.0076518
0.174891 0.099307 0.00235046 0.0078781
0.179897 0.100456 0.00250346 0.00782164
0.184619 0.100174 0.002574 0.00802696
0.188974 0.103776 0.00276029 0.0082163
0.192926 0.0984744 0.00275493 0.00838816
0.196873 0.0902089 0.00266078 0.00855975
0.200813 0.0908638 0.00267904 0.00873107
0.204747 0.0787608 0.00253787 0.00890211
0.208789 0.0743915 0.0023282 0.00907784
0.212708 0.0661088 0.00227599 0.00924821
0.21662 0.0643156 0.0022298 0.0094183
0.220525 0.0633322 0.00220058 0.0095881
0.224423 0.0566221 0.00222026 0.0097576
0.228315 0.0571883 0.00220076 0.0099268
0.232783 0.0543953 0.00200456 0.010121
0.237536 0.0561913 0.0019143 0.0103277
0.242471 0.0548656 0.00183162 0.0105423
0.247363 0.0508177 0.00205122 0.010755
0.251512 0.0547088 0.00215814 0.0107736
0.255462 0.0492085 0.00193302 0.0109429
100 changes: 100 additions & 0 deletions sasdata/example_data/magnetic_data/S50_15kG_vertSector_RF+.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
0.0110857 5.72678 0.100577 0.0021461
0.0122598 5.50108 0.108646 0.00215351
0.0133008 5.09554 0.103811 0.00215822
0.014421 5.16515 0.0938936 0.00217706
0.015627 4.87034 0.0916674 0.00219273
0.0165255 4.70928 0.081846 0.00220158
0.017566 4.4243 0.0782948 0.00220979
0.0186066 4.15794 0.0754144 0.0022277
0.0196935 3.85488 0.0676017 0.00224665
0.0208518 3.64198 0.0637978 0.00226257
0.0217866 3.32539 0.0569921 0.00227308
0.0228268 3.15192 0.0553003 0.00229048
0.0238999 2.88831 0.0499137 0.00231323
0.0250374 2.59635 0.0500578 0.00233301
0.0260778 2.51777 0.049447 0.00234814
0.0271127 2.32418 0.0451245 0.00236568
0.0280697 2.16051 0.0413319 0.00238917
0.0291357 1.98487 0.0375831 0.00241152
0.0302534 1.75978 0.0372284 0.00243153
0.0312934 1.60216 0.0355143 0.00244787
0.0323335 1.45408 0.033951 0.00247657
0.0333881 1.292 0.0294558 0.00250174
0.0344277 1.15321 0.0277913 0.00252342
0.0354673 1.06094 0.0268223 0.00254254
0.0365069 0.927883 0.0250537 0.00257007
0.0375465 0.846086 0.0242783 0.00259791
0.038586 0.789794 0.0235016 0.00262255
0.0396406 0.710122 0.0210829 0.00264482
0.0406797 0.63972 0.0200636 0.00267084
0.0417188 0.602805 0.0194904 0.00270139
0.0427579 0.582812 0.0192964 0.00272869
0.0437969 0.540829 0.0190592 0.00275325
0.0448508 0.491836 0.0168609 0.00277806
0.0452312 0.556455 0.00723944 0.00376593
0.0458894 0.537566 0.0176269 0.00281104
0.046928 0.528657 0.0174528 0.00284077
0.0479665 0.516198 0.0173494 0.00286772
0.049005 0.532683 0.017276 0.00289225
0.0500434 0.562561 0.0176373 0.00292568
0.0510969 0.589369 0.0169548 0.00295812
0.0513768 0.602677 0.0106143 0.00389759
0.0521349 0.607103 0.0171015 0.00298724
0.0531729 0.659374 0.0179043 0.00301391
0.0542108 0.736098 0.0185328 0.00304561
0.0552486 0.734213 0.0187408 0.00307959
0.0554723 0.75381 0.0120503 0.00398938
0.0562863 0.819386 0.0192537 0.00311075
0.0573387 0.82162 0.0182343 0.00313982
0.0583759 0.912724 0.0190974 0.00316979
0.0594132 0.937118 0.0193508 0.00320558
0.0595663 0.92713 0.0137476 0.00408522
0.0604503 0.962771 0.0193619 0.00323856
0.0614873 1.00491 0.0198655 0.00326905
0.0625243 1.02433 0.0199262 0.00329732
0.0635762 1.07002 0.0194489 0.00333518
0.0636586 1.07746 0.0153231 0.0041846
0.067749 1.13104 0.0156646 0.00428697
0.0719538 1.14533 0.0111394 0.00430516
0.0760335 1.08946 0.0107627 0.00454926
0.0801114 0.972136 0.00992289 0.00466263
0.0841872 0.821111 0.00886829 0.0046958
0.0882607 0.655365 0.00776154 0.00492301
0.0923317 0.511823 0.00675355 0.00491518
0.0964001 0.38789 0.00590279 0.00513175
0.100465 0.288028 0.0052051 0.0052156
0.104528 0.234464 0.00480466 0.0054265
0.108587 0.211623 0.00466557 0.00540007
0.112643 0.210152 0.00468347 0.00560176
0.116695 0.234248 0.00486425 0.00580328
0.120857 0.260888 0.00413043 0.00590826
0.124898 0.273227 0.0042063 0.00610579
0.128935 0.284556 0.00424633 0.00615503
0.132968 0.278445 0.00424841 0.00634755
0.136997 0.264925 0.00417497 0.00637862
0.141021 0.244892 0.00402426 0.006566
0.145041 0.21419 0.00381699 0.00675318
0.149057 0.185525 0.00368513 0.00694014
0.153067 0.163463 0.00350842 0.00712688
0.157073 0.138355 0.00337321 0.0073134
0.161074 0.122434 0.00325182 0.00749968
0.165185 0.107211 0.00272251 0.00759199
0.169922 0.100931 0.0024106 0.00765428
0.175129 0.103391 0.00221287 0.00788882
0.180112 0.103682 0.00275069 0.00783099
0.184337 0.108196 0.00250534 0.00801472
0.189028 0.103311 0.00275028 0.00821865
0.192982 0.101888 0.00272813 0.00839056
0.196929 0.0966509 0.00269868 0.0085622
0.200871 0.0936201 0.00268369 0.00873357
0.204806 0.0905551 0.00267591 0.00890466
0.208849 0.081612 0.00232662 0.00908044
0.212768 0.0709458 0.00230831 0.00925086
0.216682 0.0648239 0.00227585 0.009421
0.220588 0.0634712 0.0022669 0.00959084
0.224487 0.0649706 0.00225657 0.00976039
0.22838 0.0584004 0.0022357 0.00992964
0.232266 0.0598881 0.00223459 0.0100986
0.237531 0.05562 0.00174874 0.0103275
0.242614 0.0565905 0.00201316 0.0105485
0.246742 0.0508475 0.00270929 0.010728
Loading

0 comments on commit 2c010fe

Please sign in to comment.