Changeset 2a74b99 in sasmodels

Timestamp:

Feb 20, 2015 9:05:50 AM (10 years ago)

Author:

ajj

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:

4c8f9cd

Parents:

2eaae42

Message:

fixing pow/powr/pown issue

Location:

sasmodels

Files:

• convert.py (modified) (1 diff)
• generate.py (modified) (3 diffs)

sasmodels/convert.py

@@ -55 +55 @@
     """
     __import__('sasmodels.models.'+name)
-    model = getattr(sasmodels.models, name, None)
+    from . import models
+    model = getattr(models, name, None)
     mapping = model.oldpars
     oldname = model.oldname

sasmodels/generate.py

@@ -266 +266 @@
 #  define local
 #  define constant const
+#  define powr(a,b) pow(a,b)
+#  define pown(a,b) pow(a,b)
 #else
 #  ifdef USE_SINCOS
@@ -272 +274 @@
 #    define SINCOS(angle,svar,cvar) do {svar=sin(angle);cvar=cos(angle);} while (0)
 #  endif
-#  define pow(a,b) powr(a,b)
 #endif
 
@@ -503 +504 @@
     fn = q_pars['fn']
 
-    if len(pd_pars) > 0:
-        # Build polydispersity loops
-        depth = 4
-        offset = ""
-        loop_head = []
-        loop_end = []
-        for name in pd_pars:
-            subst = { 'name': name, 'offset': offset }
-            loop_head.append(indent(LOOP_OPEN%subst, depth))
-            loop_end.insert(0, (" "*depth) + "}")
-            offset += '+N'+name
-            depth += 2
+
+    # Build polydispersity loops
+    depth = 4
+    offset = ""
+    loop_head = []
+    loop_end = []
+    for name in pd_pars:
+        subst = { 'name': name, 'offset': offset }
+        loop_head.append(indent(LOOP_OPEN%subst, depth))
+        loop_end.insert(0, (" "*depth) + "}")
+        offset += '+N'+name
+        depth += 2
 
     # The volume parameters in the inner loop are used to call the volume()