Changes in sasmodels/model_test.py [2ed7de0:b39bf3b] in sasmodels

File:

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

sasmodels/model_test.py

@@ -247 +247 @@
                                            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))
 
@@ -304 +307 @@
             """Run a single test case."""
             user_pars, x, y = test[:3]
+            print("PS MODEL PARAMETERS:",[p.id for p in model.info.parameters.call_parameters])
             pars = expand_pars(model.info.parameters, user_pars)
             invalid = invalid_pars(model.info.parameters, pars)
@@ -390 +394 @@
     invalid = []
     for par in sorted(pars.keys()):
-        # Ignore the R_eff mode parameter when checking for valid parameters.
-        # It is an allowed parameter for a model even though it does not exist
-        # in the parameter table.  The call_Fq() function pops it from the
-        # parameter list and sends it directly to kernel.Fq().
+        # special handling of R_eff mode, which is not a usual parameter
         if par == product.RADIUS_MODE_ID:
+            continue
+        if par == product.RADIUS_TYPE_ID:
+            continue
+        if par == product.STRUCTURE_MODE_ID:
             continue
         parts = par.split('_pd')