Changes in / [d8e81f7:b39bf3b] in sasmodels

Location:

sasmodels

Files:

• core.py (modified) (1 diff)
• direct_model.py (modified) (1 diff)
• model_test.py (modified) (2 diffs)
• product.py (modified) (1 diff)

sasmodels/core.py

@@ -376 +376 @@
     # type: () -> None
     """Check that model load works"""
-    from .product import RADIUS_ID, VOLFRAC_ID, STRUCTURE_MODE_ID, RADIUS_MODE_ID
     #Test the the model produces the parameters that we would expect
     model = load_model("cylinder@hardsphere*sphere")
     actual = [p.name for p in model.info.parameters.kernel_parameters]
-    target = ["sld", "sld_solvent", "radius", "length", "theta", "phi",
-              RADIUS_ID, VOLFRAC_ID, STRUCTURE_MODE_ID, RADIUS_MODE_ID,
-              "A_sld", "A_sld_solvent", "A_radius"]
+    target = ("sld sld_solvent radius length theta phi"
+              " radius_effective volfraction "
+              " structure_factor_mode effective_radius_type"
+              " A_sld A_sld_solvent A_radius").split()
     assert target == actual, "%s != %s"%(target, actual)
 

sasmodels/direct_model.py

@@ -76 +76 @@
     R_eff_type = int(pars.pop(RADIUS_MODE_ID, 1.0))
     mesh = get_mesh(calculator.info, pars, dim=calculator.dim, mono=mono)
-    #print("in call_Fq: pars", list(zip(*mesh))[0])
+    print("in call_Fq: pars", list(zip(*mesh))[0])
     call_details, values, is_magnetic = make_kernel_args(calculator, mesh)
     #print("in call_Fq: values:", values)

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))
 
@@ -397 +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')

sasmodels/product.py

@@ -39 +39 @@
 STRUCTURE_MODE_ID = "structure_factor_mode"
 RADIUS_MODE_ID = "radius_effective_mode"
+# rkh add this to pass to model_test
+RADIUS_TYPE_ID = "effective_radius_type"
 RADIUS_ID = "radius_effective"
 VOLFRAC_ID = "volfraction"