Changes in / [1353f60:e819f71] in sasmodels

Location:

sasmodels

Files:

• kernel_template.c (modified) (2 diffs)
• models/lamellarCailleHG_kernel.c (modified) (2 diffs)

sasmodels/kernel_template.c

@@ -10 +10 @@
 #ifndef USE_OPENCL
 #  ifdef __cplusplus
+     #include <cstdio>
      #include <cmath>
      #if defined(_MSC_VER)
@@ -20 +21 @@
        { svar=sin(angle); cvar=cos(angle); }
 #  else
+     #include <stdio.h>
      #include <math.h>
      #if defined(_MSC_VER)

sasmodels/models/lamellarCailleHG_kernel.c

@@ -55 +55 @@
     //temp *= cos(dd*qval*ii/(1.0+t1));
     temp *= cos(dd*qval*ii);
+    //if (temp < 0) printf("q=%g: ii=%d, cos(dd*q*ii)=cos(%g) < 0\n",qval,ii,dd*qval*ii);
     //temp *= exp(-1.0*(t2 + t3)/(2.0*(1.0+t1)) );
     temp *= exp(-t2/2.0 );
@@ -68 +69 @@
 
   inten *= 1.0e-04;   // 1/A to 1/cm
-
   return(inten);
 }