Changeset 67cc0ff in sasmodels for sasmodels/autoc.py

Timestamp:

Dec 18, 2017 4:19:53 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Children:

7b1dcf9

Parents:

1941ec6

Message:

update to new sasmodels api

File:

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

sasmodels/autoc.py

@@ -49 +49 @@
         return
 
-    public_methods = "Iq", "Iqxy", "form_volume"
+    public_methods = "Iq", "Iqac", "Iqabc", "Iqxy", "form_volume"
 
     tagged = [] # type: List[str]
@@ -98 +98 @@
                 snippets.append(define_constant(name, obj))
             elif isinstance(obj, special.Gauss):
-                #constants["GAUSS_N"] = obj.n
-                #constants["GAUSS_Z"] = obj.z
-                #constants["GAUSS_W"] = obj.w
-                libs.append('lib/gauss%d.c'%obj.n)
+                for var, value in zip(("N", "Z", "W"), (obj.n, obj.z, obj.w)):
+                    var = "GAUSS_"+var
+                    constants[var] = value
+                    snippets.append('#line 1 "%s"'%escaped_filename)
+                    snippets.append(define_constant(var, value))
+                #libs.append('lib/gauss%d.c'%obj.n)
                 source = (source.replace(name+'.n', 'GAUSS_N')
                           .replace(name+'.z', 'GAUSS_Z')
@@ -126 +128 @@
     info.source = unique_libs
     info.c_code = "\n".join(snippets)
-    info.Iq = info.Iqxy = info.form_volume = None
+    info.Iq = info.Iqac = info.Iqabc = info.Iqxy = info.form_volume = None
 
 def define_constant(name, value):