Changeset 9eb3632 in sasmodels for sasmodels/generate.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/generate.py (modified) (5 diffs)

sasmodels/generate.py

@@ -576 +576 @@
     source.append("#define MAX_PD %s"%partable.max_pd)
     source.append("#define NPARS %d"%partable.npars)
-    source.append("#define NUM_MAGNETIC %d" % len(magpars))
+    source.append("#define NUM_MAGNETIC %d" % partable.nmagnetic)
+    source.append("#define NUM_VALUES %d" % partable.nvalues)
     source.append("#define MAGNETIC_PARS %s"%",".join(str(k) for k in magpars))
 
@@ -593 +594 @@
     code = kernel[0]
     path = kernel[1].replace('\\', '\\\\')
-    source = [
+    iq = [
         # define the Iq kernel
         "#define KERNEL_NAME %s_Iq" % name,
@@ -601 +602 @@
         "#undef CALL_IQ",
         "#undef KERNEL_NAME",
-
+        ]
+
+    iqxy = [
         # define the Iqxy kernel from the same source with different #defines
         "#define KERNEL_NAME %s_Iqxy" % name,
@@ -609 +612 @@
         "#undef CALL_IQ",
         "#undef KERNEL_NAME",
-
+         ]
+
+    imagnetic = [
         # define the Imagnetic kernel
         "#define KERNEL_NAME %s_Imagnetic" % name,
@@ -620 +625 @@
         "#undef KERNEL_NAME",
     ]
-    return source
+    return iq+iqxy+imagnetic