Changeset d8e81f7 in sasmodels for sasmodels/model_test.py

Timestamp:

Mar 28, 2019 9:49:06 AM (5 years ago)

Author:

ajj

Branches:

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

Children:

6140894

Parents:

b39bf3b (diff), 2ed7de0 (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 'ticket_822_v5_unit_tests' of ​https://github.com/SasView/sasmodels into ticket_822_v5_unit_tests

File:

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

sasmodels/model_test.py

@@ -247 +247 @@
                                            platform=self.platform)
                     # run the tests
+<<<<<<< HEAD
                     #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])
+=======
+>>>>>>> 2ed7de04217c5103c5fd8d7c14e29e04923269d5
                     results.append(self.run_one(ps_model, ps_test))
 
@@ -394 +397 @@
     invalid = []
     for par in sorted(pars.keys()):
-        # special handling of R_eff mode, which is not a usual parameter
+        # 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().
         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')