Changeset f552ff3 in sasview for test/pr_inversion

Timestamp:

Mar 24, 2015 10:42:33 PM (10 years ago)

Author:

butler

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:

f71700b

Parents:

dea2f6e (diff), 9f7fbd9 (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

File:

• test/pr_inversion/test/test_output.txt (modified) (1 diff)

test/pr_inversion/test/test_output.txt

@@ -3 +3 @@
 #alpha=0.0007
 #chi2=836.797
-#elapsed=0.00199986
+#elapsed=0.000377893
 #qmin=None
 #qmax=None