Changes in / [6cefbc9:9acade6] in sasmodels
 Location:
 sasmodels/models
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

sasmodels/models/pringle.c
rc047acf r58c3367 42 42 } 43 43 44 #if 145 // TODO: should the normalization be to R^2 or the last value, r^246 // 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 #else51 44 *Sn = zm*sumS / (radius*radius); 52 45 *Cn = zm*sumC / (radius*radius); 53 #endif54 46 } 55 47 … … 109 101 double form_volume(double radius, double thickness, double alpha, double beta) 110 102 { 111 // TODO: Normalize by form volume 112 //return M_PI*radius*radius*thickness; 113 return 1.0; 103 return M_PI*radius*radius*thickness; 114 104 } 115 105 … … 126 116 double contrast = sld_pringle  sld_solvent; 127 117 double volume = M_PI*radius*radius*thickness; 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; 118 return 1.0e4*form * square(contrast * volume); 131 119 } 
sasmodels/models/pringle.py
r40a87fa r5fd684d 17 17 .. math:: 18 18 19 C_n = \ int^{R}_{0} r dr\cos(qr^2\alpha \cos{\psi})19 C_n = \frac{1}{r^2}\int^{R}_{0} r dr\cos(qr^2\alpha \cos{\psi}) 20 20 J_n\left( qr^2\beta \cos{\psi}\right) 21 21 J_{2n}\left( qr \sin{\psi}\right) … … 23 23 .. math:: 24 24 25 S_n = \ int^{R}_{0} r dr\sin(qr^2\alpha \cos{\psi})25 S_n = \frac{1}{r^2}\int^{R}_{0} r dr\sin(qr^2\alpha \cos{\psi}) 26 26 J_n\left( qr^2\beta \cos{\psi}\right) 27 27 J_{2n}\left( qr \sin{\psi}\right) … … 47 47 **Last Modified by:** Wojciech Wpotrzebowski **on:** March 20, 2016 48 48 49 **Last Reviewed by:** Paul Butler **on:** March 21, 201649 **Last Reviewed by:** Andrew Jackson **on:** September 26, 2016 50 50 51 51 """ … … 102 102 'sld_pringle': 1.0, 103 103 'sld_solvent': 6.3, 104 'background': 6.3,105 }, 0.1, 16.185532],104 'background': 0.001, 105 }, 0.1, 9.87676], 106 106 107 107 [{'scale' : 1.0, … … 112 112 'sld_pringle': 1.0, 113 113 'sld_solvent': 6.3, 114 'background': 6.3,115 }, 0.01, 29 7.153496],114 'background': 0.001, 115 }, 0.01, 290.56723], 116 116 117 117 [{'scale' : 1.0, … … 122 122 'sld_pringle': 1.0, 123 123 'sld_solvent': 6.3, 124 'background': 6.3, 125 }, 0.001, 324.021256415], 126 127 [{'scale' : 1.0, 128 'radius': 60.0, 129 'thickness': 10.0, 130 'alpha': 0.001, 131 'beta': 0.02, 132 'sld_pringle': 1.0, 133 'sld_solvent': 6.3, 134 'background': 6.3, 135 }, (0.001, 90.0), 6.30000026876], 124 'background': 0.001, 125 }, 0.001, 317.40847], 136 126 ]
Note: See TracChangeset
for help on using the changeset viewer.