Changeset 2222134 in sasmodels for sasmodels/models/core_shell_bicelle.c
- Timestamp:
- Sep 30, 2016 9:07:16 AM (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:
- a807206
- Parents:
- 6e5b2a7
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/models/core_shell_bicelle.c
r43b7eea r2222134 1 double form_volume(double radius, double rim_thickness, double face_thickness, double length);1 double form_volume(double radius, double thick_rim, double thick_face, double length); 2 2 double Iq(double q, 3 3 double radius, 4 double rim_thickness,5 double face_thickness,4 double thick_rim, 5 double thick_face, 6 6 double length, 7 7 double core_sld, … … 13 13 double Iqxy(double qx, double qy, 14 14 double radius, 15 double rim_thickness,16 double face_thickness,15 double thick_rim, 16 double thick_face, 17 17 double length, 18 18 double core_sld, … … 24 24 25 25 26 double form_volume(double radius, double rim_thickness, double face_thickness, double length)26 double form_volume(double radius, double thick_rim, double thick_face, double length) 27 27 { 28 return M_PI*(radius+ rim_thickness)*(radius+rim_thickness)*(length+2*face_thickness);28 return M_PI*(radius+thick_rim)*(radius+thick_rim)*(length+2*thick_face); 29 29 } 30 30 … … 102 102 bicelle_kernel_2d(double q, double q_x, double q_y, 103 103 double radius, 104 double rim_thickness,105 double face_thickness,104 double thick_rim, 105 double thick_face, 106 106 double length, 107 107 double core_sld, … … 125 125 126 126 // Get the kernel 127 double answer = bicelle_kernel(q, radius, rim_thickness, face_thickness,127 double answer = bicelle_kernel(q, radius, thick_rim, thick_face, 128 128 length/2.0, core_sld, face_sld, rim_sld, 129 129 solvent_sld, alpha) / fabs(sin(alpha)); … … 136 136 double Iq(double q, 137 137 double radius, 138 double rim_thickness,139 double face_thickness,138 double thick_rim, 139 double thick_face, 140 140 double length, 141 141 double core_sld, … … 144 144 double solvent_sld) 145 145 { 146 double intensity = bicelle_integration(q, radius, rim_thickness, face_thickness,146 double intensity = bicelle_integration(q, radius, thick_rim, thick_face, 147 147 length, core_sld, face_sld, rim_sld, solvent_sld); 148 148 return intensity*1.0e-4; … … 152 152 double Iqxy(double qx, double qy, 153 153 double radius, 154 double rim_thickness,155 double face_thickness,154 double thick_rim, 155 double thick_face, 156 156 double length, 157 157 double core_sld, … … 166 166 double intensity = bicelle_kernel_2d(q, qx/q, qy/q, 167 167 radius, 168 rim_thickness,169 face_thickness,168 thick_rim, 169 thick_face, 170 170 length, 171 171 core_sld,
Note: See TracChangeset
for help on using the changeset viewer.