Changeset 6d6508e in sasmodels for sasmodels/resolution.py

Timestamp:

Apr 7, 2016 6:57:33 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

d2fc9a4

Parents:

3707eee

Message:

refactor model_info from dictionary to class

File:

• sasmodels/resolution.py (modified) (6 diffs)

sasmodels/resolution.py

@@ -476 +476 @@
     *pars* are the parameter values to use when evaluating.
     """
-    from sasmodels import core
+    from sasmodels import direct_model
     kernel = form.make_kernel([q])
-    theory = core.call_kernel(kernel, pars)
+    theory = direct_model.call_kernel(kernel, pars)
     kernel.release()
     return theory
@@ -502 +502 @@
     from scipy.integrate import romberg
 
-    par_set = set([p.name for p in form.info['parameters'].call_parameters])
+    par_set = set([p.name for p in form.info.parameters.call_parameters])
     if any(k not in par_set for k in pars.keys()):
         extra = set(pars.keys()) - par_set
@@ -557 +557 @@
     from scipy.integrate import romberg
 
-    par_set = set([p.name for p in form.info['parameters'].call_parameters])
+    par_set = set([p.name for p in form.info.parameters.call_parameters])
     if any(k not in par_set for k in pars.keys()):
         extra = set(pars.keys()) - par_set
@@ -694 +694 @@
 
     def _eval_sphere(self, pars, resolution):
-        from sasmodels import core
+        from sasmodels import direct_model
         kernel = self.model.make_kernel([resolution.q_calc])
-        theory = core.call_kernel(kernel, pars)
+        theory = direct_model.call_kernel(kernel, pars)
         result = resolution.apply(theory)
         kernel.release()
@@ -1045 +1045 @@
     import sys
     from sasmodels import core
+    from sasmodels import direct_model
     name = sys.argv[1] if len(sys.argv) > 1 else 'cylinder'
 
@@ -1065 +1066 @@
 
     kernel = model.make_kernel([resolution.q_calc])
-    theory = core.call_kernel(kernel, pars)
+    theory = direct_model.call_kernel(kernel, pars)
     Iq = resolution.apply(theory)