Changeset 58c3367 in sasmodels for sasmodels/models/pringle.c
- Timestamp:
- Sep 26, 2016 5:01:05 PM (8 years ago)
- Branches:
- master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
- Children:
- 639042e
- Parents:
- 52ec91e
- File:
-
- 1 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.0e-4*form * square(contrast * volume); 130 return 1.0e-4*form * square(contrast) * volume; 118 return 1.0e-4*form * square(contrast * volume); 131 119 }
Note: See TracChangeset
for help on using the changeset viewer.