Changeset 6652522 in sasmodels for sasmodels/model_test.py

Timestamp:

Mar 28, 2019 10:23:00 AM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ticket-1257-vesicle-product, ticket_1156, ticket_822_more_unit_tests

Children:

f942f4d

Parents:

a430f5f

Message:

update cylinder R_eff tests

File:

• sasmodels/model_test.py (modified) (2 diffs)

sasmodels/model_test.py

@@ -329 +329 @@
             else:
                 y1 = y
-                y2 = test[3] if not isinstance(test[3], list) else [test[3]]
-                F1, F2, R_eff, volume, volume_ratio = call_Fq(kernel, pars)
-                if F1 is not None:  # F1 is none for models with Iq instead of Fq
-                    self._check_vectors(x, y1, F1, 'F')
-                self._check_vectors(x, y2, F2, 'F^2')
+                y2 = test[3] if isinstance(test[3], list) else [test[3]]
+                F, Fsq, R_eff, volume, volume_ratio = call_Fq(kernel, pars)
+                if F is not None:  # F is none for models with Iq instead of Fq
+                    self._check_vectors(x, y1, F, 'F')
+                self._check_vectors(x, y2, Fsq, 'F^2')
                 self._check_scalar(test[4], R_eff, 'R_eff')
                 self._check_scalar(test[5], volume, 'volume')
                 self._check_scalar(test[6], volume_ratio, 'form:shell ratio')
-                return F2
+                return Fsq
 
         def _check_scalar(self, target, actual, name):
@@ -414 +414 @@
     """
     import math
+    if target == 0.:
+        return actual == 0.
     shift = 10**math.ceil(math.log10(np.abs(target)))
     return np.abs(target-actual)/shift < 1.5*10**-digits