Changeset 99e6860 in sasmodels

Timestamp:

Feb 20, 2015 3:33:18 AM (9 years ago)

Author:

David Mannicke <davidm@…>

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:

3a45c2c

Parents:

80768fc

Message:

minor bug fixes

Location:

sasmodels

Files:

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

sasmodels/convert.py

@@ -54 +54 @@
     Convert model from new style parameter names to old style.
     """
-    sasmodels = __import__('sasmodels.models.'+name)
-    newmodel = getattr(sasmodels.models, name, None)
-    mapping = newmodel.oldpars
-    oldname = newmodel.oldname
+    __import__('sasmodels.models.'+name)
+    model = getattr(sasmodels.models, name, None)
+    mapping = model.oldpars
+    oldname = model.oldname
     oldpars = _rename_pars(_unscale_sld(pars), mapping)
     return oldname, oldpars

sasmodels/generate.py

@@ -187 +187 @@
 # TODO: identify model files which have changed since loading and reload them.
 
-__all__ = ["make, doc", "sources", "use_single"]
+__all__ = ["make", "doc", "sources", "use_single"]
 
 import sys
@@ -266 +266 @@
 #  define local
 #  define constant const
-#  define powr(a,b) pow(a,b)
 #else
 #  ifdef USE_SINCOS
@@ -273 +272 @@
 #    define SINCOS(angle,svar,cvar) do {svar=sin(angle);cvar=cos(angle);} while (0)
 #  endif
+#  define pow(a,b) powr(a,b)
 #endif