Changeset 36a2418 in sasmodels for sasmodels/models
- Timestamp:
- Mar 6, 2019 3:16:13 PM (5 years ago)
- Branches:
- master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
- Children:
- da3638f
- Parents:
- fa26e78 (diff), e5bbe64 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Location:
- sasmodels/models
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/models/pearl_necklace.c
r4453136 r9b5fd42 40 40 const double si = sas_sinx_x(q*A_s); 41 41 const double omsi = 1.0 - si; 42 const double pow_si = pow (si, num_pearls);42 const double pow_si = pown(si, num_pearls); 43 43 44 44 // form factor for num_pearls -
sasmodels/models/rpa.c
r71b751d r19dc29e7 25 25 double S0ba,Pbb,S0bb,Pbc,S0bc,Pbd,S0bd; 26 26 double S0ca,S0cb,Pcc,S0cc,Pcd,S0cd; 27 double S0da,S0db,S0dc;27 //double S0da,S0db,S0dc; 28 28 double Pdd,S0dd; 29 29 double Kaa,Kbb,Kcc; 30 30 double Kba,Kca,Kcb; 31 double Kda,Kdb,Kdc,Kdd;31 //double Kda,Kdb,Kdc,Kdd; 32 32 double Zaa,Zab,Zac,Zba,Zbb,Zbc,Zca,Zcb,Zcc; 33 33 double DenT,T11,T12,T13,T21,T22,T23,T31,T32,T33; … … 36 36 double N11,N12,N13,N21,N22,N23,N31,N32,N33; 37 37 double M11,M12,M13,M21,M22,M23,M31,M32,M33; 38 double S11,S12,S13,S14,S21,S22,S23,S24; 39 double S31,S32,S33,S34,S41,S42,S43,S44; 38 double S11,S12,S22,S23,S13,S33; 39 //double S21,S31,S32,S44; 40 //double S14,S24,S34,S41,S42,S43; 40 41 double Lad,Lbd,Lcd,Nav,Intg; 41 42 … … 115 116 S0cd=(Phicd*vcd*Ncd)*Pcd; 116 117 117 S0da=S0ad;118 S0db=S0bd;119 S0dc=S0cd;118 //S0da=S0ad; 119 //S0db=S0bd; 120 //S0dc=S0cd; 120 121 Pdd=2.0*(exp(-Xd)-1.0+Xd)/(Xd*Xd); // free D chain 121 122 S0dd=N[3]*Phi[3]*v[3]*Pdd; … … 198 199 S0ca=S0ac; 199 200 S0cb=S0bc; 200 S0da=S0ad;201 S0db=S0bd;202 S0dc=S0cd;201 //S0da=S0ad; 202 //S0db=S0bd; 203 //S0dc=S0cd; 203 204 204 205 // self chi parameter is 0 ... of course … … 206 207 Kbb=0.0; 207 208 Kcc=0.0; 208 Kdd=0.0;209 //Kdd=0.0; 209 210 210 211 Kba=Kab; 211 212 Kca=Kac; 212 213 Kcb=Kbc; 213 Kda=Kad;214 Kdb=Kbd;215 Kdc=Kcd;214 //Kda=Kad; 215 //Kdb=Kbd; 216 //Kdc=Kcd; 216 217 217 218 Zaa=Kaa-Kad-Kad; … … 294 295 S12= Q12*S0aa + Q22*S0ab + Q32*S0ac; 295 296 S13= Q13*S0aa + Q23*S0ab + Q33*S0ac; 296 S14=-S11-S12-S13;297 S21= Q11*S0ba + Q21*S0bb + Q31*S0bc;298 297 S22= Q12*S0ba + Q22*S0bb + Q32*S0bc; 299 298 S23= Q13*S0ba + Q23*S0bb + Q33*S0bc; 300 S24=-S21-S22-S23;301 S31= Q11*S0ca + Q21*S0cb + Q31*S0cc;302 S32= Q12*S0ca + Q22*S0cb + Q32*S0cc;303 299 S33= Q13*S0ca + Q23*S0cb + Q33*S0cc; 304 S34=-S31-S32-S33; 305 S41=S14; 306 S42=S24; 307 S43=S34; 308 S44=S11+S22+S33+2.0*S12+2.0*S13+2.0*S23; 300 //S21= Q11*S0ba + Q21*S0bb + Q31*S0bc; 301 //S31= Q11*S0ca + Q21*S0cb + Q31*S0cc; 302 //S32= Q12*S0ca + Q22*S0cb + Q32*S0cc; 303 //S44=S11+S22+S33+2.0*S12+2.0*S13+2.0*S23; 304 //S14=-S11-S12-S13; 305 //S24=-S21-S22-S23; 306 //S34=-S31-S32-S33; 307 //S41=S14; 308 //S42=S24; 309 //S43=S34; 309 310 310 311 //calculate contrast where L[i] is the scattering length of i and D is the matrix
Note: See TracChangeset
for help on using the changeset viewer.