Changeset 4fd2c63 in sasmodels

Timestamp:

Aug 3, 2016 12:41:06 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

b3796fa

Parents:

0dd4199 (diff), ec87470 (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 github.com:sasview/sasmodels

Location:

sasmodels

Files:

• kernel_header.c (modified) (1 diff)
• models/lib/sas_erf.c (modified) (3 diffs)
• models/spherical_sld.py (modified) (1 diff)
• convert.py (modified) (1 diff)

sasmodels/kernel_header.c

@@ -61 +61 @@
          #define NEED_EXPM1
          #define NEED_TGAMMA
+         // expf missing from windows?
+         #define expf exp
      #else
          #include <tgmath.h> // C99 type-generic math, so sin(float) => sinf

sasmodels/models/lib/sas_erf.c

@@ -280 +280 @@
     else
         x = a;*/
-
-    x = fabsf(a);
+    // TODO: tinycc does not support fabsf
+    x = fabs(a);
 
 
@@ -302 +302 @@
             return (0.0);
     }
-
     z = expf(z);
 
@@ -332 +331 @@
     float y, z;
 
-    if (fabsf(x) > 1.0)
+    // TODO: tinycc does not support fabsf
+    if (fabs(x) > 1.0)
         return (1.0 - erfcf(x));
 

sasmodels/models/spherical_sld.py

@@ -217 +217 @@
               ]
 # pylint: enable=bad-whitespace, line-too-long
-source = ["lib/sas_erf.c", "lib/librefl.c",  "lib/sph_j1c.c", "spherical_sld.c"]
+source = ["lib/polevl.c", "lib/sas_erf.c", "lib/librefl.c",  "lib/sph_j1c.c", "spherical_sld.c"]
 single = False  # TODO: fix low q behaviour
 

sasmodels/convert.py

@@ -319 +319 @@
             pars['n_shells'] = math.ceil(pars['n_shells'])
         elif name == 'spherical_sld':
+            pars['n_shells'] = math.ceil(pars['n_shells'])
+            pars['npts_inter'] = math.ceil(pars['npts_inter'])
+            pars['func_inter0'] = math.trunc(pars['func_inter0']+0.5)
             for k in range(1, 11):
+                pars['func_inter%d'%k] = math.trunc(pars['func_inter%d'%k]+0.5)
                 pars['thick_flat%d_pd_n'%k] = 0
                 pars['thick_inter%d_pd_n'%k] = 0