Changes in / [9aac25d:98f3053] in sasmodels

Location:

sasmodels

Files:

• compare.py (modified) (2 diffs)
• convert.py (modified) (1 diff)
• kernel_template.c (modified) (2 diffs)
• models/img/vesicle_1d.jpg (added)
• models/img/vesicle_geometry.jpg (added)
• models/vesicle.c (added)
• models/vesicle.py (added)

sasmodels/compare.py

@@ -539 +539 @@
     if Ncomp > 0 and Nbase > 0:
         plt.subplot(133)
-        if '-abs' in opts:
+        if not opts['rel_err']:
             err, errstr, errview = resid, "abs err", "linear"
         else:
@@ -545 +545 @@
         #err,errstr = base/comp,"ratio"
         plot_theory(data, None, resid=err, view=errview, use_data=False)
+        if view == 'linear':
+            plt.xscale('linear')
         plt.title("max %s = %.3g"%(errstr, max(abs(err))))
         #cbar_title = errstr if errview=="linear" else "log "+errstr

sasmodels/convert.py

@@ -14 +14 @@
     'be_polyelectrolyte',
     'correlation_length',
+    'binary_hard_sphere'
 ]
 

sasmodels/kernel_template.c

@@ -16 +16 @@
      using namespace std;
      #if defined(_MSC_VER)
+         #include <limits>
          #include <float.h>
          #define kernel extern "C" __declspec( dllexport )
@@ -22 +23 @@
              inline double fmax(double x, double y) { return x<y ? y : x; }
              inline double isnan(double x) { return _isnan(x); }
+             #define NAN (std::numeric_limits<double>::quiet_NaN()) // non-signalling NaN
+             static double cephes_expm1(double x) {
+                 // Adapted from the cephes math library.
+                 // Copyright 1984 - 1992 by Stephen L. Moshier
+                 if (x != x || x == 0.0) {
+                     return x; // NaN and +/- 0
+                 } else if (x < -0.5 || x > 0.5) {
+                     return exp(x) - 1.0;
+                 } else {
+                     const double xsq = x*x;
+                     const double p = (((
+                          +1.2617719307481059087798E-4)*xsq
+                      +3.0299440770744196129956E-2)*xsq
+                      +9.9999999999999999991025E-1);
+                 const double q = ((((
+                      +3.0019850513866445504159E-6)*xsq
+                      +2.5244834034968410419224E-3)*xsq
+                      +2.2726554820815502876593E-1)*xsq
+                      +2.0000000000000000000897E0);
+                 double r = x * p;
+                     r =  r / (q - r);
+                     return r+r;
+                 }
+             }
+             #define expm1 cephes_expm1
      #else
          #define kernel extern "C"