Changeset 5d63ea0 in sasview for test

Timestamp:

Feb 17, 2015 8:45:34 AM (10 years ago)

Author:

smk78

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

54b9ad2

Parents:

66e579f (diff), 400155b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview.git

Location:

test

Files:

• pr_inversion/test/test_output.txt (added)
• sasdataloader/test/isis_1_0_write_test.xml (added)
• sasdataloader/test/isis_1_1_write_test.xml (added)
• sasdataloader/test/ring_testdata.txt (modified) (1 diff)
• sasdataloader/test/write_test.xml (added)

test/sasdataloader/test/ring_testdata.txt

@@ -1 +1 @@
 <X>   <Y>   <dY>
-0.157079632679 0.892216637179 0.0775663414595
-0.471238898038 0.98455818481 0.079657697118
-0.785398163397 0.961797998125 0.0788556980394
-1.09955742876 0.97171642327 0.0791285423182
-1.41371669412 1.0146882474 0.082063426639
-1.72787595947 1.00992701463 0.080353091764
-2.04203522483 1.02880481582 0.0815342153253
-2.35619449019 1.00598046038 0.0798251732283
-2.67035375555 1.07871021115 0.0836335498662
-2.98451302091 0.998456910563 0.079747331585
-3.29867228627 1.04419570592 0.0830428241489
-3.61283155163 1.01232642025 0.0808308513267
-3.92699081699 1.0083937443 0.0810028887009
-4.24115008235 1.03216852956 0.0810389534812
-4.55530934771 1.06499475793 0.0814085230439
-4.86946861306 0.982265097403 0.0805528988046
-5.18362787842 1.00390126667 0.0806633561062
-5.49778714378 0.980815954717 0.0793145659499
-5.81194640914 0.907713166456 0.0765782956648
-6.1261056745 0.983188286879 0.0797444057771
+0.0 0.974491286452 0.0803843574327
+0.314159265359 0.9046853025 0.0768971192264
+0.628318530718 0.964040908176 0.0790933208542
+0.942477796077 0.922142905769 0.0781616076625
+1.25663706144 1.02710537736 0.080875897538
+1.57079632679 1.01448978075 0.0808313893873
+1.88495559215 1.04677136013 0.0828850195035
+2.19911485751 1.00067189877 0.0790510747578
+2.51327412287 1.06280533013 0.0830643956456
+2.82743338823 1.04313751703 0.0824585190353
+3.14159265359 0.993559460696 0.0803376331443
+3.45575191895 0.998101030127 0.0813124293449
+3.76991118431 1.04589910764 0.0821364674302
+4.08407044967 0.997201556522 0.0797466854806
+4.39822971503 1.07289797405 0.0830165798358
+4.71238898038 1.01212391625 0.0803021745794
+5.02654824574 0.995907123899 0.0804649435453
+5.3407075111 0.991431571613 0.0803765721376
+5.65486677646 0.959020086792 0.0787114622667
+5.96902604182 0.945705788519 0.0767669312314