Changeset 3750279 in sasmodels for sasmodels/generate.py

Timestamp:

Feb 20, 2015 8:03:08 AM (9 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:

2eaae42

Parents:

cfd4625 (diff), 99e6860 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasmodels

File:

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

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