Changeset 67cc0ff in sasmodels

Timestamp:

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

Author:

Paul Kienzle <pkienzle@…>

Children:

7b1dcf9

Parents:

1941ec6

Message:

update to new sasmodels api

Files:

• .gitignore (modified) (1 diff)
• sasmodels/autoc.py (modified) (3 diffs)
• sasmodels/modelinfo.py (modified) (1 diff)
• sasmodels/models/_cylpy.py (modified) (2 diffs)

.gitignore

@@ -21 +21 @@
 /.idea
 .vscode
-xlate.c
 /sasmodels.egg-info/
 /example/Fit_*/

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):

sasmodels/modelinfo.py

@@ -820 +820 @@
     info.hidden = getattr(kernel_module, 'hidden', None) # type: ignore
 
+    info.lineno = {}
+    _find_source_lines(info, kernel_module)
+    if getattr(kernel_module, 'py2c', False):
+        try:
+            autoc.convert(info, kernel_module)
+        except Exception as exc:
+            logger.warn(str(exc) + " while converting %s from C to python"%name)
+
     if callable(info.Iq) and parameters.has_2d:
         raise ValueError("oriented python models not supported")
-
-    info.lineno = {}
-    _find_source_lines(info, kernel_module)
-    try:
-        autoc.convert(info, kernel_module)
-    except Exception as exc:
-        raise
-        logger.warn(str(exc))
 
     return info

sasmodels/models/_cylpy.py

@@ -138 +138 @@
              ]
 
+py2c = True
+
 def invalid(v):
     return v.radius < 0 or v.length < 0
@@ -169 +171 @@
     return 1.0e-4 * s * s * orient_avg_1D(q, radius, length)
 
-def Iqxy(qab, qc, sld, solvent_sld, radius, length):
+def Iqac(qab, qc, sld, solvent_sld, radius, length):
     s = (sld-solvent_sld) * form_volume(radius, length)
     form = fq(qab, qc, radius, length)