Changeset a7db39fa in sasmodels

Timestamp:

Mar 28, 2019 10:10:37 AM (6 years ago)

Author:

ajj

Branches:

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

Children:

6dccecc

Parents:

facb052

Message:

Fixing model tests to properly handle P*S tests

Location:

sasmodels

Files:

• direct_model.py (modified) (2 diffs)
• model_test.py (modified) (3 diffs)

sasmodels/direct_model.py

@@ -59 +59 @@
     """
     mesh = get_mesh(calculator.info, pars, dim=calculator.dim, mono=mono)
-    print("in call_kernel: pars:", list(zip(*mesh))[0])
+    #print("in call_kernel: pars:", list(zip(*mesh))[0])
     call_details, values, is_magnetic = make_kernel_args(calculator, mesh)
     #print("in call_kernel: values:", values)
@@ -118 +118 @@
         active = lambda name: True
 
-    print("in get_mesh: pars:",[p.id for p in parameters.call_parameters])
+    #print("in get_mesh: pars:",[p.id for p in parameters.call_parameters])
     mesh = [_get_par_weights(p, values, active(p.name))
             for p in parameters.call_parameters]

sasmodels/model_test.py

@@ -240 +240 @@
                     s_name = pars.pop('@S')
                     ps_test = [pars] + list(test[1:])
+                    #print("PS TEST PARAMS!!!",ps_test)
                     # build the P@S model
                     s_info = load_model_info(s_name)
-                    print("in run_all: s_info:", s_info)
                     ps_info = product.make_product_info(self.info, s_info)
                     ps_model = build_model(ps_info, dtype=self.dtype,
                                            platform=self.platform)
                     # run the tests
+                    self.info = ps_model.info
+                    #print("SELF.INFO PARAMS!!!",[p.id for p in self.info.parameters.call_parameters])
+                    #print("PS MODEL PARAMETERS:",[p.id for p in ps_model.info.parameters.call_parameters])
                     results.append(self.run_one(ps_model, ps_test))
 
@@ -397 +400 @@
         if par == product.STRUCTURE_MODE_ID:
             continue
-        if par == "radius_effective":    # test should not need this??
-            continue
         parts = par.split('_pd')
         if len(parts) > 1 and parts[1] not in ("", "_n", "nsigma", "type"):
@@ -414 +415 @@
     """
     import math
-    shift = 10**math.ceil(math.log10(abs(target)))
-    return abs(target-actual)/shift < 1.5*10**-digits
+    shift = 10**math.ceil(math.log10(np.abs(target)))
+    return np.abs(target-actual)/shift < 1.5*10**-digits
 
 # CRUFT: old interface; should be deprecated and removed