½=@ÎÂ=ËþÏ=
\ No newline at end of file
diff --git a/src/sas/example_data/convertible_files/Z98000.I1D b/src/sas/example_data/convertible_files/Z98000.I1D
deleted file mode 100644
index 5d8b963d80..0000000000
--- a/src/sas/example_data/convertible_files/Z98000.I1D
+++ /dev/null
@@ -1,6 +0,0 @@
-ISIS_98929.TXT
-
- 140 1 1 1 0 0 0 0 0 1
-Z98001.I1D
- 140 1 1 1 0 0 0 0 0 0
-Z98002.I1D
diff --git a/src/sas/example_data/convertible_files/Z98000.QAX b/src/sas/example_data/convertible_files/Z98000.QAX
deleted file mode 100644
index 745410d60b..0000000000
--- a/src/sas/example_data/convertible_files/Z98000.QAX
+++ /dev/null
@@ -1,4 +0,0 @@
-ISIS_98929.TXT
-
- 140 1 1 1 0 0 0 0 0 0
-Z98001.QAX
diff --git a/src/sas/example_data/convertible_files/Z98000.xml b/src/sas/example_data/convertible_files/Z98000.xml
deleted file mode 100644
index 8dd22ea193..0000000000
--- a/src/sas/example_data/convertible_files/Z98000.xml
+++ /dev/null
@@ -1,583 +0,0 @@
-
-
-
-
-
-
-
- 0.00700000021607
- 21.0877494812
-
-
- 0.00899999961257
- 6.9149928093
-
-
- 0.0109999999404
- 3.29820299149
-
-
- 0.0130000002682
- 1.95223999023
-
-
- 0.0149999996647
- 1.37454605103
-
-
- 0.0170000009239
- 0.986351907253
-
-
- 0.0189999993891
- 0.856290578842
-
-
- 0.0209999997169
- 0.79960078001
-
-
- 0.0230000000447
- 0.73988121748
-
-
- 0.0250000003725
- 0.70280957222
-
-
- 0.0270000007004
- 0.665353894234
-
-
- 0.0289999991655
- 0.667375028133
-
-
- 0.0309999994934
- 0.662829220295
-
-
- 0.0329999998212
- 0.689519286156
-
-
- 0.035000000149
- 0.697279512882
-
-
- 0.0370000004768
- 0.713435471058
-
-
- 0.0390000008047
- 0.701587080956
-
-
- 0.0410000011325
- 0.749152183533
-
-
- 0.0430000014603
- 0.758012771606
-
-
- 0.0450000017881
- 0.783602774143
-
-
- 0.0469999983907
- 0.841286420822
-
-
- 0.0489999987185
- 0.884350776672
-
-
- 0.0509999990463
- 0.926352083683
-
-
- 0.0529999993742
- 0.974015712738
-
-
- 0.054999999702
- 1.02490401268
-
-
- 0.0570000000298
- 1.06476104259
-
-
- 0.0590000003576
- 1.08852303028
-
-
- 0.0610000006855
- 1.11291205883
-
-
- 0.0630000010133
- 1.15584397316
-
-
- 0.0649999976158
- 1.16356503963
-
-
- 0.0670000016689
- 1.16666996479
-
-
- 0.0689999982715
- 1.15272796154
-
-
- 0.0710000023246
- 1.15064799786
-
-
- 0.0729999989271
- 1.13290500641
-
-
- 0.0750000029802
- 1.11188900471
-
-
- 0.0769999995828
- 1.07086598873
-
-
- 0.0790000036359
- 1.04297494888
-
-
- 0.0810000002384
- 1.02898001671
-
-
- 0.082999996841
- 0.979080200195
-
-
- 0.0850000008941
- 0.927485704422
-
-
- 0.0869999974966
- 0.877090275288
-
-
- 0.0890000015497
- 0.837758421898
-
-
- 0.0909999981523
- 0.800018072128
-
-
- 0.0930000022054
- 0.767646312714
-
-
- 0.0949999988079
- 0.723915994167
-
-
- 0.097000002861
- 0.67986792326
-
-
- 0.0989999994636
- 0.644961714745
-
-
- 0.101000003517
- 0.618148684502
-
-
- 0.103000000119
- 0.587383925915
-
-
- 0.104999996722
- 0.56969088316
-
-
- 0.107000000775
- 0.550951302052
-
-
- 0.108999997377
- 0.54040068388
-
-
- 0.111000001431
- 0.523307979107
-
-
- 0.112999998033
- 0.498805910349
-
-
- 0.115000002086
- 0.484060287476
-
-
- 0.116999998689
- 0.469231009483
-
-
- 0.119000002742
- 0.454095512629
-
-
- 0.120999999344
- 0.444210112095
-
-
- 0.123000003397
- 0.437322497368
-
-
- 0.125
- 0.431536197662
-
-
- 0.127000004053
- 0.426572710276
-
-
- 0.128999993205
- 0.425902992487
-
-
- 0.130999997258
- 0.416256785393
-
-
- 0.133000001311
- 0.41275331378
-
-
- 0.135000005364
- 0.410560309887
-
-
- 0.136999994516
- 0.404949605465
-
-
- 0.138999998569
- 0.403335213661
-
-
- 0.141000002623
- 0.40135088563
-
-
- 0.143000006676
- 0.40077239275
-
-
- 0.144999995828
- 0.394572585821
-
-
- 0.146999999881
- 0.385773509741
-
-
- 0.149000003934
- 0.379192501307
-
-
- 0.150999993086
- 0.379544496536
-
-
- 0.152999997139
- 0.373678892851
-
-
- 0.155000001192
- 0.370625406504
-
-
- 0.157000005245
- 0.368275612593
-
-
- 0.158999994397
- 0.371669888496
-
-
- 0.16099999845
- 0.368764400482
-
-
- 0.163000002503
- 0.369146198034
-
-
- 0.165000006557
- 0.365978509188
-
-
- 0.166999995708
- 0.358884811401
-
-
- 0.168999999762
- 0.355919510126
-
-
- 0.171000003815
- 0.357609987259
-
-
- 0.172999992967
- 0.356993794441
-
-
- 0.17499999702
- 0.356719911098
-
-
- 0.177000001073
- 0.351224392653
-
-
- 0.179000005126
- 0.355494886637
-
-
- 0.180999994278
- 0.358554303646
-
-
- 0.182999998331
- 0.350813299417
-
-
- 0.185000002384
- 0.347702711821
-
-
- 0.187000006437
- 0.342840611935
-
-
- 0.188999995589
- 0.346473008394
-
-
- 0.190999999642
- 0.34877538681
-
-
- 0.193000003695
- 0.34089460969
-
-
- 0.194999992847
- 0.343621701002
-
-
- 0.196999996901
- 0.337706804276
-
-
- 0.199000000954
- 0.341378808022
-
-
- 0.201000005007
- 0.339097201824
-
-
- 0.202999994159
- 0.338257014751
-
-
- 0.204999998212
- 0.337063491344
-
-
- 0.207000002265
- 0.33335390687
-
-
- 0.209000006318
- 0.327607989311
-
-
- 0.21099999547
- 0.326870590448
-
-
- 0.212999999523
- 0.322661489248
-
-
- 0.215000003576
- 0.323224306107
-
-
- 0.216999992728
- 0.326994895935
-
-
- 0.218999996781
- 0.330487310886
-
-
- 0.221000000834
- 0.333228886127
-
-
- 0.223000004888
- 0.33349108696
-
-
- 0.22499999404
- 0.328233093023
-
-
- 0.226999998093
- 0.325591206551
-
-
- 0.229000002146
- 0.319118887186
-
-
- 0.231000006199
- 0.311261802912
-
-
- 0.232999995351
- 0.312078088522
-
-
- 0.234999999404
- 0.301698714495
-
-
- 0.237000003457
- 0.311744302511
-
-
- 0.238999992609
- 0.322577595711
-
-
- 0.240999996662
- 0.323940396309
-
-
- 0.243000000715
- 0.344702214003
-
-
- 0.245000004768
- 0.348640114069
-
-
- 0.24699999392
- 0.350162893534
-
-
- 0.248999997973
- 0.355486005545
-
-
- 0.250999987125
- 0.349838793278
-
-
- 0.252999991179
- 0.347436606884
-
-
- 0.254999995232
- 0.346845299006
-
-
- 0.256999999285
- 0.318100512028
-
-
- 0.259000003338
- 0.309689611197
-
-
- 0.261000007391
- 0.2904047966
-
-
- 0.263000011444
- 0.280272006989
-
-
- 0.264999985695
- 0.289936304092
-
-
- 0.266999989748
- 0.308597505093
-
-
- 0.268999993801
- 0.304085701704
-
-
- 0.270999997854
- 0.335575789213
-
-
- 0.273000001907
- 0.316729396582
-
-
- 0.27500000596
- 0.318863213062
-
-
- 0.277000010014
- 0.293644398451
-
-
- 0.279000014067
- 0.311365485191
-
-
- 0.280999988317
- 0.221318095922
-
-
- 0.282999992371
- 0.165873795748
-
-
- 0.284999996424
- 0.161938592792
-
-
-
-
-
-
-
-
- neutron
-
-
-
-
-
-
-
-
-
diff --git a/src/sas/example_data/convertible_files/Z98001.I1D b/src/sas/example_data/convertible_files/Z98001.I1D
deleted file mode 100644
index 104e0ab230..0000000000
Binary files a/src/sas/example_data/convertible_files/Z98001.I1D and /dev/null differ
diff --git a/src/sas/example_data/convertible_files/Z98001.QAX b/src/sas/example_data/convertible_files/Z98001.QAX
deleted file mode 100644
index 715ab570fc..0000000000
Binary files a/src/sas/example_data/convertible_files/Z98001.QAX and /dev/null differ
diff --git a/src/sas/example_data/convertible_files/Z98002.I1D b/src/sas/example_data/convertible_files/Z98002.I1D
deleted file mode 100644
index 1bb89aa919..0000000000
Binary files a/src/sas/example_data/convertible_files/Z98002.I1D and /dev/null differ
diff --git a/src/sas/example_data/dls_data/dls_monodisperse.dat b/src/sas/example_data/dls_data/dls_monodisperse.dat
deleted file mode 100644
index 6b03a5445f..0000000000
--- a/src/sas/example_data/dls_data/dls_monodisperse.dat
+++ /dev/null
@@ -1,220 +0,0 @@
-Scattering angle: 105.0
-Temperature (K): 297.0
-Viscosity (mPas): 1.100
-Refractive index: 1.330
-Wavelength (nm): 642.0
-
-Lag time (s) g2-1
-2.200000E-06 7.330000E-01
-2.400000E-06 7.310000E-01
-2.600000E-06 7.270000E-01
-2.800000E-06 7.250000E-01
-3.000000E-06 7.210000E-01
-3.200000E-06 7.260000E-01
-3.400000E-06 7.220000E-01
-3.800000E-06 7.170000E-01
-4.200000E-06 7.160000E-01
-4.600000E-06 7.090000E-01
-5.000000E-06 7.080000E-01
-5.400000E-06 7.070000E-01
-5.800000E-06 7.000000E-01
-6.200000E-06 6.990000E-01
-6.600000E-06 6.960000E-01
-7.400000E-06 6.870000E-01
-8.200000E-06 6.820000E-01
-9.000000E-06 6.750000E-01
-9.800000E-06 6.670000E-01
-1.060000E-05 6.610000E-01
-1.140000E-05 6.570000E-01
-1.220000E-05 6.500000E-01
-1.300000E-05 6.430000E-01
-1.460000E-05 6.310000E-01
-1.620000E-05 6.190000E-01
-1.780000E-05 6.080000E-01
-1.940000E-05 5.960000E-01
-2.100000E-05 5.860000E-01
-2.260000E-05 5.740000E-01
-2.420000E-05 5.640000E-01
-2.580000E-05 5.520000E-01
-2.900000E-05 5.330000E-01
-3.220000E-05 5.140000E-01
-3.540000E-05 4.930000E-01
-3.860000E-05 4.750000E-01
-4.180000E-05 4.580000E-01
-4.500000E-05 4.410000E-01
-4.820000E-05 4.250000E-01
-5.140000E-05 4.090000E-01
-5.780000E-05 3.800000E-01
-6.420000E-05 3.540000E-01
-7.060000E-05 3.270000E-01
-7.700000E-05 3.040000E-01
-8.340000E-05 2.820000E-01
-8.980000E-05 2.630000E-01
-9.620000E-05 2.450000E-01
-1.030000E-04 2.280000E-01
-1.150000E-04 1.970000E-01
-1.280000E-04 1.720000E-01
-1.410000E-04 1.500000E-01
-1.540000E-04 1.310000E-01
-1.670000E-04 1.150000E-01
-1.790000E-04 1.010000E-01
-1.920000E-04 8.880000E-02
-2.050000E-04 7.900000E-02
-2.310000E-04 6.220000E-02
-2.560000E-04 5.020000E-02
-2.820000E-04 4.030000E-02
-3.070000E-04 3.270000E-02
-3.330000E-04 2.700000E-02
-3.590000E-04 2.270000E-02
-3.840000E-04 1.900000E-02
-4.100000E-04 1.650000E-02
-4.610000E-04 1.340000E-02
-5.120000E-04 1.130000E-02
-5.630000E-04 1.060000E-02
-6.150000E-04 1.030000E-02
-6.660000E-04 9.410000E-03
-7.170000E-04 8.610000E-03
-7.680000E-04 7.790000E-03
-8.190000E-04 7.210000E-03
-9.220000E-04 6.890000E-03
-1.020000E-03 6.400000E-03
-1.130000E-03 5.660000E-03
-1.230000E-03 5.730000E-03
-1.330000E-03 6.130000E-03
-1.430000E-03 6.190000E-03
-1.540000E-03 6.620000E-03
-1.640000E-03 6.530000E-03
-1.840000E-03 6.070000E-03
-2.050000E-03 5.840000E-03
-2.250000E-03 6.790000E-03
-2.460000E-03 7.010000E-03
-2.660000E-03 6.740000E-03
-2.870000E-03 5.580000E-03
-3.070000E-03 5.170000E-03
-3.280000E-03 5.870000E-03
-3.690000E-03 5.680000E-03
-4.100000E-03 6.060000E-03
-4.510000E-03 5.760000E-03
-4.920000E-03 5.510000E-03
-5.330000E-03 6.780000E-03
-5.730000E-03 5.660000E-03
-6.140000E-03 4.970000E-03
-6.550000E-03 5.230000E-03
-7.370000E-03 6.420000E-03
-8.190000E-03 5.880000E-03
-9.010000E-03 5.810000E-03
-9.830000E-03 6.330000E-03
-1.060000E-02 6.390000E-03
-1.150000E-02 5.530000E-03
-1.230000E-02 5.470000E-03
-1.310000E-02 6.150000E-03
-1.470000E-02 5.850000E-03
-1.640000E-02 5.860000E-03
-1.800000E-02 6.510000E-03
-1.970000E-02 5.810000E-03
-2.130000E-02 5.970000E-03
-2.290000E-02 5.520000E-03
-2.460000E-02 5.740000E-03
-2.620000E-02 5.840000E-03
-2.950000E-02 5.580000E-03
-3.280000E-02 5.890000E-03
-3.600000E-02 5.850000E-03
-3.930000E-02 5.800000E-03
-4.260000E-02 5.890000E-03
-4.590000E-02 6.140000E-03
-4.920000E-02 6.070000E-03
-5.240000E-02 5.840000E-03
-5.900000E-02 5.910000E-03
-6.550000E-02 5.860000E-03
-7.210000E-02 5.740000E-03
-7.860000E-02 5.830000E-03
-8.520000E-02 5.640000E-03
-9.180000E-02 6.060000E-03
-9.830000E-02 5.890000E-03
-1.050000E-01 5.950000E-03
-1.180000E-01 5.770000E-03
-1.310000E-01 5.990000E-03
-1.440000E-01 5.660000E-03
-1.570000E-01 5.580000E-03
-1.700000E-01 5.740000E-03
-1.840000E-01 5.400000E-03
-1.970000E-01 5.430000E-03
-2.100000E-01 5.380000E-03
-2.360000E-01 5.480000E-03
-2.620000E-01 4.970000E-03
-2.880000E-01 4.910000E-03
-3.150000E-01 4.760000E-03
-3.410000E-01 4.630000E-03
-3.670000E-01 4.430000E-03
-3.930000E-01 4.240000E-03
-4.190000E-01 4.160000E-03
-4.720000E-01 3.710000E-03
-5.240000E-01 3.290000E-03
-5.770000E-01 3.140000E-03
-6.290000E-01 2.780000E-03
-6.820000E-01 2.620000E-03
-7.340000E-01 2.200000E-03
-7.860000E-01 2.100000E-03
-8.390000E-01 0.000000E+00
-9.440000E-01 0.000000E+00
-1.050000E+00 0.000000E+00
-1.150000E+00 0.000000E+00
-1.260000E+00 0.000000E+00
-1.360000E+00 0.000000E+00
-1.470000E+00 0.000000E+00
-1.570000E+00 0.000000E+00
-1.680000E+00 0.000000E+00
-1.890000E+00 1.570000E-03
-2.100000E+00 1.710000E-03
-2.310000E+00 2.120000E-03
-2.520000E+00 2.510000E-03
-2.730000E+00 2.770000E-03
-2.940000E+00 3.020000E-03
-3.150000E+00 3.130000E-03
-3.360000E+00 3.030000E-03
-3.770000E+00 2.540000E-03
-4.190000E+00 1.770000E-03
-4.610000E+00 9.170000E-04
-5.030000E+00 4.820000E-04
-5.450000E+00 2.400000E-04
-5.870000E+00 3.130000E-04
-6.290000E+00 5.470000E-04
-6.710000E+00 6.600000E-04
-7.550000E+00 4.800000E-04
-8.390000E+00 4.140000E-06
-9.230000E+00 -1.750000E-04
-1.010000E+01 1.110000E-04
-1.090000E+01 2.450000E-04
-1.170000E+01 2.420000E-04
-1.260000E+01 1.690000E-04
-1.340000E+01 2.790000E-04
-1.510000E+01 1.910000E-04
-1.680000E+01 -2.780000E-05
-1.850000E+01 9.600000E-05
-2.010000E+01 6.150000E-04
-2.180000E+01 7.880000E-04
-2.350000E+01 8.310000E-04
-2.520000E+01 7.260000E-04
-2.680000E+01 1.560000E-03
-3.020000E+01 1.660000E-03
-3.360000E+01 1.310000E-03
-3.690000E+01 1.170000E-03
-4.030000E+01 1.450000E-03
-4.360000E+01 1.740000E-03
-4.700000E+01 1.850000E-03
-5.030000E+01 2.570000E-03
-5.370000E+01 3.630000E-03
-6.040000E+01 3.990000E-03
-6.710000E+01 4.520000E-03
-7.380000E+01 5.200000E-03
-8.050000E+01 6.570000E-03
-8.720000E+01 7.720000E-03
-9.400000E+01 7.710000E-03
-1.010000E+02 1.040000E-02
-1.070000E+02 1.270000E-02
-1.210000E+02 -1.420000E-02
-1.340000E+02 -1.250000E-02
-1.480000E+02 -1.410000E-02
-1.610000E+02 -1.660000E-02
-1.740000E+02 -1.550000E-02
-1.880000E+02 -1.160000E-02
diff --git a/src/sas/example_data/dls_data/dls_polydisperse.dat b/src/sas/example_data/dls_data/dls_polydisperse.dat
deleted file mode 100644
index 0e72d84a1a..0000000000
--- a/src/sas/example_data/dls_data/dls_polydisperse.dat
+++ /dev/null
@@ -1,242 +0,0 @@
-Scattering angle: 110.0
-Temperature (K): 309.0
-Viscosity (mPas): 0.854
-Refractive index: 1.330
-Wavelength (nm): 642.0
-
-Lag time (s) g2-1
-6.250000e-08 9.113997e-01
-7.500000e-08 8.547216e-01
-8.750000e-08 8.269044e-01
-1.000000e-07 7.905431e-01
-1.125000e-07 7.863978e-01
-1.250000e-07 7.645010e-01
-1.375000e-07 7.728501e-01
-1.500000e-07 7.646473e-01
-1.625000e-07 7.516946e-01
-1.750000e-07 7.575662e-01
-1.875000e-07 7.556643e-01
-2.000000e-07 7.547962e-01
-2.250000e-07 7.502705e-01
-2.500000e-07 7.461838e-01
-2.750000e-07 7.463545e-01
-3.000000e-07 7.470811e-01
-3.250000e-07 7.426579e-01
-3.500000e-07 7.419605e-01
-3.750000e-07 7.375957e-01
-4.000000e-07 7.346526e-01
-4.500000e-07 7.386101e-01
-5.000000e-07 7.368618e-01
-5.500000e-07 7.347428e-01
-6.000000e-07 7.367740e-01
-6.500000e-07 7.279104e-01
-7.000000e-07 7.360279e-01
-7.500000e-07 7.318753e-01
-8.000000e-07 7.309646e-01
-9.000000e-07 7.301758e-01
-1.000000e-06 7.288274e-01
-1.100000e-06 7.253502e-01
-1.200000e-06 7.277252e-01
-1.300000e-06 7.292748e-01
-1.400000e-06 7.273558e-01
-1.500000e-06 7.303904e-01
-1.600000e-06 7.263560e-01
-1.800000e-06 7.247028e-01
-2.000000e-06 7.246132e-01
-2.200000e-06 7.232520e-01
-2.400000e-06 7.226546e-01
-2.600000e-06 7.224083e-01
-2.800000e-06 7.233495e-01
-3.000000e-06 7.212537e-01
-3.200000e-06 7.214775e-01
-3.600000e-06 7.211303e-01
-4.000000e-06 7.196514e-01
-4.400000e-06 7.187855e-01
-4.800000e-06 7.181586e-01
-5.200000e-06 7.172402e-01
-5.600000e-06 7.176703e-01
-6.000000e-06 7.174161e-01
-6.400000e-06 7.162592e-01
-7.200000e-06 7.156621e-01
-8.000000e-06 7.129129e-01
-8.800000e-06 7.136304e-01
-9.600000e-06 7.120554e-01
-1.040000e-05 7.108749e-01
-1.120000e-05 7.096138e-01
-1.200000e-05 7.081130e-01
-1.280000e-05 7.072815e-01
-1.440000e-05 7.053022e-01
-1.600000e-05 7.036763e-01
-1.760000e-05 7.023367e-01
-1.920000e-05 7.004920e-01
-2.080000e-05 6.976003e-01
-2.240000e-05 6.966027e-01
-2.400000e-05 6.945947e-01
-2.560000e-05 6.932367e-01
-2.880000e-05 6.897130e-01
-3.200000e-05 6.869965e-01
-3.520000e-05 6.835567e-01
-3.840000e-05 6.803812e-01
-4.160000e-05 6.774032e-01
-4.480000e-05 6.740287e-01
-4.800000e-05 6.714514e-01
-5.120000e-05 6.686965e-01
-5.760000e-05 6.628648e-01
-6.400000e-05 6.574263e-01
-7.040000e-05 6.517117e-01
-7.680000e-05 6.464396e-01
-8.320000e-05 6.416406e-01
-8.960000e-05 6.361643e-01
-9.600000e-05 6.313504e-01
-1.024000e-04 6.266279e-01
-1.152000e-04 6.169251e-01
-1.280000e-04 6.077667e-01
-1.408000e-04 5.988735e-01
-1.536000e-04 5.902520e-01
-1.664000e-04 5.819066e-01
-1.792000e-04 5.737407e-01
-1.920000e-04 5.656308e-01
-2.048000e-04 5.579652e-01
-2.304000e-04 5.429127e-01
-2.560000e-04 5.284826e-01
-2.816000e-04 5.149854e-01
-3.072000e-04 5.018793e-01
-3.328000e-04 4.895795e-01
-3.584000e-04 4.775652e-01
-3.840000e-04 4.659916e-01
-4.096000e-04 4.549667e-01
-4.608000e-04 4.338010e-01
-5.120000e-04 4.142885e-01
-5.632000e-04 3.957373e-01
-6.144000e-04 3.785896e-01
-6.656000e-04 3.623740e-01
-7.168000e-04 3.469813e-01
-7.680000e-04 3.324822e-01
-8.192000e-04 3.191583e-01
-9.216000e-04 2.939887e-01
-1.024000e-03 2.718145e-01
-1.126400e-03 2.515356e-01
-1.228800e-03 2.335207e-01
-1.331200e-03 2.170531e-01
-1.433600e-03 2.022592e-01
-1.536000e-03 1.883993e-01
-1.638400e-03 1.757139e-01
-1.843200e-03 1.520581e-01
-2.048000e-03 1.325766e-01
-2.252800e-03 1.168642e-01
-2.457600e-03 1.033178e-01
-2.662400e-03 9.170382e-02
-2.867200e-03 8.180275e-02
-3.072000e-03 7.355866e-02
-3.276800e-03 6.651426e-02
-3.686400e-03 5.382173e-02
-4.096000e-03 4.382119e-02
-4.505600e-03 3.500387e-02
-4.915200e-03 2.830666e-02
-5.324800e-03 2.401403e-02
-5.734400e-03 2.013978e-02
-6.144000e-03 1.547798e-02
-6.553600e-03 1.231789e-02
-7.372800e-03 8.145856e-03
-8.192000e-03 8.168916e-03
-9.011200e-03 7.407499e-03
-9.830400e-03 7.697784e-03
-1.064960e-02 6.561127e-03
-1.146880e-02 4.520398e-03
-1.228800e-02 4.572649e-03
-1.310720e-02 3.142930e-03
-1.474560e-02 3.229981e-03
-1.638400e-02 3.980222e-03
-1.802240e-02 5.302733e-04
-1.966080e-02 -2.083931e-03
-2.129920e-02 -4.462576e-03
-2.293760e-02 -2.842204e-03
-2.457600e-02 -1.779778e-03
-2.621440e-02 -1.853158e-03
-2.949120e-02 -5.189299e-03
-3.276800e-02 -2.647715e-03
-3.604480e-02 -2.209895e-03
-3.932160e-02 -5.435786e-03
-4.259840e-02 -9.509629e-04
-4.587520e-02 -6.417753e-04
-4.915200e-02 3.977904e-03
-5.242880e-02 4.110192e-03
-5.898240e-02 6.256394e-03
-6.553600e-02 4.424151e-04
-7.208960e-02 1.760482e-03
-7.864320e-02 1.857698e-03
-8.519680e-02 1.776988e-03
-9.175040e-02 -1.076193e-03
-9.830400e-02 -4.041134e-03
-1.048576e-01 -3.933501e-03
-1.179648e-01 -3.961177e-03
-1.310720e-01 -4.016539e-05
-1.441792e-01 -2.947276e-04
-1.572864e-01 -2.634062e-04
-1.703936e-01 1.215869e-03
-1.835008e-01 -9.891332e-04
-1.966080e-01 -6.546255e-04
-2.097152e-01 -7.754312e-04
-2.359296e-01 1.923903e-03
-2.621440e-01 -3.675982e-03
-2.883584e-01 2.047715e-03
-3.145728e-01 -4.335115e-04
-3.407872e-01 1.482217e-03
-3.670016e-01 1.346123e-03
-3.932160e-01 2.940945e-03
-4.194304e-01 -1.923613e-03
-4.718592e-01 -8.934691e-04
-5.242880e-01 -1.071060e-03
-5.767168e-01 6.208903e-05
-6.291456e-01 -2.151009e-03
-6.815744e-01 -1.478466e-03
-7.340032e-01 4.074244e-04
-7.864320e-01 -2.236095e-04
-8.388608e-01 -1.052412e-03
-9.437184e-01 1.155626e-03
-1.048576e+00 -5.345844e-04
-1.153434e+00 -1.021286e-04
-1.258291e+00 -2.166934e-04
-1.363149e+00 -1.208659e-04
-1.468006e+00 1.232398e-03
-1.572864e+00 -1.490884e-03
-1.677722e+00 -1.997066e-04
-1.887437e+00 -1.320199e-04
-2.097152e+00 -2.188465e-04
-2.306867e+00 -9.746654e-05
-2.516582e+00 1.060170e-03
-2.726298e+00 4.535585e-04
-2.936013e+00 8.781426e-04
-3.145728e+00 -3.472839e-04
-3.355443e+00 1.920810e-04
-3.774874e+00 2.684045e-04
-4.194304e+00 8.523585e-04
-4.613734e+00 9.748285e-05
-5.033165e+00 1.106600e-03
-5.452595e+00 1.052218e-03
-5.872026e+00 1.333750e-03
-6.291456e+00 8.158709e-04
-6.710886e+00 1.640912e-03
-7.549747e+00 1.317053e-03
-8.388608e+00 1.393324e-03
-9.227469e+00 2.425849e-03
-1.006633e+01 2.411504e-03
-1.090519e+01 2.136615e-03
-1.174405e+01 9.080535e-04
-1.258291e+01 9.003844e-04
-1.342177e+01 2.387404e-05
-1.509949e+01 1.271797e-04
-1.677722e+01 -8.665737e-04
-1.845494e+01 -2.427992e-03
-2.013266e+01 -2.251888e-03
-2.181038e+01 -3.918256e-03
-2.348810e+01 -4.460397e-03
-2.516582e+01 -6.754383e-03
-2.684355e+01 -8.176626e-03
-3.019899e+01 -1.112919e-02
-3.355443e+01 -7.338014e-03
-3.690988e+01 -1.082330e-02
-4.026532e+01 -1.740421e-03
-4.362076e+01 -6.915248e-03
-4.697620e+01 -7.841243e-03
-5.033165e+01 -5.472073e-03
\ No newline at end of file
diff --git a/src/sas/example_data/image_data/ISIS_98940_greyscale_bmp.bmp b/src/sas/example_data/image_data/ISIS_98940_greyscale_bmp.bmp
deleted file mode 100644
index 5459c73246..0000000000
Binary files a/src/sas/example_data/image_data/ISIS_98940_greyscale_bmp.bmp and /dev/null differ
diff --git a/src/sas/example_data/image_data/ISIS_98940_greyscale_gif.gif b/src/sas/example_data/image_data/ISIS_98940_greyscale_gif.gif
deleted file mode 100644
index 71e00d8946..0000000000
Binary files a/src/sas/example_data/image_data/ISIS_98940_greyscale_gif.gif and /dev/null differ
diff --git a/src/sas/example_data/image_data/ISIS_98940_greyscale_jpg.jpg b/src/sas/example_data/image_data/ISIS_98940_greyscale_jpg.jpg
deleted file mode 100644
index a4465c74df..0000000000
Binary files a/src/sas/example_data/image_data/ISIS_98940_greyscale_jpg.jpg and /dev/null differ
diff --git a/src/sas/example_data/image_data/ISIS_98940_greyscale_png.png b/src/sas/example_data/image_data/ISIS_98940_greyscale_png.png
deleted file mode 100644
index 13867e88f4..0000000000
Binary files a/src/sas/example_data/image_data/ISIS_98940_greyscale_png.png and /dev/null differ
diff --git a/src/sas/example_data/image_data/ISIS_98940_greyscale_tif.tif b/src/sas/example_data/image_data/ISIS_98940_greyscale_tif.tif
deleted file mode 100644
index 6c456db134..0000000000
Binary files a/src/sas/example_data/image_data/ISIS_98940_greyscale_tif.tif and /dev/null differ
diff --git a/src/sas/example_data/media/testdata_help.rst b/src/sas/example_data/media/testdata_help.rst
deleted file mode 100644
index 3e7ce53901..0000000000
--- a/src/sas/example_data/media/testdata_help.rst
+++ /dev/null
@@ -1,409 +0,0 @@
-.. testdata_help.rst
-
-Test Data
-=========
-
-Test data sets are included as a convenience to our users. Look in the \test
-sub-folder in your SasView installation folder.
-
-The test data sets are organized based on their data structure:
-
-- *1D data*
-- *convertible 1D data*
-- *2D data*
-- *coordinate data*
-- *image data*
-- *SESANS data*
-- *DLS data*
-- *NR data*
-- *save states*
-- *upcoming formats*
-- *other test data*
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-1D Data
-^^^^^^^
-1D data sets EITHER have:
-
-- at least two columns of data with *Q* on the x-axis and *I(Q)* (assumed to be
- in absolute units) on the y-axis; optionally, additional columns of data may
- carry uncertainty data, resolution data, etc, or other metadata.
-
-OR:
-
-- the *Q* data and the *I(Q)* data in separate files *with no other information*;
- data in the this format need to be converted to a single file multi-column format
- with the :ref:`File_Converter_Tool` before they can be analysed in SasView; see
- `Convertible 1D Data`_ below.
-
-1D Test Data
-............
-**Example data files are located in the \\1d_data sub-folder.**
-
-1umSlitSmearSphere
- - Simulated NIST USANS data from a 1% dispersion of 1 micron spheres in D2O.
-
-10wtAOT_Reline_120_reduced / Anton-Paar / saxsess_example
- - SAXS data from Anton-Paar SAXSess instruments saved in Otto Glatter's PDH format.
-
-33837rear_1D_1.75_16.5
- - TOF-SANS data from a magnetically-oriented surfactant liquid crystal collected on
- the SANS2D instrument at ISIS.
- - The files were output by the Mantid framework v3.6.
-
-AOT_Microemulsion
- - TOF-SANS data from Aerosol-OT surfactant-stabilised oil-in-water microemulsions
- collected on the LOQ instrument at ISIS.
- - Data are provided at three contrasts: core (oil core), drop (oil core + surfactant
- layer), and shell (surfactant layer).
- - The files were output by the Mantid framework v3.1.
- - Suitable for testing :ref:`Simultaneous_Fit_Mode` .
-
-apoferritin
- - TOF-SANS data from a solution of the protein apoferritin collected on the SANS2D
- instrument at ISIS.
- - Suitable for testing :ref:`P(r)_Inversion` .
-
-APS_DND-CAT
- - SAXS data from the DND-CAT instrument at the APS.
-
-AUSANS_run3_2_no_buffer / AUSANS_run4_1_with_buffer
- - SANS data from the old AUSANS instrument at HIFAR (now decommissioned).
-
-conalbumin
- - TOF-SANS data from a solution of the protein conalbumin collected on the SANS2D
- instrument at ISIS.
- - Suitable for testing :ref:`P(r)_Inversion` .
-
-FK403_0006_Nika / Lew_Sa3_DSM_QinA
- - USAXS data from the 9ID instrument at the APS.
-
-hSDS_D2O
- - TOF-SANS data from h25-sodium dodecyl sulphate solutions in D2O at 0.5wt%
- (just above the cmc), 2wt% (well above the cmc), and 2wt% but with 0.2mM
- NaCl electrolyte collected on the LOQ instrument at ISIS.
- - The files were output by the Mantid framework v3.1.
- - Suitable for testing charged S(Q) models.
-
-ISIS_83404 / ISIS_98929
- - TOF-SANS data from polyamide-6 fibres hydrated in D2O collected on the LOQ
- instrument at ISIS. The data exhibit a broad lamellar peak from the semi-
- crystalline nanostructure.
- - This is the *same data* as that in the BSL/OTOKO Z8300* / Z9800* convertible
- files (see `Convertible 1D Data`_) but in an amalgamated format!
- - Suitable for testing :ref:`Correlation_Function_Analysis` .
-
-ISIS_Polymer_Blend_RT2
- - TOF-SANS data from a monodisperse (Mw/Mn~1.03) polymer blend of 52wt%
- d8-polystyrene : 48wt% h8-polystyrene collected on the LOQ instrument at ISIS.
- - Mw~54180 g/mol, Rg~58 Ang.
- - The file was output by the Mantid framework v3.12.
- - Suitable for testing the mono_gauss_coil, poly_gauss_coil and rpa models.
-
-ISIS_Polymer_Blend_TK49
- - TOF-SANS data from a monodisperse (Mw/Mn~1.02) polymer blend of 49wt%
- d8-polystyrene : 51wt% h8-polystyrene collected on the LOQ instrument at ISIS.
- - Mw~77500g/mol, Rg~74 Ang.
- - The file was output by the Mantid framework v2.6.
- - Suitable for testing the mono_gauss_coil, poly_gauss_coil and rpa models.
-
-latex_smeared
- - SANS and USANS data from 500nm polymer latex particles dispersed in D2O.
-
-Ludox_silica
- - TOF-SANS data from a dispersion of Ludox silica in mother liquor collected
- on the LOQ instrument at ISIS.
- - The file was output by the Mantid framework v3.11.
-
-P123_D2O
- - TOF-SANS data from lyotropic liquid crystalline solutions of the non-ionic
- ABA block copolymer Pluronic P123 in D2O at 10wt%, 30wt%, and 40wt% collected
- on the LOQ instrument at ISIS.
- - This is the 1D radially-averaged form of the 2D data below (see `2D Data`_)!
- - The files were output by the Mantid framework v3.3.
- - Suitable for testing paracrystal models.
-
-VTMA
- - Multi-frame USAXS data from a thermo-mechanical analysis scan performed at
- the APS.
- - Suitable for testing :ref:`Batch_Fit_Mode` .
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-Convertible 1D Data
-^^^^^^^^^^^^^^^^^^^
-**Example data files are located in the \\convertible_files sub-folder.**
-
-APS_X / APS_Y
- - ASCII format 1D SAXS data output by a reduction software package at the APS.
- - Suitable for testing the :ref:`File_Converter_Tool` .
-
-FIT2D_I / FIT2D_Q
- - ASCII format 1D SAXS data output by the FIT2D software package at the ESRF.
- - Suitable for testing the :ref:`File_Converter_Tool` .
-
-Z8300*.I1D / Z8300*.QAX / Z9800*.I1D / Z9800*.QAX
- - Binary BSL/OTOKO format 1D TOF-SANS data from polyamide-6 fibres hydrated
- in D2O collected on the LOQ instrument at ISIS. The data exhibit a broad
- lamellar peak from the semi-crystalline nanostructure.
- - This is the *same data* as that in ISIS_83404 / ISIS_98929 (see `1D Data`_)
- but in a historical separated format developed at the SRS Daresbury!
- - Suitable for testing the :ref:`File_Converter_Tool` .
- - Suitable for testing :ref:`Correlation_Function_Analysis` after conversion.
-
-LMOG_100254_merged_ISIS2D
- - ASCII format TOF-SANS data from low-molecular weight organo-gelator system
- collected on the LOQ instrument at ISIS.
- - The data are written in the historical COLETTE (or RKH) 2D format.
- - Suitable for testing the :ref:`File_Converter_Tool` .
-
-YBCO_12685__ISIS2D
- - ASCII format TOF-SANS data from a Nb/YBaCuO superconductor sample collected
- on the SANS2D instrument at ISIS.
- - The data are written in the historical COLETTE (or RKH) 2D format.
- - Suitable for testing the :ref:`File_Converter_Tool` .
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-2D Data
-^^^^^^^
-2D data sets are data sets that give the reduced intensity for a given *Qx-Qy* bin.
-Depending on the file format, uncertainty data and metadata may also be present.
-
-2D Test Data
-............
-**Example data files are located in the \\2d_data sub-folder.**
-
-14250_2D_NoDetInfo_NXcanSAS_v3
- - TOF-SANS data from an unidentified sample collected on the LARMOR instrument
- at ISIS.
- - The data are written in a minimalist form of the NXcanSAS standard format.
-
-33837rear_2D_1.75_16.5
- - TOF-SANS data from a magnetically-oriented surfactant liquid crystal collected
- on the SANS2D instrument at ISIS.
- - The data are written in the NIST 2D format and two variants of the NXcanSAS
- standard format.
- - The NXcanSAS files were output by the Mantid framework v3.6 and v3.7.
-
-BAM_2D
- - SAXS data from an oriented Fe sample collected at BAM.
- - The data are written in a minimalist form of the NXcanSAS standard format.
-
-exp18_14_igor_2dqxqy
- - SANS data from a non-centrosymmetric measurement collected on the HiResSANS
- instrument at ORNL.
- - The data are written in the NIST 2D format.
-
-P123_D2O
- - TOF-SANS data from lyotropic liquid crystalline solutions of the non-ionic
- ABA block copolymer Pluronic P123 in D2O at 10wt%, 30wt%, and 40wt% collected
- on the LOQ instrument at ISIS.
- - This is the 2D form of the 1D radially-averaged data above (see `1D Data`_)!
- - The data are written in the NIST 2D format.
- - Suitable for testing paracrystal models.
-
-SILIC010
- - SANS data from a 2% dispersion of silica nanoparticles in D2O collected at ORNL.
- - The data are written in the NIST 2D format.
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-Coordinate Data
-^^^^^^^^^^^^^^^
-Coordinate data, such as PDB (Protein Data Bank) or OMF/SLD (micromagnetic simulation)
-files, and which describe a specific structure, are designed to be read and viewed in
-the :ref:`SANS_Calculator_Tool` .
-
-Coordinate Test Data
-....................
-**Example data files are located in the \\coordinate_data sub-folder.**
-
-1n04
- - PDB format data file describing the structure of the protein transferrin.
-
-2w0o
- - PDB format data file describing the structure of the protein apoferritin.
-
-A_Raw_Example-1
- - OMF format data file from a simulation of magnetic spheres.
-
-five_tetrahedra_cube
- - VTK format file describing a cube formed of five finite elements.
-
-sphere_R= x with x = 0_0025, 0_2025, 4 and 2500
- - VTK format data files describing a homogeneously magnetised sphere. The ratio R
- between nuclear and magnetic SLD is varied from mostly magnetic to only nuclear
- structural scattering.
-
-diamond
- - PDB format data file describing the structure of diamond.
-
-dna
- - PDB format data file describing the structure of DNA.
-
-sld_file
- - Example SLD format data file.
-
-mag_cylinder
- - SLD file that describes a single cylinder of radius 2nm and length of 4nm.
- The cylinder has equal nuclear and magnetic SLD, magnetised along the length.
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-Image Data
-^^^^^^^^^^
-Image data sets are designed to be read by the :ref:`Image_Viewer_Tool` .
-They can also be converted into synthetic 2D data.
-
-Image Test Data
-...............
-**Example data files are located in the \\image_data sub-folder.**
-
-ISIS_98940
- - TOF-SANS data from polyamide-6 fibres hydrated in D2O collected on the LOQ
- instrument at ISIS. The data exhibit a broad lamellar peak from the semi-
- crystalline nanostructure which, because of the orientation of the fibres,
- gives rise to an anisotropic 2D scattering pattern.
- - The image data is presented in Windows Bitmap (.bmp), GIF (.gif), JPEG (.jpg),
- Portable Network Grpahics (.png), and TIFF (.tif) formats.
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-SESANS Data
-^^^^^^^^^^^
-SESANS (Spin-Echo SANS) data sets primarily contain the normalised neutron
-polarisation as a function of the spin-echo length. Also see :ref:`SESANS` .
-SasView treats all files ending .ses as SESANS data.
-
-.. note:: The .ses format is still under development and may be subject to change.
-
-SESANS Test Data
-................
-**Example data files are located in the \\sesans_data sub-folder.**
-
-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| .
-
-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| .
-
-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| .
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-DLS Data
-^^^^^^^^
-DLS (Dynamic Light Scattering) data sets primarily contain the intensity
-autocorrelation function as a function of the delay time (in microseconds).
-
-DLS Test Data
-................
-**Example data files are located in the \\dls_data sub-folder.**
-
-dls_monodisperse / dls_polydisperse
- - DLS data from a very dilute dispersion of 3 nm polymer latex nanoparticles in
- h/d-water.
- - Suitable for testing the cumulants_dls model.
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-NR Data
-^^^^^^^
-Neutron (NR) or X-ray (XR) Reflectometry data sets primarily contain the
-interfacial reflectivity as a function of *Q*.
-
-.. note:: The Refl1D reflectivity model-fitting software uses the same fitting
- engine (Bumps) as SasView.
-
-NR Test Data
-................
-**Example data files are located in the \\nr_data sub-folder.**
-
-NR_Ni_down_state / NR_Ni_up_state
- - Polarised (spin down/up) NR data from a Ni multilayer sample.
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-Save States
-^^^^^^^^^^^
-Saved states are projects and analyses saved by the SasView program.
-
-A single analysis file contains the data and parameters for a single fit
-(.fit), p(r) inversion (.prv), or invariant calculation (.inv).
-
-A project file (.svs) contains the results for every active analysis in a
-SasView session.
-
-Saved State Test Data
-.....................
-fitstate.fitv
- - A saved fitting analysis.
- - The file contents are written in XML.
-
-prstate.prv
- - A saved P(r) analysis.
- - The file contents are written in XML.
-
-test.inv
- - A saved invariant analysis.
- - The file contents are written in XML.
-
-test002.inv
- - A saved invariant analysis.
- - The file contents are written in XML.
-
-constrained_fit_project
- - A saved fitting project.
- - The file contents are written in XML.
-
-fit_pr_and_invariant_project
- - A saved fitting and invariant analysis project.
- - The file contents are written in XML.
-
-project_multiplicative_constraint
- - A saved fitting project with multiple parameter constraints.
- - The file contents are written in XML.
-
-project_new_style
- - A complex saved fitting project.
- - The file contents are written in JSON.
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-Upcoming Formats
-^^^^^^^^^^^^^^^^
-Data in this folder are in formats that are not yet implemented in SasView but
-which might be in future versions of the program.
-
-1000A_sphere_sm
- - CanSAS 1D format data from 1000 |Ang| spheres.
- - This version of the format was written by the NIST IGOR reduction software
- (cf. similar xml data in the `1D Data`_ folder).
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-Other Test Data
-^^^^^^^^^^^^^^^
-Data in this folder include weights for testing user-defined distributions (i.e.,
-polydispersity) on angular (theta/phi) or size (radius/length) parameters.
-
-.. note:: Please read the help documentation on :ref:`polydispersityhelp` before
- attempting to use user-defined distributions.
-
-dist_THETA_weights.txt
-
-phi_weights.txt
-
-radius_dist.txt
-
-THETA_weights.txt
-
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
-.. note:: This help document was last changed by Steve King, 26Oct2021
diff --git a/src/sas/example_data/nr_data/NR_Ni_down_state.txt b/src/sas/example_data/nr_data/NR_Ni_down_state.txt
deleted file mode 100644
index 5712f26855..0000000000
--- a/src/sas/example_data/nr_data/NR_Ni_down_state.txt
+++ /dev/null
@@ -1,270 +0,0 @@
-0.0135131 0.961716 0.0289101
-0.0136482 0.928560 0.0257264
-0.0137847 0.927453 0.0245886
-0.0139226 0.941584 0.0237276
-0.0140618 0.955294 0.0231578
-0.0142024 0.969653 0.0225102
-0.0143444 0.925495 0.0205497
-0.0144879 0.946830 0.0214205
-0.0146328 0.960356 0.0229919
-0.0147791 0.969672 0.0228891
-0.0149269 0.994970 0.0221259
-0.0150762 0.988369 0.0204817
-0.0152269 0.957256 0.0201544
-0.0153792 0.989881 0.0217797
-0.0155330 0.980922 0.0198305
-0.0156883 0.981569 0.0190783
-0.0158452 0.989446 0.0204594
-0.0160036 0.983710 0.0194286
-0.0161637 0.983005 0.0184112
-0.0163253 0.995114 0.0194257
-0.0164886 0.956886 0.0175143
-0.0166535 0.959668 0.0181797
-0.0168200 0.982260 0.0185512
-0.0169882 0.958189 0.0166085
-0.0171581 0.987396 0.0175854
-0.0173297 0.968367 0.0168996
-0.0175030 0.957182 0.0162304
-0.0176780 0.988894 0.0168458
-0.0178548 0.960474 0.0158700
-0.0180333 0.995827 0.0165555
-0.0182136 0.988815 0.0158878
-0.0183958 1.00000 0.0167942
-0.0185797 0.977605 0.0164546
-0.0187655 0.981470 0.0172425
-0.0189532 0.946679 0.0162052
-0.0191427 0.949973 0.0154345
-0.0193341 0.953328 0.0157336
-0.0195275 0.942870 0.0146470
-0.0197228 0.865491 0.0135139
-0.0199200 0.724828 0.0116757
-0.0201192 0.607757 0.00934533
-0.0203204 0.482825 0.00772872
-0.0205236 0.415805 0.00706963
-0.0207288 0.431391 0.00668147
-0.0209361 0.468545 0.00707058
-0.0211455 0.440465 0.00739142
-0.0213569 0.360291 0.00659603
-0.0215705 0.265286 0.00458124
-0.0217862 0.190373 0.00337329
-0.0220041 0.131369 0.00277100
-0.0222241 0.116842 0.00275864
-0.0224463 0.135662 0.00274717
-0.0226708 0.175561 0.00299595
-0.0228975 0.203123 0.00322181
-0.0231265 0.215788 0.00351678
-0.0233578 0.208668 0.00369891
-0.0235913 0.184629 0.00369386
-0.0238272 0.140462 0.00306832
-0.0240655 0.0956962 0.00220858
-0.0243062 0.0625630 0.00154711
-0.0245492 0.0427102 0.00111663
-0.0247947 0.0387433 0.000991448
-0.0250427 0.0446114 0.00103143
-0.0252931 0.0598101 0.00122246
-0.0255460 0.0789298 0.00149030
-0.0258015 0.0905049 0.00163303
-0.0260595 0.0953088 0.00171869
-0.0263201 0.0928272 0.00168653
-0.0265833 0.0802002 0.00149458
-0.0268491 0.0624360 0.00202876
-0.0271176 0.0475461 0.00106416
-0.0273888 0.0293066 0.000759623
-0.0276627 0.0177505 0.000549906
-0.0279393 0.0158879 0.000535357
-0.0282187 0.0195091 0.000635344
-0.0285009 0.0271216 0.000780177
-0.0287859 0.0357927 0.000946546
-0.0290738 0.0431081 0.00101791
-0.0293645 0.0483732 0.000976205
-0.0296582 0.0476611 0.000891638
-0.0299547 0.0434431 0.000841549
-0.0302543 0.0350126 0.000771050
-0.0305568 0.0249405 0.000608008
-0.0308624 0.0165013 0.000444320
-0.0311710 0.0102057 0.000353606
-0.0314827 0.00753721 0.000321873
-0.0317976 0.00745373 0.000306921
-0.0321155 0.0110146 0.000372374
-0.0324367 0.0164208 0.000453754
-0.0327611 0.0201040 0.000483163
-0.0330887 0.0225158 0.000530436
-0.0334196 0.0233820 0.000535194
-0.0337537 0.0212166 0.000455583
-0.0340913 0.0177449 0.000421772
-0.0344322 0.0128987 0.000342278
-0.0347765 0.00840363 0.000262032
-0.0351243 0.00520726 0.000199761
-0.0354755 0.00322697 0.000160004
-0.0358303 0.00396699 0.000175721
-0.0361886 0.00549414 0.000209278
-0.0365505 0.00795821 0.000263088
-0.0369160 0.0112167 0.000291701
-0.0372851 0.0117972 0.000329579
-0.0376580 0.0116843 0.000318453
-0.0380346 0.0102174 0.000281684
-0.0384149 0.00790020 0.000256543
-0.0387991 0.00572115 0.000193975
-0.0391871 0.00334086 0.000151395
-0.0395789 0.00241902 0.000126783
-0.0399747 0.00242089 0.000115682
-0.0403745 0.00298051 0.000151159
-0.0407782 0.00449386 0.000169450
-0.0411860 0.00559413 0.000171939
-0.0415978 0.00656132 0.000194755
-0.0420138 0.00615893 0.000197202
-0.0424340 0.00515349 0.000160442
-0.0428583 0.00367690 0.000131414
-0.0432869 0.00240650 0.000110371
-0.0437197 0.00136148 9.10878e-005
-0.0441569 0.00109911 7.49597e-005
-0.0445985 0.00148090 7.89773e-005
-0.0450445 0.00215200 9.46369e-005
-0.0454949 0.00288529 0.000119962
-0.0459499 0.00340265 0.000138753
-0.0464094 0.00302818 0.000138364
-0.0468735 0.00265330 0.000114874
-0.0473422 0.00186224 8.99007e-005
-0.0478156 0.00130027 6.88261e-005
-0.0482938 0.000729895 5.01516e-005
-0.0487767 0.000733598 5.29683e-005
-0.0492645 0.000965806 6.66057e-005
-0.0497571 0.00122742 8.04649e-005
-0.0502547 0.00188900 9.17640e-005
-0.0507573 0.00197926 9.69844e-005
-0.0512648 0.00194916 9.89258e-005
-0.0517775 0.00121589 7.89538e-005
-0.0522953 0.000764875 6.22980e-005
-0.0528182 0.000472794 4.84979e-005
-0.0533464 0.000506488 4.88253e-005
-0.0538799 0.000847941 4.51291e-005
-0.0544187 0.00109914 3.98390e-005
-0.0549628 0.00127840 4.34440e-005
-0.0555125 0.00127151 4.25206e-005
-0.0560676 0.00105505 3.97131e-005
-0.0566283 0.000656319 3.20738e-005
-0.0571946 0.000369127 2.30134e-005
-0.0577665 0.000256208 1.67293e-005
-0.0583442 0.000341549 1.80821e-005
-0.0589276 0.000525350 2.23722e-005
-0.0595169 0.000707067 2.80791e-005
-0.0601121 0.000732983 2.88039e-005
-0.0607132 0.000609604 2.44764e-005
-0.0613203 0.000402103 1.83544e-005
-0.0619335 0.000232529 1.48272e-005
-0.0625528 0.000159466 1.24213e-005
-0.0631784 0.000212669 1.31560e-005
-0.0638102 0.000301192 1.62700e-005
-0.0644483 0.000384585 1.80468e-005
-0.0650927 0.000392482 1.66049e-005
-0.0657437 0.000300217 1.54710e-005
-0.0664011 0.000174950 1.19922e-005
-0.0670651 0.000113914 8.40536e-006
-0.0677358 0.000129762 8.97984e-006
-0.0684131 0.000203802 1.11276e-005
-0.0690973 0.000261373 1.32348e-005
-0.0697882 0.000231401 1.18130e-005
-0.0704861 0.000189973 1.05043e-005
-0.0711910 0.000112650 7.75920e-006
-0.0719029 8.36777e-005 6.42533e-006
-0.0726219 9.53090e-005 6.92844e-006
-0.0733481 0.000129155 8.43305e-006
-0.0740816 0.000149337 9.16137e-006
-0.0748224 0.000142083 8.95509e-006
-0.0755707 0.000104498 8.11742e-006
-0.0763264 5.51500e-005 5.68376e-006
-0.0770896 4.56451e-005 4.60212e-006
-0.0778605 6.69216e-005 5.54031e-006
-0.0786391 0.000102127 6.83728e-006
-0.0794255 0.000109424 6.77086e-006
-0.0802198 7.91852e-005 6.01307e-006
-0.0810220 4.70756e-005 4.44617e-006
-0.0818322 3.45894e-005 3.60117e-006
-0.0826505 4.85846e-005 4.65928e-006
-0.0834770 6.54984e-005 5.05416e-006
-0.0843118 6.61836e-005 4.65011e-006
-0.0851549 5.40963e-005 4.45143e-006
-0.0860064 3.32253e-005 3.82976e-006
-0.0868665 2.77195e-005 3.22363e-006
-0.0877352 3.99215e-005 3.47155e-006
-0.0886125 4.85937e-005 3.86409e-006
-0.0894987 4.19518e-005 3.85924e-006
-0.0903936 2.93644e-005 3.51765e-006
-0.0912976 1.84919e-005 2.57534e-006
-0.0922106 2.28534e-005 2.60437e-006
-0.0931327 2.60631e-005 2.58705e-006
-0.0940640 3.32946e-005 2.96033e-006
-0.0950046 3.06952e-005 2.95997e-006
-0.0959547 1.96745e-005 2.49459e-006
-0.0969142 1.74632e-005 2.61927e-006
-0.0978834 2.36251e-005 2.99198e-006
-0.0988622 2.58019e-005 2.91423e-006
-0.0998508 2.28860e-005 2.61580e-006
-0.100849 1.83878e-005 2.18794e-006
-0.101858 1.84457e-005 2.11072e-006
-0.102876 1.86714e-005 2.00120e-006
-0.103905 2.19172e-005 2.15043e-006
-0.104944 1.99397e-005 2.04872e-006
-0.105994 1.63090e-005 1.80768e-006
-0.107054 1.58171e-005 1.75729e-006
-0.108124 1.68862e-005 1.78580e-006
-0.109205 1.74742e-005 1.85548e-006
-0.110297 1.36636e-005 1.69776e-006
-0.111400 1.13221e-005 1.48611e-006
-0.112514 1.58675e-005 1.83587e-006
-0.113640 1.80107e-005 2.12691e-006
-0.114776 1.38732e-005 1.96903e-006
-0.115924 1.43731e-005 2.17735e-006
-0.117083 1.21113e-005 1.96583e-006
-0.118254 1.20323e-005 1.74579e-006
-0.119436 1.39372e-005 1.70376e-006
-0.120631 1.26248e-005 1.43339e-006
-0.121837 1.18092e-005 1.33477e-006
-0.123055 1.29617e-005 1.41826e-006
-0.124286 1.39771e-005 1.69843e-006
-0.125529 1.10016e-005 1.74992e-006
-0.126784 1.12125e-005 1.77286e-006
-0.128052 1.13120e-005 1.49003e-006
-0.129332 1.26270e-005 1.34613e-006
-0.130626 1.35165e-005 1.35823e-006
-0.131932 1.25121e-005 1.59387e-006
-0.133251 6.50278e-006 1.30668e-006
-0.134584 9.58740e-006 1.43288e-006
-0.135930 9.51385e-006 1.12552e-006
-0.137289 9.11121e-006 1.10765e-006
-0.138662 8.82149e-006 1.38154e-006
-0.140048 9.66351e-006 1.52420e-006
-0.141449 9.53824e-006 1.18517e-006
-0.142863 9.40040e-006 1.09195e-006
-0.144292 9.20342e-006 1.44739e-006
-0.145735 7.99837e-006 1.40429e-006
-0.147192 8.42277e-006 1.08536e-006
-0.148664 8.17632e-006 1.11240e-006
-0.150151 7.03281e-006 1.33254e-006
-0.151652 5.72622e-006 1.04311e-006
-0.153169 6.51698e-006 9.04852e-007
-0.154701 7.76097e-006 1.40378e-006
-0.156248 4.49492e-006 1.07033e-006
-0.157810 7.04137e-006 9.64938e-007
-0.159388 9.37001e-006 1.53602e-006
-0.160982 5.36727e-006 1.20574e-006
-0.162592 6.28461e-006 9.28192e-007
-0.164218 7.18453e-006 1.40781e-006
-0.165860 5.42702e-006 1.19363e-006
-0.167519 6.21826e-006 9.48908e-007
-0.169194 7.50868e-006 1.47579e-006
-0.170886 5.88385e-006 1.09746e-006
-0.172595 5.63279e-006 1.08928e-006
-0.174321 6.17295e-006 1.39311e-006
-0.176064 5.90737e-006 9.81572e-007
-0.177824 5.69360e-006 1.37163e-006
-0.179603 7.94174e-006 1.48206e-006
-0.181399 7.79740e-006 1.37861e-006
-0.183213 5.91423e-006 1.43756e-006
-0.185045 5.62244e-006 1.00030e-006
-0.186895 5.28405e-006 1.37394e-006
-0.188764 6.66913e-006 1.22218e-006
-0.190652 7.24359e-006 1.63249e-006
-0.192558 5.17379e-006 1.27412e-006
-0.194484 5.19469e-006 1.25254e-006
-0.196429 7.03632e-006 1.64492e-006
\ No newline at end of file
diff --git a/src/sas/example_data/nr_data/NR_Ni_up_state.txt b/src/sas/example_data/nr_data/NR_Ni_up_state.txt
deleted file mode 100644
index 55784b501f..0000000000
--- a/src/sas/example_data/nr_data/NR_Ni_up_state.txt
+++ /dev/null
@@ -1,271 +0,0 @@
-0.0135131 0.890444 0.0262786
-0.0136482 0.935330 0.0259193
-0.0137847 0.937904 0.0247850
-0.0139226 0.920789 0.0227660
-0.0140618 0.900099 0.0212259
-0.0142024 0.945226 0.0217617
-0.0143444 0.951055 0.0212824
-0.0144879 0.957775 0.0219603
-0.0146328 0.928407 0.0220038
-0.0147791 0.938651 0.0220779
-0.0149269 0.942624 0.0203130
-0.0150762 0.968576 0.0203592
-0.0152269 0.963471 0.0204578
-0.0153792 1.00000 0.0218980
-0.0155330 0.956413 0.0192828
-0.0156883 0.967985 0.0189510
-0.0158452 0.983214 0.0204685
-0.0160036 0.975873 0.0191942
-0.0161637 0.970828 0.0180809
-0.0163253 0.953108 0.0182468
-0.0164886 0.965581 0.0177873
-0.0166535 0.992478 0.0190076
-0.0168200 0.958453 0.0179890
-0.0169882 0.992206 0.0176097
-0.0171581 0.955405 0.0168827
-0.0173297 0.921141 0.0155541
-0.0175030 0.945313 0.0160285
-0.0176780 0.968827 0.0161772
-0.0178548 0.963786 0.0157828
-0.0180333 0.976643 0.0159298
-0.0182136 0.997707 0.0161089
-0.0183958 0.999089 0.0167029
-0.0185797 0.958310 0.0159275
-0.0187655 0.957777 0.0166667
-0.0189532 0.958045 0.0163302
-0.0191427 0.975430 0.0158459
-0.0193341 0.997848 0.0166963
-0.0195275 0.988457 0.0152566
-0.0197228 0.956352 0.0148362
-0.0199200 0.961294 0.0151805
-0.0201192 0.944681 0.0133290
-0.0203204 0.950151 0.0139594
-0.0205236 0.952151 0.0144395
-0.0207288 0.962761 0.0136300
-0.0209361 0.952821 0.0129448
-0.0211455 0.935431 0.0142022
-0.0213569 0.931837 0.0145305
-0.0215705 0.934838 0.0129845
-0.0217862 0.919501 0.0121554
-0.0220041 0.917384 0.0131459
-0.0222241 0.912095 0.0137868
-0.0224463 0.900258 0.0129017
-0.0226708 0.863043 0.0110902
-0.0228975 0.804609 0.00998542
-0.0231265 0.702971 0.00907879
-0.0233578 0.582803 0.00835776
-0.0235913 0.499274 0.00813344
-0.0238272 0.457627 0.00737342
-0.0240655 0.457010 0.00685862
-0.0243062 0.414854 0.00597847
-0.0245492 0.321860 0.00451427
-0.0247947 0.231179 0.00323022
-0.0250427 0.178828 0.00254536
-0.0252931 0.173932 0.00250011
-0.0255460 0.208037 0.00293913
-0.0258015 0.243198 0.00334274
-0.0260595 0.253268 0.00347777
-0.0263201 0.226739 0.00310213
-0.0265833 0.183134 0.00264496
-0.0268491 0.118744 0.00277693
-0.0271176 0.0779644 0.00131408
-0.0273888 0.0534515 0.000960760
-0.0276627 0.0600233 0.00105750
-0.0279393 0.0860045 0.00137475
-0.0282187 0.114457 0.00172018
-0.0285009 0.132804 0.00195653
-0.0287859 0.135787 0.00207031
-0.0290738 0.122882 0.00186907
-0.0293645 0.0954101 0.00138548
-0.0296582 0.0639541 0.00100915
-0.0299547 0.0369641 0.000705270
-0.0302543 0.0230399 0.000556493
-0.0305568 0.0230098 0.000527283
-0.0308624 0.0336483 0.000635125
-0.0311710 0.0482873 0.000846293
-0.0314827 0.0609644 0.000983252
-0.0317976 0.0697305 0.00100906
-0.0321155 0.0677983 0.000970672
-0.0324367 0.0579627 0.000906563
-0.0327611 0.0427337 0.000702598
-0.0330887 0.0282752 0.000546546
-0.0334196 0.0159950 0.000389415
-0.0337537 0.0108447 0.000287468
-0.0340913 0.0126007 0.000322600
-0.0344322 0.0192608 0.000403920
-0.0347765 0.0267967 0.000510294
-0.0351243 0.0333365 0.000559690
-0.0354755 0.0371050 0.000596374
-0.0358303 0.0331868 0.000557501
-0.0361886 0.0280282 0.000478515
-0.0365505 0.0207209 0.000388521
-0.0369160 0.0121958 0.000300031
-0.0372851 0.00746941 0.000216308
-0.0376580 0.00586737 0.000190893
-0.0380346 0.00745861 0.000236754
-0.0384149 0.0120105 0.000311255
-0.0387991 0.0152087 0.000327587
-0.0391871 0.0183588 0.000388454
-0.0395789 0.0183722 0.000373042
-0.0399747 0.0168055 0.000316003
-0.0403745 0.0129610 0.000285392
-0.0407782 0.00760377 0.000220562
-0.0411860 0.00493496 0.000147263
-0.0415978 0.00296770 0.000122952
-0.0420138 0.00406351 0.000148090
-0.0424340 0.00592403 0.000174364
-0.0428583 0.00826475 0.000202906
-0.0432869 0.00974176 0.000239734
-0.0437197 0.0103830 0.000248928
-0.0441569 0.00835037 0.000215107
-0.0445985 0.00641313 0.000164260
-0.0450445 0.00378030 0.000119854
-0.0454949 0.00247600 9.51508e-005
-0.0459499 0.00194234 9.89274e-005
-0.0464094 0.00288153 0.000120924
-0.0468735 0.00389862 0.000132749
-0.0473422 0.00509683 0.000139483
-0.0478156 0.00545632 0.000142910
-0.0482938 0.00521387 0.000133907
-0.0487767 0.00423846 0.000120710
-0.0492645 0.00280647 9.49906e-005
-0.0497571 0.00195349 7.91897e-005
-0.0502547 0.00123686 7.18016e-005
-0.0507573 0.00161302 8.75042e-005
-0.0512648 0.00249490 0.000111290
-0.0517775 0.00333323 0.000127660
-0.0522953 0.00373402 0.000132958
-0.0528182 0.00310304 0.000119289
-0.0533464 0.00233205 0.000103688
-0.0538799 0.00137475 5.84675e-005
-0.0544187 0.000862859 3.47591e-005
-0.0549628 0.000794436 3.22238e-005
-0.0555125 0.00124380 4.09830e-005
-0.0560676 0.00180554 5.09379e-005
-0.0566283 0.00214211 5.63167e-005
-0.0571946 0.00207049 5.22190e-005
-0.0577665 0.00151467 4.06905e-005
-0.0583442 0.000918109 3.00631e-005
-0.0589276 0.000523212 2.09745e-005
-0.0595169 0.000454332 2.03172e-005
-0.0601121 0.000735518 2.79901e-005
-0.0607132 0.00108549 3.14789e-005
-0.0613203 0.00136057 3.44964e-005
-0.0619335 0.00121586 3.34158e-005
-0.0625528 0.000861177 2.78032e-005
-0.0631784 0.000462963 1.73513e-005
-0.0638102 0.000297269 1.45077e-005
-0.0644483 0.000348487 1.63272e-005
-0.0650927 0.000596505 2.06857e-005
-0.0657437 0.000788588 2.49641e-005
-0.0664011 0.000792275 2.49458e-005
-0.0670651 0.000595311 2.04429e-005
-0.0677358 0.000335338 1.45775e-005
-0.0684131 0.000199648 1.03786e-005
-0.0690973 0.000249447 1.21945e-005
-0.0697882 0.000400587 1.53933e-005
-0.0704861 0.000484298 1.67965e-005
-0.0711910 0.000504908 1.67182e-005
-0.0719029 0.000369647 1.36735e-005
-0.0726219 0.000203649 9.63227e-006
-0.0733481 0.000142743 7.77255e-006
-0.0740816 0.000194778 1.04837e-005
-0.0748224 0.000298843 1.25264e-005
-0.0755707 0.000345177 1.47736e-005
-0.0763264 0.000300334 1.30570e-005
-0.0770896 0.000202304 9.43365e-006
-0.0778605 0.000135146 7.41379e-006
-0.0786391 0.000123260 6.90168e-006
-0.0794255 0.000184296 8.85156e-006
-0.0802198 0.000237201 1.02218e-005
-0.0810220 0.000214790 9.11023e-006
-0.0818322 0.000150690 7.18279e-006
-0.0826505 9.00454e-005 5.94710e-006
-0.0834770 9.03782e-005 5.68063e-006
-0.0843118 0.000141873 6.65217e-006
-0.0851549 0.000163560 7.63910e-006
-0.0860064 0.000140535 7.78581e-006
-0.0868665 8.93858e-005 6.03004e-006
-0.0877352 5.92666e-005 4.20128e-006
-0.0886125 7.64039e-005 4.82042e-006
-0.0894987 0.000114803 6.52339e-006
-0.0903936 0.000104782 6.40088e-006
-0.0912976 9.52229e-005 5.82799e-006
-0.0922106 7.06955e-005 4.50775e-006
-0.0931327 6.13081e-005 3.90124e-006
-0.0940640 7.00385e-005 4.21881e-006
-0.0950046 8.86484e-005 5.05629e-006
-0.0959547 7.72893e-005 4.88504e-006
-0.0969142 5.64858e-005 4.53387e-006
-0.0978834 4.76953e-005 4.16508e-006
-0.0988622 5.88348e-005 4.27643e-006
-0.0998508 6.48796e-005 4.20775e-006
-0.100849 6.28582e-005 4.03470e-006
-0.101858 4.47171e-005 3.24721e-006
-0.102876 4.03740e-005 2.88885e-006
-0.103905 5.14897e-005 3.19467e-006
-0.104944 5.35973e-005 3.27317e-006
-0.105994 4.52867e-005 2.94382e-006
-0.107054 4.09899e-005 2.78586e-006
-0.108124 3.89382e-005 2.65950e-006
-0.109205 4.50738e-005 2.85791e-006
-0.110297 4.60581e-005 2.99755e-006
-0.111400 3.75724e-005 2.73234e-006
-0.112514 3.48787e-005 2.73813e-006
-0.113640 3.25430e-005 2.75431e-006
-0.114776 3.53942e-005 3.04983e-006
-0.115924 4.39496e-005 3.71032e-006
-0.117083 3.17644e-005 3.11403e-006
-0.118254 2.71429e-005 2.55242e-006
-0.119436 3.51949e-005 2.66951e-006
-0.120631 3.38018e-005 2.29772e-006
-0.121837 2.76843e-005 1.99876e-006
-0.123055 2.47541e-005 1.94364e-006
-0.124286 2.72585e-005 2.26720e-006
-0.125529 3.07760e-005 2.86434e-006
-0.126784 2.76326e-005 2.72626e-006
-0.128052 2.75574e-005 2.27391e-006
-0.129332 2.50036e-005 1.83227e-006
-0.130626 2.48078e-005 1.80178e-006
-0.131932 2.66661e-005 2.21521e-006
-0.133251 2.57189e-005 2.50880e-006
-0.134584 2.10161e-005 2.03183e-006
-0.135930 2.37672e-005 1.76491e-006
-0.137289 2.28594e-005 1.74215e-006
-0.138662 1.80161e-005 1.94190e-006
-0.140048 1.92866e-005 2.11669e-006
-0.141449 1.71485e-005 1.54830e-006
-0.142863 1.67488e-005 1.43106e-006
-0.144292 1.72791e-005 1.94554e-006
-0.145735 1.69174e-005 2.00432e-006
-0.147192 1.66274e-005 1.49065e-006
-0.148664 1.71027e-005 1.54594e-006
-0.150151 1.86616e-005 2.11933e-006
-0.151652 1.26504e-005 1.49963e-006
-0.153169 1.31255e-005 1.26642e-006
-0.154701 1.48463e-005 1.90985e-006
-0.156248 1.46561e-005 1.88141e-006
-0.157810 1.43918e-005 1.34402e-006
-0.159388 1.41340e-005 1.85734e-006
-0.160982 1.35302e-005 1.87224e-006
-0.162592 1.41379e-005 1.36227e-006
-0.164218 1.47340e-005 1.97722e-006
-0.165860 1.34600e-005 1.84475e-006
-0.167519 1.25573e-005 1.35258e-006
-0.169194 1.12740e-005 1.78517e-006
-0.170886 1.56259e-005 1.82379e-006
-0.172595 1.53380e-005 1.81382e-006
-0.174321 9.92309e-006 1.74326e-006
-0.176064 1.13755e-005 1.35011e-006
-0.177824 1.25446e-005 1.99229e-006
-0.179603 1.08790e-005 1.67270e-006
-0.181399 1.07734e-005 1.56341e-006
-0.183213 1.12529e-005 1.94532e-006
-0.185045 1.11770e-005 1.38234e-006
-0.186895 1.10891e-005 1.95535e-006
-0.188764 1.42045e-005 1.75034e-006
-0.190652 1.54966e-005 2.33973e-006
-0.192558 1.20368e-005 1.90797e-006
-0.194484 1.15704e-005 1.87052e-006
-0.196429 1.01103e-005 1.94929e-006
-
diff --git a/src/sas/example_data/other_files/dist _THETA_weights.txt b/src/sas/example_data/other_files/dist _THETA_weights.txt
deleted file mode 100644
index 351796e38a..0000000000
--- a/src/sas/example_data/other_files/dist _THETA_weights.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-0 1
-1.5708 0.734602
\ No newline at end of file
diff --git a/src/sas/example_data/other_files/phi_weights.txt b/src/sas/example_data/other_files/phi_weights.txt
deleted file mode 100644
index eea4a99b4d..0000000000
--- a/src/sas/example_data/other_files/phi_weights.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-0 1
-3 0.011109
diff --git a/src/sas/example_data/other_files/radius_dist.txt b/src/sas/example_data/other_files/radius_dist.txt
deleted file mode 100644
index 636d426e17..0000000000
--- a/src/sas/example_data/other_files/radius_dist.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-5 1
-6 1
-4 1
-
diff --git a/src/sas/example_data/other_files/theta_weights.txt b/src/sas/example_data/other_files/theta_weights.txt
deleted file mode 100644
index d1b6648855..0000000000
--- a/src/sas/example_data/other_files/theta_weights.txt
+++ /dev/null
@@ -1,1000 +0,0 @@
-0 1
-0.00157237 0.999999
-0.00314474 0.999995
-0.00471712 0.999989
-0.00628949 0.99998
-0.00786186 0.999969
-0.00943423 0.999955
-0.0110066 0.999939
-0.012579 0.999921
-0.0141514 0.9999
-0.0157237 0.999876
-0.0172961 0.99985
-0.0188685 0.999822
-0.0204408 0.999791
-0.0220132 0.999758
-0.0235856 0.999722
-0.025158 0.999684
-0.0267303 0.999643
-0.0283027 0.9996
-0.0298751 0.999554
-0.0314474 0.999506
-0.0330198 0.999455
-0.0345922 0.999402
-0.0361646 0.999346
-0.0377369 0.999288
-0.0393093 0.999228
-0.0408817 0.999165
-0.0424541 0.999099
-0.0440264 0.999031
-0.0455988 0.998961
-0.0471712 0.998888
-0.0487435 0.998813
-0.0503159 0.998735
-0.0518883 0.998655
-0.0534607 0.998572
-0.055033 0.998487
-0.0566054 0.998399
-0.0581778 0.998309
-0.0597502 0.998217
-0.0613225 0.998122
-0.0628949 0.998024
-0.0644673 0.997924
-0.0660396 0.997822
-0.067612 0.997717
-0.0691844 0.99761
-0.0707568 0.9975
-0.0723291 0.997388
-0.0739015 0.997273
-0.0754739 0.997156
-0.0770462 0.997036
-0.0786186 0.996914
-0.080191 0.99679
-0.0817634 0.996663
-0.0833357 0.996534
-0.0849081 0.996402
-0.0864805 0.996268
-0.0880529 0.996131
-0.0896252 0.995992
-0.0911976 0.99585
-0.09277 0.995706
-0.0943423 0.99556
-0.0959147 0.995411
-0.0974871 0.995259
-0.0990595 0.995106
-0.100632 0.994949
-0.102204 0.994791
-0.103777 0.99463
-0.105349 0.994466
-0.106921 0.9943
-0.108494 0.994132
-0.110066 0.993961
-0.111638 0.993788
-0.113211 0.993612
-0.114783 0.993434
-0.116356 0.993254
-0.117928 0.993071
-0.1195 0.992885
-0.121073 0.992697
-0.122645 0.992507
-0.124217 0.992315
-0.12579 0.99212
-0.127362 0.991922
-0.128935 0.991722
-0.130507 0.99152
-0.132079 0.991315
-0.133652 0.991108
-0.135224 0.990899
-0.136796 0.990687
-0.138369 0.990473
-0.139941 0.990256
-0.141514 0.990037
-0.143086 0.989815
-0.144658 0.989592
-0.146231 0.989365
-0.147803 0.989137
-0.149375 0.988906
-0.150948 0.988672
-0.15252 0.988436
-0.154092 0.988198
-0.155665 0.987957
-0.157237 0.987714
-0.15881 0.987469
-0.160382 0.987221
-0.161954 0.986971
-0.163527 0.986718
-0.165099 0.986464
-0.166671 0.986206
-0.168244 0.985947
-0.169816 0.985685
-0.171389 0.98542
-0.172961 0.985154
-0.174533 0.984884
-0.176106 0.984613
-0.177678 0.984339
-0.17925 0.984063
-0.180823 0.983784
-0.182395 0.983504
-0.183968 0.98322
-0.18554 0.982935
-0.187112 0.982647
-0.188685 0.982357
-0.190257 0.982064
-0.191829 0.981769
-0.193402 0.981472
-0.194974 0.981172
-0.196547 0.98087
-0.198119 0.980566
-0.199691 0.980259
-0.201264 0.97995
-0.202836 0.979639
-0.204408 0.979325
-0.205981 0.979009
-0.207553 0.978691
-0.209126 0.978371
-0.210698 0.978048
-0.21227 0.977723
-0.213843 0.977395
-0.215415 0.977065
-0.216987 0.976733
-0.21856 0.976399
-0.220132 0.976062
-0.221705 0.975723
-0.223277 0.975382
-0.224849 0.975038
-0.226422 0.974692
-0.227994 0.974344
-0.229566 0.973994
-0.231139 0.973641
-0.232711 0.973286
-0.234283 0.972929
-0.235856 0.972569
-0.237428 0.972207
-0.239001 0.971843
-0.240573 0.971477
-0.242145 0.971108
-0.243718 0.970738
-0.24529 0.970364
-0.246862 0.969989
-0.248435 0.969611
-0.250007 0.969231
-0.25158 0.968849
-0.253152 0.968465
-0.254724 0.968078
-0.256297 0.96769
-0.257869 0.967298
-0.259441 0.966905
-0.261014 0.96651
-0.262586 0.966112
-0.264159 0.965712
-0.265731 0.96531
-0.267303 0.964905
-0.268876 0.964498
-0.270448 0.96409
-0.27202 0.963678
-0.273593 0.963265
-0.275165 0.96285
-0.276738 0.962432
-0.27831 0.962012
-0.279882 0.96159
-0.281455 0.961166
-0.283027 0.960739
-0.284599 0.960311
-0.286172 0.95988
-0.287744 0.959447
-0.289317 0.959012
-0.290889 0.958574
-0.292461 0.958135
-0.294034 0.957693
-0.295606 0.957249
-0.297178 0.956803
-0.298751 0.956355
-0.300323 0.955905
-0.301895 0.955452
-0.303468 0.954998
-0.30504 0.954541
-0.306613 0.954082
-0.308185 0.953621
-0.309757 0.953158
-0.31133 0.952692
-0.312902 0.952225
-0.314474 0.951756
-0.316047 0.951284
-0.317619 0.95081
-0.319192 0.950334
-0.320764 0.949856
-0.322336 0.949376
-0.323909 0.948894
-0.325481 0.948409
-0.327053 0.947923
-0.328626 0.947435
-0.330198 0.946944
-0.331771 0.946451
-0.333343 0.945956
-0.334915 0.94546
-0.336488 0.944961
-0.33806 0.94446
-0.339632 0.943957
-0.341205 0.943451
-0.342777 0.942944
-0.34435 0.942435
-0.345922 0.941924
-0.347494 0.94141
-0.349067 0.940895
-0.350639 0.940378
-0.352211 0.939858
-0.353784 0.939337
-0.355356 0.938813
-0.356929 0.938287
-0.358501 0.93776
-0.360073 0.93723
-0.361646 0.936699
-0.363218 0.936165
-0.36479 0.935629
-0.366363 0.935092
-0.367935 0.934552
-0.369508 0.93401
-0.37108 0.933467
-0.372652 0.932921
-0.374225 0.932373
-0.375797 0.931824
-0.377369 0.931272
-0.378942 0.930718
-0.380514 0.930163
-0.382086 0.929605
-0.383659 0.929046
-0.385231 0.928485
-0.386804 0.927921
-0.388376 0.927356
-0.389948 0.926789
-0.391521 0.926219
-0.393093 0.925648
-0.394665 0.925075
-0.396238 0.9245
-0.39781 0.923923
-0.399383 0.923344
-0.400955 0.922763
-0.402527 0.922181
-0.4041 0.921596
-0.405672 0.92101
-0.407244 0.920421
-0.408817 0.919831
-0.410389 0.919239
-0.411962 0.918644
-0.413534 0.918048
-0.415106 0.917451
-0.416679 0.916851
-0.418251 0.916249
-0.419823 0.915646
-0.421396 0.91504
-0.422968 0.914433
-0.424541 0.913824
-0.426113 0.913213
-0.427685 0.9126
-0.429258 0.911986
-0.43083 0.911369
-0.432402 0.910751
-0.433975 0.910131
-0.435547 0.909509
-0.43712 0.908885
-0.438692 0.908259
-0.440264 0.907632
-0.441837 0.907003
-0.443409 0.906372
-0.444981 0.905739
-0.446554 0.905104
-0.448126 0.904468
-0.449698 0.90383
-0.451271 0.90319
-0.452843 0.902548
-0.454416 0.901904
-0.455988 0.901259
-0.45756 0.900612
-0.459133 0.899963
-0.460705 0.899313
-0.462277 0.89866
-0.46385 0.898006
-0.465422 0.89735
-0.466995 0.896693
-0.468567 0.896033
-0.470139 0.895372
-0.471712 0.89471
-0.473284 0.894045
-0.474856 0.893379
-0.476429 0.892711
-0.478001 0.892042
-0.479574 0.89137
-0.481146 0.890697
-0.482718 0.890023
-0.484291 0.889346
-0.485863 0.888668
-0.487435 0.887988
-0.489008 0.887307
-0.49058 0.886624
-0.492153 0.885939
-0.493725 0.885253
-0.495297 0.884565
-0.49687 0.883875
-0.498442 0.883184
-0.500014 0.882491
-0.501587 0.881796
-0.503159 0.8811
-0.504732 0.880402
-0.506304 0.879702
-0.507876 0.879001
-0.509449 0.878298
-0.511021 0.877594
-0.512593 0.876888
-0.514166 0.87618
-0.515738 0.875471
-0.517311 0.874761
-0.518883 0.874048
-0.520455 0.873334
-0.522028 0.872619
-0.5236 0.871902
-0.525172 0.871183
-0.526745 0.870463
-0.528317 0.869741
-0.529889 0.869018
-0.531462 0.868293
-0.533034 0.867567
-0.534607 0.866839
-0.536179 0.866109
-0.537751 0.865379
-0.539324 0.864646
-0.540896 0.863912
-0.542468 0.863177
-0.544041 0.86244
-0.545613 0.861701
-0.547186 0.860961
-0.548758 0.86022
-0.55033 0.859477
-0.551903 0.858732
-0.553475 0.857986
-0.555047 0.857239
-0.55662 0.85649
-0.558192 0.85574
-0.559765 0.854988
-0.561337 0.854234
-0.562909 0.85348
-0.564482 0.852724
-0.566054 0.851966
-0.567626 0.851207
-0.569199 0.850447
-0.570771 0.849685
-0.572344 0.848921
-0.573916 0.848157
-0.575488 0.847391
-0.577061 0.846623
-0.578633 0.845854
-0.580205 0.845084
-0.581778 0.844312
-0.58335 0.843539
-0.584923 0.842765
-0.586495 0.841989
-0.588067 0.841212
-0.58964 0.840433
-0.591212 0.839654
-0.592784 0.838872
-0.594357 0.83809
-0.595929 0.837306
-0.597502 0.836521
-0.599074 0.835734
-0.600646 0.834946
-0.602219 0.834157
-0.603791 0.833366
-0.605363 0.832575
-0.606936 0.831781
-0.608508 0.830987
-0.61008 0.830191
-0.611653 0.829394
-0.613225 0.828596
-0.614798 0.827796
-0.61637 0.826996
-0.617942 0.826193
-0.619515 0.82539
-0.621087 0.824585
-0.622659 0.823779
-0.624232 0.822972
-0.625804 0.822164
-0.627377 0.821354
-0.628949 0.820543
-0.630521 0.819731
-0.632094 0.818918
-0.633666 0.818104
-0.635238 0.817288
-0.636811 0.816471
-0.638383 0.815653
-0.639956 0.814833
-0.641528 0.814013
-0.6431 0.813191
-0.644673 0.812368
-0.646245 0.811544
-0.647817 0.810719
-0.64939 0.809893
-0.650962 0.809065
-0.652535 0.808236
-0.654107 0.807407
-0.655679 0.806576
-0.657252 0.805743
-0.658824 0.80491
-0.660396 0.804076
-0.661969 0.80324
-0.663541 0.802404
-0.665114 0.801566
-0.666686 0.800727
-0.668258 0.799887
-0.669831 0.799046
-0.671403 0.798204
-0.672975 0.797361
-0.674548 0.796517
-0.67612 0.795671
-0.677692 0.794825
-0.679265 0.793977
-0.680837 0.793129
-0.68241 0.792279
-0.683982 0.791429
-0.685554 0.790577
-0.687127 0.789724
-0.688699 0.78887
-0.690271 0.788016
-0.691844 0.78716
-0.693416 0.786303
-0.694989 0.785445
-0.696561 0.784586
-0.698133 0.783727
-0.699706 0.782866
-0.701278 0.782004
-0.70285 0.781141
-0.704423 0.780277
-0.705995 0.779413
-0.707568 0.778547
-0.70914 0.77768
-0.710712 0.776813
-0.712285 0.775944
-0.713857 0.775075
-0.715429 0.774204
-0.717002 0.773333
-0.718574 0.77246
-0.720147 0.771587
-0.721719 0.770713
-0.723291 0.769838
-0.724864 0.768962
-0.726436 0.768085
-0.728008 0.767207
-0.729581 0.766329
-0.731153 0.765449
-0.732726 0.764569
-0.734298 0.763687
-0.73587 0.762805
-0.737443 0.761922
-0.739015 0.761038
-0.740587 0.760154
-0.74216 0.759268
-0.743732 0.758381
-0.745305 0.757494
-0.746877 0.756606
-0.748449 0.755717
-0.750022 0.754827
-0.751594 0.753937
-0.753166 0.753045
-0.754739 0.752153
-0.756311 0.75126
-0.757883 0.750366
-0.759456 0.749472
-0.761028 0.748576
-0.762601 0.74768
-0.764173 0.746783
-0.765745 0.745886
-0.767318 0.744987
-0.76889 0.744088
-0.770462 0.743188
-0.772035 0.742287
-0.773607 0.741386
-0.77518 0.740484
-0.776752 0.739581
-0.778324 0.738677
-0.779897 0.737773
-0.781469 0.736868
-0.783041 0.735962
-0.784614 0.735055
-0.786186 0.734148
-0.787759 0.73324
-0.789331 0.732332
-0.790903 0.731422
-0.792476 0.730513
-0.794048 0.729602
-0.79562 0.728691
-0.797193 0.727779
-0.798765 0.726866
-0.800338 0.725953
-0.80191 0.725039
-0.803482 0.724125
-0.805055 0.723209
-0.806627 0.722294
-0.808199 0.721377
-0.809772 0.72046
-0.811344 0.719543
-0.812917 0.718624
-0.814489 0.717705
-0.816061 0.716786
-0.817634 0.715866
-0.819206 0.714945
-0.820778 0.714024
-0.822351 0.713102
-0.823923 0.71218
-0.825495 0.711257
-0.827068 0.710334
-0.82864 0.70941
-0.830213 0.708485
-0.831785 0.70756
-0.833357 0.706634
-0.83493 0.705708
-0.836502 0.704781
-0.838074 0.703854
-0.839647 0.702926
-0.841219 0.701998
-0.842792 0.701069
-0.844364 0.70014
-0.845936 0.69921
-0.847509 0.69828
-0.849081 0.697349
-0.850653 0.696418
-0.852226 0.695486
-0.853798 0.694554
-0.855371 0.693621
-0.856943 0.692688
-0.858515 0.691754
-0.860088 0.69082
-0.86166 0.689886
-0.863232 0.688951
-0.864805 0.688016
-0.866377 0.68708
-0.86795 0.686144
-0.869522 0.685207
-0.871094 0.68427
-0.872667 0.683333
-0.874239 0.682395
-0.875811 0.681457
-0.877384 0.680518
-0.878956 0.679579
-0.880529 0.678639
-0.882101 0.6777
-0.883673 0.67676
-0.885246 0.675819
-0.886818 0.674878
-0.88839 0.673937
-0.889963 0.672995
-0.891535 0.672053
-0.893108 0.671111
-0.89468 0.670169
-0.896252 0.669226
-0.897825 0.668282
-0.899397 0.667339
-0.900969 0.666395
-0.902542 0.665451
-0.904114 0.664506
-0.905686 0.663561
-0.907259 0.662616
-0.908831 0.661671
-0.910404 0.660725
-0.911976 0.659779
-0.913548 0.658833
-0.915121 0.657886
-0.916693 0.65694
-0.918265 0.655993
-0.919838 0.655045
-0.92141 0.654098
-0.922983 0.65315
-0.924555 0.652202
-0.926127 0.651254
-0.9277 0.650305
-0.929272 0.649357
-0.930844 0.648408
-0.932417 0.647459
-0.933989 0.646509
-0.935562 0.64556
-0.937134 0.64461
-0.938706 0.64366
-0.940279 0.64271
-0.941851 0.641759
-0.943423 0.640809
-0.944996 0.639858
-0.946568 0.638907
-0.948141 0.637956
-0.949713 0.637005
-0.951285 0.636054
-0.952858 0.635103
-0.95443 0.634151
-0.956002 0.633199
-0.957575 0.632247
-0.959147 0.631295
-0.96072 0.630343
-0.962292 0.629391
-0.963864 0.628438
-0.965437 0.627486
-0.967009 0.626533
-0.968581 0.625581
-0.970154 0.624628
-0.971726 0.623675
-0.973298 0.622722
-0.974871 0.621769
-0.976443 0.620816
-0.978016 0.619863
-0.979588 0.618909
-0.98116 0.617956
-0.982733 0.617003
-0.984305 0.616049
-0.985877 0.615096
-0.98745 0.614142
-0.989022 0.613189
-0.990595 0.612235
-0.992167 0.611282
-0.993739 0.610328
-0.995312 0.609374
-0.996884 0.608421
-0.998456 0.607467
-1.00003 0.606513
-1.0016 0.605559
-1.00317 0.604606
-1.00475 0.603652
-1.00632 0.602698
-1.00789 0.601745
-1.00946 0.600791
-1.01104 0.599838
-1.01261 0.598884
-1.01418 0.597931
-1.01575 0.596977
-1.01732 0.596024
-1.0189 0.59507
-1.02047 0.594117
-1.02204 0.593164
-1.02361 0.59221
-1.02519 0.591257
-1.02676 0.590304
-1.02833 0.589351
-1.0299 0.588398
-1.03148 0.587446
-1.03305 0.586493
-1.03462 0.58554
-1.03619 0.584588
-1.03777 0.583635
-1.03934 0.582683
-1.04091 0.581731
-1.04248 0.580779
-1.04406 0.579827
-1.04563 0.578875
-1.0472 0.577923
-1.04877 0.576972
-1.05034 0.57602
-1.05192 0.575069
-1.05349 0.574118
-1.05506 0.573167
-1.05663 0.572216
-1.05821 0.571266
-1.05978 0.570315
-1.06135 0.569365
-1.06292 0.568415
-1.0645 0.567465
-1.06607 0.566515
-1.06764 0.565566
-1.06921 0.564617
-1.07079 0.563667
-1.07236 0.562718
-1.07393 0.56177
-1.0755 0.560821
-1.07708 0.559873
-1.07865 0.558925
-1.08022 0.557977
-1.08179 0.557029
-1.08336 0.556082
-1.08494 0.555135
-1.08651 0.554188
-1.08808 0.553241
-1.08965 0.552295
-1.09123 0.551349
-1.0928 0.550403
-1.09437 0.549457
-1.09594 0.548512
-1.09752 0.547567
-1.09909 0.546622
-1.10066 0.545678
-1.10223 0.544733
-1.10381 0.543789
-1.10538 0.542846
-1.10695 0.541902
-1.10852 0.540959
-1.11009 0.540017
-1.11167 0.539074
-1.11324 0.538132
-1.11481 0.53719
-1.11638 0.536249
-1.11796 0.535308
-1.11953 0.534367
-1.1211 0.533426
-1.12267 0.532486
-1.12425 0.531546
-1.12582 0.530607
-1.12739 0.529668
-1.12896 0.528729
-1.13054 0.527791
-1.13211 0.526853
-1.13368 0.525915
-1.13525 0.524978
-1.13683 0.524041
-1.1384 0.523104
-1.13997 0.522168
-1.14154 0.521232
-1.14311 0.520297
-1.14469 0.519362
-1.14626 0.518427
-1.14783 0.517493
-1.1494 0.516559
-1.15098 0.515626
-1.15255 0.514693
-1.15412 0.513761
-1.15569 0.512828
-1.15727 0.511897
-1.15884 0.510965
-1.16041 0.510035
-1.16198 0.509104
-1.16356 0.508174
-1.16513 0.507245
-1.1667 0.506316
-1.16827 0.505387
-1.16985 0.504459
-1.17142 0.503531
-1.17299 0.502604
-1.17456 0.501677
-1.17613 0.500751
-1.17771 0.499825
-1.17928 0.4989
-1.18085 0.497975
-1.18242 0.497051
-1.184 0.496127
-1.18557 0.495203
-1.18714 0.494281
-1.18871 0.493358
-1.19029 0.492436
-1.19186 0.491515
-1.19343 0.490594
-1.195 0.489674
-1.19658 0.488754
-1.19815 0.487835
-1.19972 0.486916
-1.20129 0.485997
-1.20286 0.48508
-1.20444 0.484163
-1.20601 0.483246
-1.20758 0.48233
-1.20915 0.481414
-1.21073 0.480499
-1.2123 0.479585
-1.21387 0.478671
-1.21544 0.477758
-1.21702 0.476845
-1.21859 0.475933
-1.22016 0.475021
-1.22173 0.47411
-1.22331 0.473199
-1.22488 0.472289
-1.22645 0.47138
-1.22802 0.470471
-1.2296 0.469563
-1.23117 0.468656
-1.23274 0.467749
-1.23431 0.466842
-1.23588 0.465937
-1.23746 0.465032
-1.23903 0.464127
-1.2406 0.463223
-1.24217 0.46232
-1.24375 0.461417
-1.24532 0.460515
-1.24689 0.459614
-1.24846 0.458713
-1.25004 0.457813
-1.25161 0.456913
-1.25318 0.456014
-1.25475 0.455116
-1.25633 0.454219
-1.2579 0.453322
-1.25947 0.452425
-1.26104 0.45153
-1.26262 0.450635
-1.26419 0.44974
-1.26576 0.448847
-1.26733 0.447954
-1.2689 0.447061
-1.27048 0.44617
-1.27205 0.445279
-1.27362 0.444389
-1.27519 0.443499
-1.27677 0.44261
-1.27834 0.441722
-1.27991 0.440834
-1.28148 0.439947
-1.28306 0.439061
-1.28463 0.438176
-1.2862 0.437291
-1.28777 0.436407
-1.28935 0.435524
-1.29092 0.434641
-1.29249 0.433759
-1.29406 0.432878
-1.29563 0.431998
-1.29721 0.431118
-1.29878 0.430239
-1.30035 0.429361
-1.30192 0.428483
-1.3035 0.427607
-1.30507 0.42673
-1.30664 0.425855
-1.30821 0.424981
-1.30979 0.424107
-1.31136 0.423234
-1.31293 0.422361
-1.3145 0.42149
-1.31608 0.420619
-1.31765 0.419749
-1.31922 0.41888
-1.32079 0.418011
-1.32237 0.417144
-1.32394 0.416277
-1.32551 0.41541
-1.32708 0.414545
-1.32865 0.41368
-1.33023 0.412817
-1.3318 0.411953
-1.33337 0.411091
-1.33494 0.41023
-1.33652 0.409369
-1.33809 0.408509
-1.33966 0.40765
-1.34123 0.406792
-1.34281 0.405934
-1.34438 0.405078
-1.34595 0.404222
-1.34752 0.403367
-1.3491 0.402512
-1.35067 0.401659
-1.35224 0.400806
-1.35381 0.399955
-1.35538 0.399104
-1.35696 0.398253
-1.35853 0.397404
-1.3601 0.396556
-1.36167 0.395708
-1.36325 0.394861
-1.36482 0.394015
-1.36639 0.39317
-1.36796 0.392326
-1.36954 0.391482
-1.37111 0.39064
-1.37268 0.389798
-1.37425 0.388957
-1.37583 0.388117
-1.3774 0.387278
-1.37897 0.38644
-1.38054 0.385602
-1.38212 0.384765
-1.38369 0.38393
-1.38526 0.383095
-1.38683 0.382261
-1.3884 0.381428
-1.38998 0.380595
-1.39155 0.379764
-1.39312 0.378934
-1.39469 0.378104
-1.39627 0.377275
-1.39784 0.376447
-1.39941 0.37562
-1.40098 0.374794
-1.40256 0.373969
-1.40413 0.373145
-1.4057 0.372322
-1.40727 0.371499
-1.40885 0.370677
-1.41042 0.369857
-1.41199 0.369037
-1.41356 0.368218
-1.41514 0.3674
-1.41671 0.366583
-1.41828 0.365767
-1.41985 0.364952
-1.42142 0.364137
-1.423 0.363324
-1.42457 0.362512
-1.42614 0.3617
-1.42771 0.360889
-1.42929 0.36008
-1.43086 0.359271
-1.43243 0.358463
-1.434 0.357656
-1.43558 0.35685
-1.43715 0.356045
-1.43872 0.355241
-1.44029 0.354438
-1.44187 0.353636
-1.44344 0.352834
-1.44501 0.352034
-1.44658 0.351235
-1.44815 0.350436
-1.44973 0.349639
-1.4513 0.348842
-1.45287 0.348047
-1.45444 0.347252
-1.45602 0.346458
-1.45759 0.345666
-1.45916 0.344874
-1.46073 0.344083
-1.46231 0.343293
-1.46388 0.342505
-1.46545 0.341717
-1.46702 0.34093
-1.4686 0.340144
-1.47017 0.339359
-1.47174 0.338575
-1.47331 0.337792
-1.47489 0.33701
-1.47646 0.336229
-1.47803 0.335449
-1.4796 0.33467
-1.48117 0.333891
-1.48275 0.333114
-1.48432 0.332338
-1.48589 0.331563
-1.48746 0.330789
-1.48904 0.330016
-1.49061 0.329244
-1.49218 0.328472
-1.49375 0.327702
-1.49533 0.326933
-1.4969 0.326165
-1.49847 0.325398
-1.50004 0.324631
-1.50162 0.323866
-1.50319 0.323102
-1.50476 0.322339
-1.50633 0.321577
-1.50791 0.320816
-1.50948 0.320055
-1.51105 0.319296
-1.51262 0.318538
-1.51419 0.317781
-1.51577 0.317025
-1.51734 0.31627
-1.51891 0.315516
-1.52048 0.314763
-1.52206 0.314011
-1.52363 0.31326
-1.5252 0.31251
-1.52677 0.311761
-1.52835 0.311013
-1.52992 0.310266
-1.53149 0.30952
-1.53306 0.308775
-1.53464 0.308032
-1.53621 0.307289
-1.53778 0.306547
-1.53935 0.305806
-1.54092 0.305067
-1.5425 0.304328
-1.54407 0.30359
-1.54564 0.302854
-1.54721 0.302118
-1.54879 0.301384
-1.55036 0.300651
-1.55193 0.299918
-1.5535 0.299187
-1.55508 0.298456
-1.55665 0.297727
-1.55822 0.296999
-1.55979 0.296272
-1.56137 0.295546
-1.56294 0.294821
-1.56451 0.294097
-1.56608 0.293374
-1.56766 0.292652
-1.56923 0.291931
-1.5708 0.291211
diff --git a/src/sas/example_data/sesans_data/sphere2micron.ses b/src/sas/example_data/sesans_data/sphere2micron.ses
deleted file mode 100644
index 568e252cd2..0000000000
--- a/src/sas/example_data/sesans_data/sphere2micron.ses
+++ /dev/null
@@ -1,60 +0,0 @@
-FileFormatVersion 1.0
-DataFileTitle Polystyrene of Markus Strobl, Full Sine, ++ only
-Sample Polystyrene 2 um in 53% H2O, 47% D2O
-Settings D1=D2=20x8 mm,Ds = 16x10 mm (WxH), GF1 =scanning, GF2 = 2.5 A. 2 um polystyrene in 53% H2O, 47% D2O; 8.55% contrast
-Operator CPD
-Date do 10 jul 2014 16:37:30
-ScanType sine one element scan
-Thickness 2.00E-01
-Thickness_unit cm
-Theta_zmax 0.0168
-Theta_zmax_unit radians
-Theta_ymax 0.0168
-Theta_ymax_unit radians
-Orientation Z
-SpinEchoLength_unit A
-Depolarisation_unit A-2 cm-1
-Wavelength_unit A
-
-BEGIN_DATA
-SpinEchoLength Depolarisation Depolarisation_error SpinEchoLength_error Wavelength Wavelength_error Polarisation Polarisation_error
-391.56 0.0041929 0.0036894 19.578 2.11 0.1055 1.0037 0.0032974
-1564 -0.0046571 0.0038185 78.2 2.11 0.1055 0.99586 0.003386
-2735.6 -0.017007 0.0038132 136.78 2.11 0.1055 0.98497 0.0033444
-3907.9 -0.033462 0.0035068 195.39 2.11 0.1055 0.97064 0.0030309
-5080.2 -0.047483 0.0038208 254.01 2.11 0.1055 0.9586 0.0032613
-6251.8 -0.070375 0.00376 312.59 2.11 0.1055 0.93926 0.0031446
-7423.2 -0.092217 0.0037927 371.16 2.11 0.1055 0.92117 0.0031108
-8595.5 -0.10238 0.004006 429.77 2.11 0.1055 0.91287 0.0032562
-9767.7 -0.12672 0.0038534 488.39 2.11 0.1055 0.8933 0.0030651
-10940 -0.1374 0.004243 546.98 2.11 0.1055 0.88484 0.003343
-12112 -0.16072 0.0045837 605.58 2.11 0.1055 0.86666 0.0035372
-13284 -0.16623 0.0045613 664.2 2.11 0.1055 0.86242 0.0035027
-14456 -0.18468 0.0044918 722.79 2.11 0.1055 0.84837 0.0033931
-15628 -0.19143 0.0048967 781.38 2.11 0.1055 0.84328 0.0036768
-16800 -0.20029 0.0045421 840.02 2.11 0.1055 0.83666 0.0033837
-17971 -0.19798 0.0046642 898.56 2.11 0.1055 0.83838 0.0034819
-19143 -0.21442 0.0047052 957.17 2.11 0.1055 0.82619 0.0034614
-20316 -0.20885 0.0044931 1015.8 2.11 0.1055 0.8303 0.0033218
-21488 -0.21393 0.0049186 1074.4 2.11 0.1055 0.82655 0.00362
-22660 -0.20685 0.004423 1133 2.11 0.1055 0.83179 0.0032758
-23832 -0.20802 0.0046979 1191.6 2.11 0.1055 0.83092 0.0034758
-25003 -0.19848 0.0045953 1250.2 2.11 0.1055 0.838 0.0034289
-26175 -0.21117 0.0044567 1308.8 2.11 0.1055 0.82859 0.0032881
-27347 -0.21283 0.004137 1367.4 2.11 0.1055 0.82736 0.0030477
-28520 -0.2042 0.0044587 1426 2.11 0.1055 0.83375 0.0033101
-29692 -0.2112 0.0042852 1484.6 2.11 0.1055 0.82857 0.0031615
-30864 -0.20319 0.0043483 1543.2 2.11 0.1055 0.8345 0.003231
-32036 -0.20752 0.0044297 1601.8 2.11 0.1055 0.83129 0.0032788
-33207 -0.20654 0.0043188 1660.4 2.11 0.1055 0.83201 0.0031995
-34380 -0.20126 0.0046375 1719 2.11 0.1055 0.83593 0.0034518
-35551 -0.20924 0.0042871 1777.6 2.11 0.1055 0.83001 0.0031684
-36724 -0.21323 0.0045471 1836.2 2.11 0.1055 0.82707 0.0033487
-37895 -0.21324 0.0045354 1894.7 2.11 0.1055 0.82706 0.00334
-39067 -0.19905 0.0044141 1953.4 2.11 0.1055 0.83758 0.003292
-40239 -0.1991 0.0047441 2012 2.11 0.1055 0.83754 0.003538
-41411 -0.20359 0.0050136 2070.5 2.11 0.1055 0.8342 0.003724
-42583 -0.21032 0.0049474 2129.1 2.11 0.1055 0.82922 0.0036529
-43755 -0.20689 0.0048203 2187.8 2.11 0.1055 0.83176 0.00357
-44927 -0.21075 0.0052337 2246.4 2.11 0.1055 0.8289 0.0038628
-46099 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
diff --git a/src/sas/example_data/sesans_data/sphere2micron_long.ses b/src/sas/example_data/sesans_data/sphere2micron_long.ses
deleted file mode 100644
index e7dce63ed4..0000000000
--- a/src/sas/example_data/sesans_data/sphere2micron_long.ses
+++ /dev/null
@@ -1,104 +0,0 @@
-FileFormatVersion 1.0
-DataFileTitle Polystyrene of Markus Strobl, Full Sine, ++ only
-Sample Polystyrene 2 um in 53% H2O, 47% D2O
-Settings D1=D2=20x8 mm,Ds = 16x10 mm (WxH), GF1 =scanning, GF2 = 2.5 A. 2 um polystyrene in 53% H2O, 47% D2O; 8.55% contrast
-Operator CPD
-Date do 10 jul 2014 16:37:30
-ScanType sine one element scan
-Thickness 2.00E-01
-Thickness_unit cm
-Theta_zmax 0.0168
-Theta_zmax_unit radians
-Theta_ymax 0.0168
-Theta_ymax_unit radians
-Orientation Z
-SpinEchoLength_unit A
-Depolarisation_unit A-2 cm-1
-Wavelength_unit A
-
-BEGIN_DATA
-SpinEchoLength Depolarisation Depolarisation_error SpinEchoLength_error Wavelength Wavelength_error Polarisation Polarisation_error
-391.56 0.0041929 0.0036894 19.578 2.11 0.1055 1.0037 0.0032974
-1564 -0.0046571 0.0038185 78.2 2.11 0.1055 0.99586 0.003386
-2735.6 -0.017007 0.0038132 136.78 2.11 0.1055 0.98497 0.0033444
-3907.9 -0.033462 0.0035068 195.39 2.11 0.1055 0.97064 0.0030309
-5080.2 -0.047483 0.0038208 254.01 2.11 0.1055 0.9586 0.0032613
-6251.8 -0.070375 0.00376 312.59 2.11 0.1055 0.93926 0.0031446
-7423.2 -0.092217 0.0037927 371.16 2.11 0.1055 0.92117 0.0031108
-8595.5 -0.10238 0.004006 429.77 2.11 0.1055 0.91287 0.0032562
-9767.7 -0.12672 0.0038534 488.39 2.11 0.1055 0.8933 0.0030651
-10940 -0.1374 0.004243 546.98 2.11 0.1055 0.88484 0.003343
-12112 -0.16072 0.0045837 605.58 2.11 0.1055 0.86666 0.0035372
-13284 -0.16623 0.0045613 664.2 2.11 0.1055 0.86242 0.0035027
-14456 -0.18468 0.0044918 722.79 2.11 0.1055 0.84837 0.0033931
-15628 -0.19143 0.0048967 781.38 2.11 0.1055 0.84328 0.0036768
-16800 -0.20029 0.0045421 840.02 2.11 0.1055 0.83666 0.0033837
-17971 -0.19798 0.0046642 898.56 2.11 0.1055 0.83838 0.0034819
-19143 -0.21442 0.0047052 957.17 2.11 0.1055 0.82619 0.0034614
-20316 -0.20885 0.0044931 1015.8 2.11 0.1055 0.8303 0.0033218
-21488 -0.21393 0.0049186 1074.4 2.11 0.1055 0.82655 0.00362
-22660 -0.20685 0.004423 1133 2.11 0.1055 0.83179 0.0032758
-23832 -0.20802 0.0046979 1191.6 2.11 0.1055 0.83092 0.0034758
-25003 -0.19848 0.0045953 1250.2 2.11 0.1055 0.838 0.0034289
-26175 -0.21117 0.0044567 1308.8 2.11 0.1055 0.82859 0.0032881
-27347 -0.21283 0.004137 1367.4 2.11 0.1055 0.82736 0.0030477
-28520 -0.2042 0.0044587 1426 2.11 0.1055 0.83375 0.0033101
-29692 -0.2112 0.0042852 1484.6 2.11 0.1055 0.82857 0.0031615
-30864 -0.20319 0.0043483 1543.2 2.11 0.1055 0.8345 0.003231
-32036 -0.20752 0.0044297 1601.8 2.11 0.1055 0.83129 0.0032788
-33207 -0.20654 0.0043188 1660.4 2.11 0.1055 0.83201 0.0031995
-34380 -0.20126 0.0046375 1719 2.11 0.1055 0.83593 0.0034518
-35551 -0.20924 0.0042871 1777.6 2.11 0.1055 0.83001 0.0031684
-36724 -0.21323 0.0045471 1836.2 2.11 0.1055 0.82707 0.0033487
-37895 -0.21324 0.0045354 1894.7 2.11 0.1055 0.82706 0.00334
-39067 -0.19905 0.0044141 1953.4 2.11 0.1055 0.83758 0.003292
-40239 -0.1991 0.0047441 2012 2.11 0.1055 0.83754 0.003538
-41411 -0.20359 0.0050136 2070.5 2.11 0.1055 0.8342 0.003724
-42583 -0.21032 0.0049474 2129.1 2.11 0.1055 0.82922 0.0036529
-43755 -0.20689 0.0048203 2187.8 2.11 0.1055 0.83176 0.00357
-44927 -0.21075 0.0052337 2246.4 2.11 0.1055 0.8289 0.0038628
-46099 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-49615 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-53131 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-56647 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-60163 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-63679 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-67195 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-70711 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-74227 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-77743 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-81259 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-84775 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-88291 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-91807 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-95323 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-98839 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-102355 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-105871 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-109387 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-112903 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-116419 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-119935 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-123451 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-126967 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-130483 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-133999 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-137515 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-141031 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-144547 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-148063 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-151579 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-155095 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-158611 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-162127 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-165643 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-169159 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-172675 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-176191 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-179707 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-183223 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-186739 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-190255 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-193771 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-197287 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
-200803 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
diff --git a/src/sas/example_data/sesans_data/sphere_isis.ses b/src/sas/example_data/sesans_data/sphere_isis.ses
deleted file mode 100644
index 034c5c490e..0000000000
--- a/src/sas/example_data/sesans_data/sphere_isis.ses
+++ /dev/null
@@ -1,73 +0,0 @@
-FileFormatVersion 1.0
-DataFileTitle PMMA in Mixed Deuterated decalin
-Sample Ostensibly 40$ 100nm radius PMMA hard spheres in mixed deuterarted decalin.
-Thickness 2
-Thickness_unit mm
-Theta_zmax 0.09
-Theta_zmax_unit radians
-Theta_ymax 0.09
-Theta_ymax_unit radians
-Orientation Z
-SpinEchoLength_unit A
-Depolarisation_unit A-2 cm-1
-Wavelength_unit A
-
-BEGIN_DATA
-SpinEchoLength Depolarisation Depolarisation_error Wavelength
-260.0 -1.42E-3 2.04E-3 1.612452
-280.8 -1.45E-3 1.87E-3 1.675709
-303.264 -1.64E-3 1.23E-3 1.741448
-327.525 -1.69E-3 1.17E-3 1.809765
-353.727 -2.23E-3 9.09E-4 1.880763
-382.025 -2.26E-3 8.58E-4 1.954546
-412.587 -2.41E-3 7.29E-4 2.031224
-445.594 -2.58E-3 6.75E-4 2.11091
-481.242 -2.88E-3 6.04E-4 2.193723
-519.741 -3.35E-3 5.56E-4 2.279783
-561.32 -3.60E-3 5.22E-4 2.369219
-606.226 -3.92E-3 4.91E-4 2.462166
-654.724 -4.36E-3 4.73E-4 2.558758
-707.102 -4.67E-3 4.54E-4 2.659139
-763.67 -4.91E-3 4.22E-4 2.763458
-824.764 -5.32E-3 3.88E-4 2.87187
-890.745 -5.43E-3 3.53E-4 2.984535
-962.005 -5.61E-3 3.28E-4 3.101621
-1038.97 -5.83E-3 3.07E-4 3.223306
-1122.08 -5.88E-3 2.91E-4 3.349746
-1211.85 -5.91E-3 2.73E-4 3.481164
-1308.8 -5.71E-3 2.61E-4 3.617734
-1413.5 -5.40E-3 2.49E-4 3.759654
-1526.58 -5.10E-3 2.41E-4 3.907147
-1648.71 -4.77E-3 2.34E-4 4.060431
-1780.6 -4.34E-3 2.26E-4 4.219716
-1923.05 -4.18E-3 2.20E-4 4.385259
-2076.9 -4.08E-3 2.16E-4 4.557302
-2243.05 -4.37E-3 2.13E-4 4.736085
-2422.49 -4.66E-3 2.10E-4 4.92188
-2616.29 -4.96E-3 2.06E-4 5.114968
-2825.59 -5.04E-3 2.03E-4 5.315628
-3051.64 -4.96E-3 1.99E-4 5.524165
-3295.77 -4.72E-3 1.97E-4 5.74088
-3559.43 -4.52E-3 1.92E-4 5.966096
-3844.19 -4.65E-3 1.93E-4 6.200153
-4151.72 -4.74E-3 1.96E-4 6.443384
-4483.86 -4.87E-3 1.99E-4 6.696163
-4842.57 -4.81E-3 2.05E-4 6.958858
-5229.98 -4.57E-3 2.09E-4 7.23186
-5648.38 -4.72E-3 2.17E-4 7.515571
-6100.25 -4.79E-3 2.23E-4 7.81041
-6588.27 -4.68E-3 2.28E-4 8.116816
-7115.33 -4.61E-3 2.32E-4 8.435242
-7684.55 -4.78E-3 2.46E-4 8.766157
-8299.32 -4.74E-3 2.46E-4 9.11006
-8963.26 -4.56E-3 2.50E-4 9.467449
-9680.32 -4.70E-3 2.58E-4 9.838862
-10454.7 -4.81E-3 2.64E-4 10.224823
-11291.1 -4.65E-3 2.69E-4 10.625959
-12194.4 -4.43E-3 2.79E-4 11.042826
-13170.0 -4.55E-3 3.01E-4 11.476062
-14223.6 -4.35E-3 3.20E-4 11.926274
-15361.5 -4.24E-3 3.51E-4 12.394152
-16590.4 -4.68E-3 4.12E-4 12.880373
-17917.6 -4.96E-3 4.98E-4 13.385664
-19303.4 -4.56E-3 5.98E-4 13.893668
diff --git a/src/sas/example_data/upcoming_formats/1000A_sphere_sm.xml b/src/sas/example_data/upcoming_formats/1000A_sphere_sm.xml
deleted file mode 100644
index 60d4e604cc..0000000000
--- a/src/sas/example_data/upcoming_formats/1000A_sphere_sm.xml
+++ /dev/null
@@ -1,476 +0,0 @@
-
-
-
- 1000A Sphere Simulated USANS Data
-
-
-
- 3.0525e-05
- 2.7793e+05
- 3020.8
- 0.117
-
-
- 3.33e-05
- 2.8147e+05
- 3015.1
- 0.117
-
-
- 3.885e-05
- 2.766e+05
- 1501
- 0.117
-
-
- 4.44e-05
- 2.7115e+05
- 1493.6
- 0.117
-
-
- 4.995e-05
- 2.6841e+05
- 1485.2
- 0.117
-
-
- 5.55e-05
- 2.6448e+05
- 1475.8
- 0.117
-
-
- 6.105e-05
- 2.6446e+05
- 14655
- 0.117
-
-
- 6.66e-05
- 2.5808e+05
- 1454.3
- 0.117
-
-
- 7.215e-05
- 2.558e+05
- 1442.2
- 0.117
-
-
- 7.77e-05
- 2.4752e+05
- 1429.2
- 0.117
-
-
- 8.325e-05
- 2.453e+05
- 1415.3
- 0.117
-
-
- 8.88e-05
- 2.4054e+05
- 1400.6
- 0.117
-
-
- 9.435e-05
- 2.3471e+05
- 1385
- 0.117
-
-
- 9.99e-05
- 2.2819e+05
- 13687
- 0.117
-
-
- 0.00010545
- 2.239e+05
- 1351.5
- 0.117
-
-
- 0.000111
- 2.166e+05
- 769.97
- 0.117
-
-
- 0.0001221
- 2.0398e+05
- 748.05
- 0.117
-
-
- 0.0001332
- 1.9273e+05
- 724.56
- 0.117
-
-
- 0.0001443
- 1.7835e+05
- 699.64
- 0.117
-
-
- 0.0001554
- 1.6642e+05
- 673.42
- 0.117
-
-
- 0.0001665
- 1.5183e+05
- 6460.6
- 0.117
-
-
- 0.0001776
- 1.3884e+05
- 617.69
- 0.117
-
-
- 0.0001887
- 1.2706e+05
- 588.49
- 0.117
-
-
- 0.0001998
- 1.1493e+05
- 558.61
- 0.117
-
-
- 0.0002109
- 1.0191e+05
- 528.21
- 0.117
-
-
- 0.000222
- 91251
- 497.46
- 0.117
-
-
- 0.0002331
- 79895
- 466.55
- 0.117
-
-
- 0.0002442
- 69495
- 4356.1
- 0.117
-
-
- 0.0002553
- 59637
- 404.85
- 0.117
-
-
- 0.0002664
- 50908
- 374.42
- 0.117
-
-
- 0.0002775
- 43129
- 243.59
- 0.117
-
-
- 0.00030525
- 27529
- 193.1
- 0.117
-
-
- 0.000333
- 15863
- 147.72
- 0.117
-
-
- 0.00036075
- 8965.4
- 109.87
- 0.117
-
-
- 0.0003885
- 5132.7
- 826.83
- 0.117
-
-
- 0.00041625
- 3514.3
- 69.119
- 0.117
-
-
- 0.000444
- 3347.5
- 67.988
- 0.117
-
-
- 0.00047175
- 3801.3
- 72.844
- 0.117
-
-
- 0.0004995
- 4566.8
- 77.805
- 0.117
-
-
- 0.00052725
- 4822.4
- 80.065
- 0.117
-
-
- 0.000555
- 4516.9
- 55.708
- 0.117
-
-
- 0.0006105
- 3275.1
- 472.47
- 0.117
-
-
- 0.000666
- 1697
- 34.247
- 0.117
-
-
- 0.0007215
- 880.96
- 24.356
- 0.117
-
-
- 0.000777
- 803.05
- 23.606
- 0.117
-
-
- 0.0008325
- 1014.2
- 26.645
- 0.117
-
-
- 0.000888
- 1066.2
- 26.82
- 0.117
-
-
- 0.0009435
- 772.29
- 23.066
- 0.117
-
-
- 0.000999
- 465.43
- 175.71
- 0.117
-
-
- 0.0010545
- 309.6
- 14.287
- 0.117
-
-
- 0.00111
- 345.28
- 11.656
- 0.117
-
-
- 0.001221
- 414.17
- 12.599
- 0.117
-
-
- 0.001332
- 178.79
- 8.4835
- 0.117
-
-
- 0.001443
- 171
- 8.3838
- 0.117
-
-
- 0.001554
- 184.12
- 8.5329
- 0.117
-
-
- 0.001665
- 87.754
- 59.424
- 0.117
-
-
- 0.001776
- 95.545
- 6.4447
- 0.117
-
-
- 0.001887
- 88.574
- 6.151
- 0.117
-
-
- 0.001998
- 57.819
- 4.5293
- 0.117
-
-
- 0.002109
- 75.042
- 5.1544
- 0.117
-
-
- 0.00222
- 51.668
- 4.6394
- 0.117
-
-
- 0.002331
- 32.395
- 3.6677
- 0.117
-
-
- 0.002442
- 37.316
- 42.219
- 0.117
-
-
- 0.002553
- 29.115
- 3.5983
- 0.117
-
-
- 0.002664
- 24.194
- 3.0959
- 0.117
-
-
- 0.002775
- 27.064
- 2.8672
- 0.117
-
-
- 0.0030525
- 18.59
- 2.3989
- 0.117
-
-
- 0.00333
- 8.4747
- 1.9713
- 0.117
-
-
- 0.0036075
- 10.388
- 1.6403
- 0.117
-
-
- 0.003885
- 8.4747
- 14.205
- 0.117
-
-
- 0.0041625
- 6.0143
- 1.3393
- 0.117
-
-
- 0.00444
- 4.374
- 1.2822
- 0.117
-
-
- 0.0047175
- 4.6474
- 1.2226
- 0.117
-
-
- 0.004995
- 3.8273
- 1.1598
- 0.117
-
-
- 0.0052725
- 5.4676
- 1.0588
- 0.117
-
-
-
- X1000A_mod
-
-
- NIST IGOR Procedures
-
- neutron
-
-
-
- Re-written data
-
-
-
- Modified data written from folder X1000A_mod on Wed, May 26, 2010 3:00:24 PM
-
-
-
-
diff --git a/src/sas/qtgui/Calculators/media/sld_calculator_help.rst b/src/sas/qtgui/Calculators/media/sld_calculator_help.rst
index d939de9d82..29c149aca5 100755
--- a/src/sas/qtgui/Calculators/media/sld_calculator_help.rst
+++ b/src/sas/qtgui/Calculators/media/sld_calculator_help.rst
@@ -2,57 +2,139 @@
.. This is a port of the original SasView html help file to ReSTructured text
.. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
+..
+ There is periodictable syntax for including density of components in the molecular formula field that does not appear to be implemented in SASview.
+..
+ For compounds, such as biomolecules, with exchangeable hydrogens, H[1] is used to denote the labile hydrogens. The reported contrast match point for the molecule takes into account the ratio of exchanged hydrogens.
+ This feature is not currently enabled in Sasview but is available on the NIST webpage.
SLD Calculator Tool
===================
Description
-----------
+This tool calculates the neutron and x-ray scattering length densities (SLD) and some other useful scattering parameters of a wide range of materials including molecules, solutions/mixtures, isotopic mixtures, and biomolecules.
+This SLD calculator utilizes the periodictable python package\ :sup:`1`, which is a periodic table populated with values useful for neutron and x-ray experiments.
-The neutron scattering length density (SLD, $\beta_N$) is defined as
+User Inputs
+----------------------------
+**Molecular Formula**
+ This field defines the material for which you are calculating the SLD. The section "`Specifying Materials or Mixtures in the Molecular Formula Field`_" offers further guidance on how to enter molecules, biomolecules, and more complex mixtures.
+
+**Mass Density** (|g/cm^3|)
+ This field defines the density of the material for which you are calculating the SLD. Density uncertainty is likely the largest source of error in the SLD calculator.
+
+**Neutron Wavelength** (|Ang|)
+ Wavelength is used to calculate the neutron scattering cross-section and 1/e length. It is required for neutron calculations and entered in units of |Ang|.
-.. math::
+**X-ray Wavelength** (|Ang|)
+ Wavelength is used to calculate the x-ray scattering length density. It is required for x-ray calculations and entered in units of |Ang|.
+
+Calculator Output
+----------------------------
+**Neutron SLD** (|Ang^-2|)
+ A measure of the neutron scattering power of the material, which is used for fitting data from neutron scattering experiments.
- \beta_N = (b_{c1} + b_{c2} + ... + b_{cn}) / V_m
+**X-ray SLD** (|Ang^-2|)
+ A measure of the x-ray scattering power of the material, which is used for fitting data from x-ray scattering experiments.
-where $b_{ci}$ is the bound coherent scattering length of ith of n atoms in a molecule
-with the molecular volume $V_m$.
+**Neutron Incoherent Cross-section** (cm\ :sup:`-1`)
+ A measure of the probability that the neutron will scatter incoherently.
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+**Neutron Absorption Cross-Section** (cm\ :sup:`-1`)
+ A measure of the probability that a neutron will be absorbed by the material.
-Specifying the Compound Name
+**Neutron 1/e length** (cm)
+ The sample thickness required to reduce the transmission to 36.8% (1/e).
+
+Specifying Materials or Mixtures in the Molecular Formula Field
----------------------------
+**Molecular formulas** can be entered intuitively with atoms being represented by their atomic symbol. For example, calcium carbonate (CaCO\ :sub:`3`):
+
+ CaCO3
+
+**Multipart species** can be constructed using a single molecular formula, or by separating the components with a + or a space. For example, consider the hexahydrate of calcium carbonate, ikaite, (CaCO\ :sub:`3` |cdot| 6(H\ :sub:`2`\O)) which can be denoted as:
+
+ CaCO3(H2O)6
+
+ CaCO3 6H2O
+
+ CaCO3+6H2O
+
+**Isotopes** are represented as the element symbol followed by its mass number in square brackets, for example C[12] and C[13]. A special exception to this are isotopes of hydrogen which can also be represented as H = H[1], D = H[2], and T=H[3].
+
+**Isotopic Mixtures** can be entered in several ways. Take, for example a mixture of 30% H\ :sub:`2`\O and 70% D\ :sub:`2`\O (mole fraction). It can be entered as:
+
+ H3D7O5
+
+ H[1]3H[2]7O5
+
+ 3H2O+7D2O
+
+*For isotopic substitution you must also adjust the density for your mixture.* There is a density calculator in SASview that may be useful, but measurement with a density meter is recommended.
+
+**Mass Fraction** can be entered with each component of the mixture written as XX%wt "component" and each component separated with //. The mass fraction of the last component does not need to be specified as the sum of the fractions must add to 100. The mass density field must be updated to specify the density of the mixture. For example:
+
+ 50%wt Co // Ti
+
+ 1%wtNaCl // 50%wtD2O // H2O
+
+**Volume Fraction** can be entered in the same way by substituting *%vol* for *%wt*. The density of each component must be specified using an @density notation, where density is in units of |g/cm^3|. The mass density field must also be updated to specify the density of the mixture. (Note: vol% and wt% will lead to syntax errors).
+
+ 50%vol H2O@1 // D2O\@1.1
+
+These can be combined for more complicated solutions. For example, if you have a 10wt% sodium chloride in water solution and you dilute 20 mL of this solution to 100 mL with D\ :sub:`2`\O, this can be represented as:
+
+ 20%vol (10%wt NaCl // H2O)@1.07 // D2O\@1.11
+
+For even more complicated solutions, parenthesis can be nested and the number of atoms can be integer or decimal. For example H\ :sub:`2`\O is equivalent to:
+
+ (HO0.5)2
+
+**Solution Composition with Mass and Volume** can be specified in units of mass and volume. The mass density field must be updated to specify the density of the solution. For example:
+
+ 5g NaCl // 50 mL H2O@1
+
+ mass density = 1.07(|g/cm^3|)
+
+*Reminder the solution density is the largest source of error for these calculations.* Measure the solution density for an accurate result. For example:
+
+ A brine solution containing 10.44 g Al(NO\ :sub:`3`\)\ :sub:`3`\ |cdot| 9H\ :sub:`2`\O and 27.51 g D\ :sub:`2`\O was prepared for a wormlike micelle experiments. The solution density was measured with a density meter and found to be 1.22 (|g/cm^3|). Using the scattering lenth density calculator we enter:
+
+ 10.44g Al(NO3)3(H2O)9 // 27.5126g D2O
+
+ mass density = 1.22 (|g/cm^3|)
-To calculate scattering length densities enter the empirical formula of a
-compound and its mass density and click "Calculate".
+ The SLD is calculated to be 5.46e-06 (|Ang^-2|)
-Entering a wavelength value is optional (a default value of 6.0 |Ang| will
-be used).
+**Biomolecules**
-TIPS!
+DNA, Peptides, and RNA can be described using the FASTA format.\ :sup:`2, 3` When using this format density will be estimated automatically and the SLD will be calculated for the biomolecule with all exchangeable hydrogens as H.
+Use the following codes:
-* Formula strings consist of atoms and the number of them, such as "CaCO3+6H2O".
+ "aa" - amino acid sequences
+ A=Alanine, R=Arginine, L= Leucine
-* Groups can be separated by *'+'* or *space*, so "CaCO3 6H2O" works as well.
+ "dna" - DNA sequences
+ A = adenosine, C = cytidine, G = guanine, T = thymidine
-* Groups can be defined using parentheses, such as "CaCO3(H2O)6".
+ "rna" - RNA sequences
+ U = uridine
-* Parentheses can be nested, such as "(CaCO3(H2O)6)1".
+For example, the amino acid sequence for {beta}-casein can be written as:
-* Isotopes are represented by their atomic number in *square brackets*, such
- as "CaCO[18]3+6H2O", H[1], or H[2].
+ aa: RELEELNVPGEIVESLSSSEESITRINKKIEKFQSEEQQQTEDELQDKIHPFA
+ QTQSLVYPFPGPIPNSLPQNIPPLTQTPVVVPPFLQPEVMGVSKVKEAMAPKH
+ KEMPFPKYPVEPFTESQSLTLTDVENLHLPLPLLQSWMHQPHQPLPPTVMFPP
+ QSVLSLSQSKVLPVPQKAVPYPQRDMPIQAFLLYQEPVLGPVRGPFPIIV
-* Numbers of atoms can be integer or decimal, such as "CaCO3+(3HO0.5)2".
+**References:**
-* The SLD of mixtures can be calculated as well. For example, for a 70-30
- mixture of H2O/D2O write "H14O7+D6O3" or more simply "H7D3O5" (i.e. this says
- 7 hydrogens, 3 deuteriums, and 5 oxygens) and enter a mass density calculated
- on the percentages of H2O and D2O.
+[1] Kienzle, P. A. (2008-2019). Extensible periodic table (v1.5.2). Computer Software. https://periodictable.readthedocs.io. [calculator source, web service source]
-* Type "C[13]6 H[2]12 O[18]6" for C(13)6H(2)12O(18)6 (6 Carbon-13 atoms, 12
- deuterium atoms, and 6 Oxygen-18 atoms).
+[2] Pearson WR, Lipman DJ (April 1988). "Improved tools for biological sequence comparison". Proceedings of the National Academy of Sciences of the United States of America. 85 (8): 2444-8. doi:10.1073/pnas.85.8.2444.
-.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+[3] https://zhanggroup.org/FASTA/ (helpful explanation of FASTA syntax)
-.. note:: This help document was last changed by Paul Kienzle, 05Apr2017
+.. note:: This help document was last changed by Katie Weigandt, 08Mar2024
diff --git a/src/sas/qtgui/MainWindow/CategoryManager.py b/src/sas/qtgui/MainWindow/CategoryManager.py
index bbf990dd0c..ef72df9c1f 100644
--- a/src/sas/qtgui/MainWindow/CategoryManager.py
+++ b/src/sas/qtgui/MainWindow/CategoryManager.py
@@ -129,7 +129,6 @@ def categoryList(self):
return self.category_list
-
class CategoryManager(QtWidgets.QDialog, Ui_CategoryManagerUI):
def __init__(self, parent=None, manager=None):
super(CategoryManager, self).__init__(parent)
@@ -137,6 +136,8 @@ def __init__(self, parent=None, manager=None):
self.communicator = manager.communicator()
+ self.manager = manager
+
self.setWindowTitle("Category Manager")
self.initializeGlobals()
@@ -192,7 +193,8 @@ def initializeModelList(self):
empty_item.setEditable(False)
# Add a checkbox to it
item.setCheckable(True)
- item.setCheckState(QtCore.Qt.Checked)
+ checked = self.categories.model_enabled_dict[model]
+ item.setCheckState(QtCore.Qt.Checked if checked else QtCore.Qt.Unchecked)
item.setEditable(False)
current_category = self.categories.modelToCategory()[model]
self._category_model.appendRow([item, empty_item])
@@ -205,6 +207,7 @@ def initializeSignals(self):
self.cmdOK.clicked.connect(self.onClose)
self.cmdModify.clicked.connect(self.onModify)
self.cmdReset.clicked.connect(self.onReset)
+ self.cmdHelp.clicked.connect(self.displayHelp)
self.chkEnable.toggled.connect(self.onEnableAll)
@@ -214,6 +217,7 @@ def initializeSignals(self):
# Signals from the list
selectionModel = self.lstCategory.selectionModel()
selectionModel.selectionChanged.connect(self.onListSelection)
+ self._category_model.itemChanged.connect(self.onListChanged)
def onClose(self):
@@ -226,6 +230,10 @@ def onClose(self):
self.close()
+ def onListChanged(self, item):
+ # remember the state of the checkbox
+ self.categories.model_enabled_dict[item.text()] = item.checkState() == QtCore.Qt.Checked
+
def selectedModels(self):
"""
Returns a list of selected models
@@ -258,6 +266,10 @@ def onReset(self):
self.setTableProperties(self.lstCategory)
self.lstCategory.setAlternatingRowColors(True)
+ def displayHelp(self):
+ location = "/user/qtgui/Perspectives/Fitting/fitting_help.html#category-manager"
+ self.manager.showHelp(location)
+
def onEnableAll(self, isChecked):
"""
Respond to the Enable/Disable All checkbox
diff --git a/src/sas/qtgui/MainWindow/GuiManager.py b/src/sas/qtgui/MainWindow/GuiManager.py
index 3f205827a0..5d738a9e5f 100644
--- a/src/sas/qtgui/MainWindow/GuiManager.py
+++ b/src/sas/qtgui/MainWindow/GuiManager.py
@@ -105,7 +105,7 @@ def __init__(self, parent=None):
# Add signal callbacks
self.addCallbacks()
- # Assure model categories are available
+ # Assure categories are present
self.addCategories()
# Create the data manager
@@ -279,7 +279,6 @@ def updatePlotItems(self, graphs):
else:
self.addPlotItemsInWindowsMenu(plot)
-
def addPlotItemsInWindowsMenu(self, plot):
"""
Dynamically update the QMenu content and assign signals
diff --git a/src/sas/qtgui/Perspectives/Fitting/FittingWidget.py b/src/sas/qtgui/Perspectives/Fitting/FittingWidget.py
index 039f4a3afc..9f251b33d5 100644
--- a/src/sas/qtgui/Perspectives/Fitting/FittingWidget.py
+++ b/src/sas/qtgui/Perspectives/Fitting/FittingWidget.py
@@ -1740,7 +1740,8 @@ def onSelectCategory(self):
# Populate the models combobox
self.cbModel.blockSignals(True)
self.cbModel.addItem(MODEL_DEFAULT)
- self.cbModel.addItems(sorted([model for (model, _) in model_list if model != 'rpa']))
+ models_to_show = [m[0] for m in model_list if m[0] != 'rpa' and m[1]]
+ self.cbModel.addItems(sorted(models_to_show))
self.cbModel.blockSignals(False)
def onPolyModelChange(self, top, bottom):
diff --git a/src/sas/qtgui/Utilities/AddMultEditor.py b/src/sas/qtgui/Utilities/AddMultEditor.py
index da161e1cb7..12e1b23761 100644
--- a/src/sas/qtgui/Utilities/AddMultEditor.py
+++ b/src/sas/qtgui/Utilities/AddMultEditor.py
@@ -295,10 +295,6 @@ def updateModels(self):
def onHelp(self):
""" Display related help section """
- try:
- help_location = GuiUtils.HELP_DIRECTORY_LOCATION + \
- "/user/qtgui/Perspectives/Fitting/fitting_help.html#add-multiply-models"
- webbrowser.open('file://' + os.path.realpath(help_location))
- except AttributeError:
- # No manager defined - testing and standalone runs
- pass
+ help_location = "/user/qtgui/Perspectives/Fitting/fitting_help.html#add-multiply-models"
+ self.parent.showHelp(help_location)
+
diff --git a/src/sas/qtgui/Utilities/CategoryInstaller.py b/src/sas/qtgui/Utilities/CategoryInstaller.py
index b2ee7c5418..a50d557764 100644
--- a/src/sas/qtgui/Utilities/CategoryInstaller.py
+++ b/src/sas/qtgui/Utilities/CategoryInstaller.py
@@ -106,19 +106,13 @@ def check_install(homedir = None, model_list=None):
for cat in list(master_category_dict.keys()):
for ind in range(len(master_category_dict[cat])):
model_name, enabled = master_category_dict[cat][ind]
- if model_name not in _model_list:
- del_name = True
- try:
- by_model_dict.pop(model_name)
- model_enabled_dict.pop(model_name)
- except:
- logging.error("CategoryInstaller: %s", sys.exc_info()[1])
- else:
- add_list.remove(model_name)
+ add_list.remove(model_name)
+ if not enabled:
+ model_enabled_dict.pop(model_name)
if del_name or (len(add_list) > 0):
for model in add_list:
model_enabled_dict[model]= True
- if _model_dict[model].category is None or len(str(_model_dict[model].category.capitalize())) == 0:
+ if _model_dict[model].category is None or not _model_dict[model].category:
by_model_dict[model].append('Uncategorized')
else:
category = _model_dict[model].category
diff --git a/src/sas/qtgui/Utilities/DocViewWidget.py b/src/sas/qtgui/Utilities/DocViewWidget.py
index 0db82315c4..10b797bcbc 100644
--- a/src/sas/qtgui/Utilities/DocViewWidget.py
+++ b/src/sas/qtgui/Utilities/DocViewWidget.py
@@ -12,6 +12,15 @@
from sas.sascalc.fit import models
from sas.sascalc.doc_regen.makedocumentation import make_documentation, HELP_DIRECTORY_LOCATION, MAIN_PY_SRC, MAIN_DOC_SRC
+HTML_404 = '''
+
+
+Unable to find documentation.
+Developers: please build the documentation and try again.
+
+
+'''
+
class DocViewWindow(QtWidgets.QDialog, Ui_DocViewerWindow):
"""
@@ -92,23 +101,26 @@ def regenerateIfNeeded(self):
user_models = Path(models.find_plugins_dir())
html_path = HELP_DIRECTORY_LOCATION
rst_path = MAIN_DOC_SRC
- rst_py_path = MAIN_PY_SRC
base_path = self.source.parent.parts
url_str = str(self.source)
+ if not MAIN_DOC_SRC.exists() and not HELP_DIRECTORY_LOCATION.exists():
+ # The user docs were never built - disable edit button and do not attempt doc regen
+ self.editButton.setEnabled(False)
+ self.load404()
+ return
+
if "models" in base_path:
- model_name = self.source.name.replace("html", "py")
- regen_string = rst_py_path / model_name
- user_model_name = user_models / model_name
+ user_model_name = user_models / self.source.name.replace("html", "py")
# Test if this is a user defined model, and if its HTML does not exist or is older than python source file
if os.path.isfile(user_model_name):
- if self.newer(regen_string, user_model_name):
- self.regenerateHtml(model_name)
+ if self.newer(user_model_name, url_str):
+ self.regenerateHtml(user_model_name)
# Test to see if HTML does not exist or is older than python file
- elif self.newer(regen_string, self.source):
- self.regenerateHtml(model_name)
+ elif self.newer(self.source, url_str):
+ self.regenerateHtml(self.source.name)
# Regenerate RST then HTML if no model file found OR if HTML is older than equivalent .py
elif "index" in url_str:
@@ -141,7 +153,10 @@ def newer(src: Union[Path, os.path, str], html: Union[Path, os.path, str]) -> bo
:return: Is the ReST file newer than the HTML file? Returned as a boolean.
"""
try:
- return not os.path.exists(html) or os.path.getmtime(src) > os.path.getmtime(html)
+ html_exists = os.path.exists(html)
+ rst_time = os.path.getmtime(src)
+ html_time = os.path.getmtime(html)
+ return not html_exists or rst_time > html_time
except Exception as e:
# Catch exception for debugging
return True
@@ -158,6 +173,10 @@ def loadHtml(self):
# Show widget
self.onShow()
+
+ def load404(self):
+ self.webEngineViewer.setHtml(HTML_404)
+ self.onShow()
def refresh(self):
self.webEngineViewer.reload()
@@ -176,9 +195,9 @@ def processUrl(self) -> QtCore.QUrl:
# Check if the URL string contains a fragment (jump link)
if '#' in url.name:
- url, fragment = url.name.split('#', 1)
+ url_str, fragment = str(url.absolute()).split('#', 1)
# Convert path to a QUrl needed for QWebViewerEngine
- abs_url = QtCore.QUrl.fromLocalFile(url)
+ abs_url = QtCore.QUrl.fromLocalFile(url_str)
abs_url.setFragment(fragment)
else:
# Convert path to a QUrl needed for QWebViewerEngine
diff --git a/src/sas/qtgui/Utilities/UI/DocRegenInProgress.ui b/src/sas/qtgui/Utilities/UI/DocRegenInProgress.ui
index e96b131d03..d78b7c32cb 100644
--- a/src/sas/qtgui/Utilities/UI/DocRegenInProgress.ui
+++ b/src/sas/qtgui/Utilities/UI/DocRegenInProgress.ui
@@ -7,17 +7,17 @@
0
0
378
- 100
+ 400
- Form
+ Documentation Generation Progress Window
-
- TextLabel
+ ::Documentation Generation In Progress::
Qt::AlignCenter
@@ -25,6 +25,13 @@
-
+
+
+ This process may take a few minutes.
+
+
+
+ -
diff --git a/src/sas/qtgui/convertUI.py b/src/sas/qtgui/convertUI.py
index b15fd593f3..1728e2fabb 100644
--- a/src/sas/qtgui/convertUI.py
+++ b/src/sas/qtgui/convertUI.py
@@ -4,6 +4,7 @@
# Arguments: -f -> Force the UI elements to be rebuilt, even if they exist
import os
import sys
+import subprocess
def run_compiler(compiler_main, name, *args):
""" Wrapper to run a compiler, either pyrrc or pyuic"""
@@ -24,8 +25,8 @@ def pyrrc(in_file, out_file):
"""
Run the qt resource compiler
"""
- run_line = f"pyside6-rcc {in_file} -o {out_file}"
- os.system(run_line)
+ run_line = ["pyside6-rcc", in_file, "-o" ,out_file]
+ subprocess.run(run_line, check=True)
def pyuic(in_file, out_file):
@@ -34,8 +35,8 @@ def pyuic(in_file, out_file):
"""
in_file2 = os.path.abspath(in_file)
out_file2 = os.path.abspath(out_file)
- run_line = "pyside6-uic " + in_file2 + " -o " + out_file2
- os.system(run_line)
+ run_line = ["pyside6-uic", in_file2, "-o", out_file2]
+ subprocess.run(run_line, check=True)
def file_in_newer(file_in, file_out):
"""
diff --git a/src/sas/sascalc/doc_regen/makedocumentation.py b/src/sas/sascalc/doc_regen/makedocumentation.py
index f7941912f6..5bb5ee480b 100644
--- a/src/sas/sascalc/doc_regen/makedocumentation.py
+++ b/src/sas/sascalc/doc_regen/makedocumentation.py
@@ -6,8 +6,8 @@
import subprocess
import shutil
-from os.path import join, abspath, dirname, basename
-from pathlib import Path
+from os.path import join, basename
+from pathlib import Path
from typing import Union
from sas.sascalc.fit import models
@@ -56,9 +56,9 @@ def create_user_files_if_needed():
with open(DOC_LOG, "w") as f:
# Write an empty file to eliminate any potential future file creation conflicts
pass
- if not MAIN_DOC_SRC.exists():
+ if not MAIN_DOC_SRC.exists() and ORIGINAL_DOCS_SRC.exists():
shutil.copytree(ORIGINAL_DOCS_SRC, MAIN_DOC_SRC)
- if not MAIN_BUILD_SRC.exists():
+ if not MAIN_BUILD_SRC.exists() and ORIGINAL_DOC_BUILD.exists():
shutil.copytree(ORIGINAL_DOC_BUILD, MAIN_BUILD_SRC)
@@ -80,7 +80,7 @@ def get_main_docs() -> list[Union[Path, os.path, str]]:
:return: A list of python files """
# The order in which these are added is important. if ABSOLUTE_TARGET_PLUGINS goes first, then we're not compiling the .py file stored in .sasview/plugin_models
- TARGETS = get_py(ABSOLUTE_TARGET_MAIN) + get_py(PLUGIN_PY_SRC)
+ TARGETS = get_py(MAIN_PY_SRC) + get_py(PLUGIN_PY_SRC)
base_targets = [basename(string) for string in TARGETS]
# Removes duplicate instances of the same file copied from plugins folder to source-temp/user/models/src/
@@ -92,25 +92,16 @@ def get_main_docs() -> list[Union[Path, os.path, str]]:
return TARGETS
-def call_regenmodel(filepath: Union[Path, os.path, str, list], regen_py: str):
+def call_regenmodel(filepath: list[Union[Path, os.path, str]]):
"""Runs regenmodel.py or regentoc.py (specified in parameter regen_py) with all found PY_FILES.
:param filepath: A file-path like object or list of file-path like objects to regenerate.
- :param regen_py: The regeneration python file to call (regenmodel.py or regentoc.py)
"""
- REGENMODEL = abspath(dirname(__file__)) + "/" + regen_py
- # Initialize command to be executed
- command = [
- sys.executable,
- REGENMODEL,
- ]
- # Append each filepath to command individually if passed in many files
- if isinstance(filepath, list):
- for string in filepath:
- command.append(string)
- else:
- command.append(filepath)
- subprocess.run(command)
+ from sas.sascalc.doc_regen.regenmodel import run_sphinx, process_model
+ filepaths = [Path(path) for path in filepath]
+ rst_files = [Path(process_model(py_file, True)) for py_file in filepaths]
+ output_path = MAIN_BUILD_SRC / "user" / "models"
+ run_sphinx(rst_files, output_path)
def generate_html(single_file: Union[Path, os.path, str, list] = "", rst: bool = False):
@@ -125,14 +116,9 @@ def generate_html(single_file: Union[Path, os.path, str, list] = "", rst: bool =
f.truncate(0)
DOCTREES = MAIN_BUILD_SRC / "doctrees"
if rst is False:
- single_rst = USER_DOC_SRC / "user" / "models" / single_file.replace('.py', '.rst')
+ single_rst = MAIN_DOC_SRC / "user" / "models" / single_file.name.replace('.py', '.rst')
else:
single_rst = Path(single_file)
- rst_path = list(single_rst.parts)
- rst_str = "/".join(rst_path)
- if rst_str.endswith("models/") or rst_str.endswith("user/"):
- # (re)sets value to empty string if nothing was entered
- single_rst = ""
os.environ['SAS_NO_HIGHLIGHT'] = '1'
command = [
sys.executable,
@@ -165,7 +151,7 @@ def call_all_files():
TARGETS = get_main_docs()
for file in TARGETS:
# easiest for regenmodel.py if files are passed in individually
- call_regenmodel(file, "regenmodel.py")
+ call_regenmodel([file])
# regentoc.py requires files to be passed in bulk or else LOTS of unexpected behavior
generate_toc(TARGETS)
@@ -177,19 +163,17 @@ def call_one_file(file: Union[Path, os.path, str]):
"""
from sas.sascalc.doc_regen.regentoc import generate_toc
TARGETS = get_main_docs()
- NORM_TARGET = join(ABSOLUTE_TARGET_MAIN, file)
- MODEL_TARGET = join(MAIN_PY_SRC, file)
+ MODEL_TARGET = MAIN_PY_SRC / file
+ PLUGIN_TARGET = PLUGIN_PY_SRC / file
# Determines if a model's source .py file from /user/models/src/ should be used or if the file from /plugin-models/ should be used
- if os.path.exists(NORM_TARGET) and os.path.exists(MODEL_TARGET):
- if os.path.getmtime(NORM_TARGET) < os.path.getmtime(MODEL_TARGET):
- file_call_path = MODEL_TARGET
- else:
- file_call_path = NORM_TARGET
- elif not os.path.exists(NORM_TARGET):
+ if os.path.exists(MODEL_TARGET) and os.path.exists(PLUGIN_TARGET):
+ # Model name collision between built-in models and plugin models: Choose the most recent
+ file_call_path = MODEL_TARGET if os.path.getmtime(PLUGIN_TARGET) < os.path.getmtime(MODEL_TARGET) else PLUGIN_TARGET
+ elif not os.path.exists(PLUGIN_TARGET):
file_call_path = MODEL_TARGET
else:
- file_call_path = NORM_TARGET
- call_regenmodel(file_call_path, "regenmodel.py") # There might be a cleaner way to do this but this approach seems to work and is fairly minimal
+ file_call_path = PLUGIN_TARGET
+ call_regenmodel([file_call_path])
generate_toc(TARGETS)
diff --git a/src/sas/sascalc/doc_regen/regenmodel.py b/src/sas/sascalc/doc_regen/regenmodel.py
index 6a3774cf61..717f15d1ee 100644
--- a/src/sas/sascalc/doc_regen/regenmodel.py
+++ b/src/sas/sascalc/doc_regen/regenmodel.py
@@ -41,6 +41,7 @@
import sys
import os
from os.path import basename, dirname, realpath, join as joinpath, exists
+from pathlib import Path
import math
import re
import shutil
@@ -56,7 +57,7 @@
from sasmodels.direct_model import DirectModel, call_profile
from sasmodels.data import empty_data1D, empty_data2D
-from sas.sascalc.doc_regen.makedocumentation import MAIN_DOC_SRC
+from sas.sascalc.doc_regen.makedocumentation import MAIN_DOC_SRC, DOC_LOG
from typing import Dict, Any
from sasmodels.kernel import KernelModel
@@ -347,13 +348,14 @@ def process_model(py_file: str, force=False) -> str:
:param py_file: The python model file that will be processed into ReST using sphinx.
:param force: Regardless of the ReST file age, relative to the python file, force the regeneration.
"""
- rst_file = joinpath(TARGET_DIR, basename(py_file).replace('.py', '.rst'))
+ py_file = Path(py_file)
+ rst_file = TARGET_DIR / py_file.name.replace('.py', '.rst')
if not (force or newer(py_file, rst_file) or newer(__file__, rst_file)):
#print("skipping", rst_file)
return rst_file
# Load the model file
- model_info = core.load_model_info(py_file)
+ model_info = core.load_model_info(str(py_file.absolute()))
if model_info.basefile is None:
model_info.basefile = py_file
@@ -389,7 +391,7 @@ def process_model(py_file: str, force=False) -> str:
return rst_file
-def run_sphinx(rst_files: list[str], output: list[str]):
+def run_sphinx(rst_files: list[str], output: str):
"""Use sphinx to build *rst_files*, storing the html in *output*.
:param rst_files: A list of ReST file names/paths to be processed into HTML.
@@ -397,7 +399,7 @@ def run_sphinx(rst_files: list[str], output: list[str]):
"""
print("Building index...")
- conf_dir = dirname(realpath(__file__))
+ conf_dir = MAIN_DOC_SRC
with open(joinpath(TARGET_DIR, 'index.rst'), 'w') as fid:
fid.write(".. toctree::\n\n")
for path in rst_files:
@@ -411,15 +413,8 @@ def run_sphinx(rst_files: list[str], output: list[str]):
TARGET_DIR,
output,
]
- process = subprocess.Popen(command, shell=False, stdout=subprocess.PIPE)
-
- # Make sure we can see process output in real time
- while True:
- output = process.stdout.readline()
- if process.poll() is not None:
- break
- if output:
- print(output.strip())
+ with open(DOC_LOG) as f:
+ subprocess.Popen(command, shell=False, stdout=f)
def main():
diff --git a/src/sas/sascalc/doc_regen/regentoc.py b/src/sas/sascalc/doc_regen/regentoc.py
index 677eb506cd..ce34267055 100644
--- a/src/sas/sascalc/doc_regen/regentoc.py
+++ b/src/sas/sascalc/doc_regen/regentoc.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
import sys
# make sure sasmodels is on the path
sys.path.append('..')
@@ -9,12 +7,7 @@
from sasmodels.core import load_model_info
from sas.sascalc.doc_regen.makedocumentation import MAIN_DOC_SRC
-try:
- from typing import Optional, IO, BinaryIO, List, Dict
-except ImportError:
- pass
-else:
- from sasmodels.modelinfo import ModelInfo
+from typing import Optional, IO, BinaryIO, List, Dict
TEMPLATE = """\
..
@@ -144,5 +137,9 @@ def generate_toc(model_files: list[str]):
f.close()
+def main(files):
+ generate_toc(model_files=files)
+
+
if __name__ == "__main__":
- generate_toc(sys.argv[1:])
+ main(sys.argv[1:])