Changeset 6c497b7 in sasview for test/pr_inversion

Timestamp:

Apr 16, 2017 1:01:30 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

f94a935

Parents:

de99a5f0 (diff), e5cbbce (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' into log_binning

Location:

test/pr_inversion

Files:

• test/utest_invertor.py (modified) (1 diff)
• __init__.py (added)
• test/__init__.py (added)

test/pr_inversion/test/utest_invertor.py

@@ -576 +576 @@
     data_err = np.zeros(0)
     scale    = None
-    if not path == None:
+    if path is not None:
         input_f = open(path,'r')
         buff    = input_f.read()