Changeset 9eb3632 in sasmodels for sasmodels/direct_model.py

Timestamp:

Jul 23, 2016 12:54:17 AM (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:

7b7da6b

Parents:

6a0d6aa

Message:

restructure kernels using fixed PD loops

File:

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

sasmodels/direct_model.py

@@ -30 +30 @@
 from . import resolution
 from . import resolution2d
-from . import kernel
+from .details import build_details
 
 try:
@@ -65 +65 @@
         active = lambda name: True
 
+    #print("pars",[p.id for p in parameters.call_parameters])
     vw_pairs = [(get_weights(p, pars) if active(p.name)
                  else ([pars.get(p.name, p.default)], [1.0]))
                 for p in parameters.call_parameters]
 
-    call_details, values = kernel.build_details(calculator, vw_pairs)
-    magnetic = any(values[k]!=0 for k in parameters.magnetism_index)
+    call_details, values, is_magnetic = build_details(calculator, vw_pairs)
     #print("values:", values)
-    return calculator(call_details, values, cutoff, magnetic)
+    return calculator(call_details, values, cutoff, is_magnetic)
 
 def get_weights(parameter, values):