Changeset b39bf3b in sasmodels for sasmodels/model_test.py

Timestamp:

Mar 28, 2019 11:46:52 AM (5 years ago)

Author:

ajj

Branches:

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

Children:

d8e81f7

Parents:

f942f4d

Message:

Working on structure factor / beta tests

File:

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

sasmodels/model_test.py

@@ -247 +247 @@
                                            platform=self.platform)
                     # run the tests
-                    self.info = ps_model.info
+                    #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])
@@ -307 +307 @@
             """Run a single test case."""
             user_pars, x, y = test[:3]
-            pars = expand_pars(self.info.parameters, user_pars)
-            invalid = invalid_pars(self.info.parameters, pars)
+            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)
             if invalid:
                 raise ValueError("Unknown parameters in test: " + ", ".join(invalid))