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

 1 edited
Legend:
 Unmodified
 Added
 Removed

sasmodels/models/pringle.c
r58c3367 rc047acf 42 42 } 43 43 44 #if 1 45 // TODO: should the normalization be to R^2 or the last value, r^2 46 // the gaussian window does not go all the way from 0 to 1. 47 //radius = Gauss76Z[75] * zm + zb; 48 *Sn = zm*sumS / (r*r); 49 *Cn = zm*sumC / (r*r); 50 #else 44 51 *Sn = zm*sumS / (radius*radius); 45 52 *Cn = zm*sumC / (radius*radius); 53 #endif 46 54 } 47 55 … … 101 109 double form_volume(double radius, double thickness, double alpha, double beta) 102 110 { 103 return M_PI*radius*radius*thickness; 111 // TODO: Normalize by form volume 112 //return M_PI*radius*radius*thickness; 113 return 1.0; 104 114 } 105 115 … … 116 126 double contrast = sld_pringle  sld_solvent; 117 127 double volume = M_PI*radius*radius*thickness; 118 return 1.0e4*form * square(contrast * volume); 128 // TODO: If normalize by form volume, need an extra volume here 129 //return 1.0e4*form * square(contrast * volume); 130 return 1.0e4*form * square(contrast) * volume; 119 131 }
Note: See TracChangeset
for help on using the changeset viewer.