Changeset b3f6bc3 in sasmodels for sasmodels/generate.py

Timestamp:

Feb 15, 2015 4:07:00 PM (9 years ago)

Author:

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:

f786ff3

Parents:

cb6ecf4

Message:

support pure python model Iq/Iqxy?

File:

• sasmodels/generate.py (modified) (5 diffs)

sasmodels/generate.py

@@ -354 +354 @@
 """
 
+
+
+##########################################################
+#                                                        #
+#   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!   #
+#   !!                                              !!   #
+#   !!  KEEP THIS CODE CONSISTENT WITH PYKERNEL.PY  !!   #
+#   !!                                              !!   #
+#   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!   #
+#                                                        #
+##########################################################
+
+
 # Polydispersity loop body.
 # This computes the weight, and if it is sufficient, calls the scattering
@@ -387 +400 @@
 # to call the form_volume function from the user supplied kernel, and accumulate
 # a normalized weight.
-VOLUME_NORM="""const double vol_weight = %(weight)s;
-    vol += vol_weight*form_volume(%(pars)s);
+VOLUME_NORM="""const double vol_weight = %(vol_weight)s;
+    vol += vol_weight*form_volume(%(vol_pars)s);
     norm_vol += vol_weight;\
 """
@@ -490 +503 @@
     if vol_pars:
         subst = {
-            'weight': "*".join(p+"_w" for p in vol_pars),
-            'pars': ", ".join(vol_pars),
+            'vol_weight': "*".join(p+"_w" for p in vol_pars),
+            'vol_pars': ", ".join(vol_pars),
             }
         volume_norm = VOLUME_NORM%subst
@@ -637 +650 @@
             }
         source.append(WORK_FUNCTION%subst)
-    kernel_Iq = make_kernel(info, is_2D=False)
-    kernel_Iqxy = make_kernel(info, is_2D=True)
+    kernel_Iq = make_kernel(info, is_2D=False) if not callable(info['Iq']) else ""
+    kernel_Iqxy = make_kernel(info, is_2D=True) if not callable(info['Iqxy']) else ""
     kernel = "\n\n".join([KERNEL_HEADER]+source+[kernel_Iq, kernel_Iqxy])
     return kernel
@@ -718 +731 @@
 def demo_time():
     import datetime
+    from .models import cylinder
+    toc = lambda: (datetime.datetime.now()-tic).total_seconds()
     tic = datetime.datetime.now()
-    toc = lambda: (datetime.datetime.now()-tic).total_seconds()
-    path = os.path.dirname("__file__")
-    doc, c = make_model(os.path.join(path, "models", "cylinder.c"))
+    source, info = make(cylinder)
     print "time:",toc()
 
 def demo():
-    from os.path import join as joinpath, dirname
-    c, info, doc = make_model(joinpath(dirname(__file__), "models", "cylinder.c"))
-    #print doc
-    #print c
+    from .models import cylinder
+    source, info = make(cylinder)
+    #print doc(cylinder)
+    print source
 
 if __name__ == "__main__":