Changeset 92dfe0c in sasmodels
 Timestamp:
 Mar 22, 2017 10:17:12 PM (12 months ago)
 Branches:
 master, costrafo411, cudatest, doc_update, pytest, ticket1052, ticket896
 Children:
 67595af
 Parents:
 d605080
 Location:
 sasmodels/models
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

sasmodels/models/core_shell_parallelepiped.c
r1e7b0db r92dfe0c 134 134 double psi) 135 135 { 136 double q, cos_val_a, cos_val_b, cos_val_c;137 ORIENT_ASYMMETRIC(qx, qy, theta, phi, psi, q, cos_val_c, cos_val_b, cos_val_a);136 double q, zhat, yhat, xhat; 137 ORIENT_ASYMMETRIC(qx, qy, theta, phi, psi, q, xhat, yhat, zhat); 138 138 139 139 // cspkernel in csparallelepiped recoded here … … 160 160 double tc = length_a + 2.0*thick_rim_c; 161 161 //handle arg=0 separately, as sin(t)/t > 1 as t>0 162 double siA = sas_sinx_x(0.5*q*length_a* cos_val_a);163 double siB = sas_sinx_x(0.5*q*length_b* cos_val_b);164 double siC = sas_sinx_x(0.5*q*length_c* cos_val_c);165 double siAt = sas_sinx_x(0.5*q*ta* cos_val_a);166 double siBt = sas_sinx_x(0.5*q*tb* cos_val_b);167 double siCt = sas_sinx_x(0.5*q*tc* cos_val_c);162 double siA = sas_sinx_x(0.5*q*length_a*xhat); 163 double siB = sas_sinx_x(0.5*q*length_b*yhat); 164 double siC = sas_sinx_x(0.5*q*length_c*zhat); 165 double siAt = sas_sinx_x(0.5*q*ta*xhat); 166 double siBt = sas_sinx_x(0.5*q*tb*yhat); 167 double siCt = sas_sinx_x(0.5*q*tc*zhat); 168 168 169 169 
sasmodels/models/core_shell_parallelepiped.py
r797a8e3 r92dfe0c 44 44 45 45 F_{a}(Q,\alpha,\beta)= 46 \Bigg(\frac{sin(Q(L_A+2t_A)/2sin\alpha sin\beta)}{Q(L_A+2t_A)/2sin\alpha 47 sin\beta)} 48  \frac{sin(QL_A/2sin\alpha sin\beta)}{QL_A/2sin\alpha sin\beta)} \Bigg) 49 + \frac{sin(QL_B/2sin\alpha sin\beta)}{QL_B/2sin\alpha sin\beta)} 50 + \frac{sin(QL_C/2sin\alpha sin\beta)}{QL_C/2sin\alpha sin\beta)} 46 \left[\frac{\sin(Q(L_A+2t_A)/2\sin\alpha \sin\beta)}{Q(L_A+2t_A)/2\sin\alpha\sin\beta} 47  \frac{\sin(QL_A/2\sin\alpha \sin\beta)}{QL_A/2\sin\alpha \sin\beta} \right] 48 \left[\frac{\sin(QL_B/2\sin\alpha \sin\beta)}{QL_B/2\sin\alpha \sin\beta} \right] 49 \left[\frac{\sin(QL_C/2\sin\alpha \sin\beta)}{QL_C/2\sin\alpha \sin\beta} \right] 51 50 52 51 .. note:: … … 58 57 59 58 FITTING NOTES 60 If the scale is set equal to the particle volume fraction, phi, the returned59 If the scale is set equal to the particle volume fraction, $\phi$, the returned 61 60 value is the scattered intensity per unit volume, $I(q) = \phi P(q)$. 62 61 However, **no interparticle interference effects are included in this
Note: See TracChangeset
for help on using the changeset viewer.