Changes in sasmodels/models/pringle.c [58c3367:c047acf] in sasmodels

File:

• sasmodels/models/pringle.c (modified) (3 diffs)

sasmodels/models/pringle.c

@@ -42 +42 @@
     }
 
+    #if 1
+    // TODO: should the normalization be to R^2 or the last value, r^2
+    // the gaussian window does not go all the way from 0 to 1.
+    //radius = Gauss76Z[75] * zm + zb;
+    *Sn = zm*sumS / (r*r);
+    *Cn = zm*sumC / (r*r);
+    #else
     *Sn = zm*sumS / (radius*radius);
     *Cn = zm*sumC / (radius*radius);
+    #endif
 }
 
@@ -101 +109 @@
 double form_volume(double radius, double thickness, double alpha, double beta)
 {
-    return M_PI*radius*radius*thickness;
+    // TODO: Normalize by form volume
+    //return M_PI*radius*radius*thickness;
+    return 1.0;
 }
 
@@ -116 +126 @@
     double contrast = sld_pringle - sld_solvent;
     double volume = M_PI*radius*radius*thickness;
-    return 1.0e-4*form * square(contrast * volume);
+    // TODO: If normalize by form volume, need an extra volume here
+    //return 1.0e-4*form * square(contrast * volume);
+    return 1.0e-4*form * square(contrast) * volume;
 }