Changes in sasmodels/models/rpa.c [acfb094:6351bfa] in sasmodels

File:

• sasmodels/models/rpa.c (modified) (9 diffs)

sasmodels/models/rpa.c

@@ -39 +39 @@
   double S31,S32,S33,S34,S41,S42,S43,S44;
   double Lad,Lbd,Lcd,Nav,Intg;
-  
-  // Set values for non existent parameters (eg. no A or B in case 0 and 1 etc)
+
   //icase was shifted to N-1 from the original code
   if (icase <= 1){
@@ -58 +57 @@
     Kab = Kac = Kad = -0.0004;
   }
- 
-  // Set volume fraction of component D based on constraint that sum of vol frac =1
-  Phi[3]=1.0-Phi[0]-Phi[1]-Phi[2];
-
-  //set up values for cross terms in case of block copolymers (1,3,4,6,7,8,9)
+
   Nab=sqrt(N[0]*N[1]);
   Nac=sqrt(N[0]*N[2]);
@@ -84 +79 @@
   Phicd=sqrt(Phi[2]*Phi[3]);
 
-  // Calculate Q^2 * Rg^2 for each homopolymer assuming random walk 
   Xa=q*q*b[0]*b[0]*N[0]/6.0;
   Xb=q*q*b[1]*b[1]*N[1]/6.0;
@@ -90 +84 @@
   Xd=q*q*b[3]*b[3]*N[3]/6.0;
 
-  //calculate all partial structure factors Pij and normalize n^2
-  Paa=2.0*(exp(-Xa)-1.0+Xa)/(Xa*Xa); // free A chain form factor
-  S0aa=N[0]*Phi[0]*v[0]*Paa; // Phi * Vp * P(Q)= I(Q0)/delRho^2
-  Pab=((1.0-exp(-Xa))/Xa)*((1.0-exp(-Xb))/Xb); //AB diblock (anchored Paa * anchored Pbb) partial form factor
+  Paa=2.0*(exp(-Xa)-1.0+Xa)/(Xa*Xa);
+  S0aa=N[0]*Phi[0]*v[0]*Paa;
+  Pab=((1.0-exp(-Xa))/Xa)*((1.0-exp(-Xb))/Xb);
   S0ab=(Phiab*vab*Nab)*Pab;
-  Pac=((1.0-exp(-Xa))/Xa)*exp(-Xb)*((1.0-exp(-Xc))/Xc); //ABC triblock AC partial form factor
+  Pac=((1.0-exp(-Xa))/Xa)*exp(-Xb)*((1.0-exp(-Xc))/Xc);
   S0ac=(Phiac*vac*Nac)*Pac;
-  Pad=((1.0-exp(-Xa))/Xa)*exp(-Xb-Xc)*((1.0-exp(-Xd))/Xd); //ABCD four block
+  Pad=((1.0-exp(-Xa))/Xa)*exp(-Xb-Xc)*((1.0-exp(-Xd))/Xd);
   S0ad=(Phiad*vad*Nad)*Pad;
 
   S0ba=S0ab;
-  Pbb=2.0*(exp(-Xb)-1.0+Xb)/(Xb*Xb); // free B chain
+  Pbb=2.0*(exp(-Xb)-1.0+Xb)/(Xb*Xb);
   S0bb=N[1]*Phi[1]*v[1]*Pbb;
-  Pbc=((1.0-exp(-Xb))/Xb)*((1.0-exp(-Xc))/Xc); // BC diblock
+  Pbc=((1.0-exp(-Xb))/Xb)*((1.0-exp(-Xc))/Xc);
   S0bc=(Phibc*vbc*Nbc)*Pbc;
-  Pbd=((1.0-exp(-Xb))/Xb)*exp(-Xc)*((1.0-exp(-Xd))/Xd); // BCD triblock
+  Pbd=((1.0-exp(-Xb))/Xb)*exp(-Xc)*((1.0-exp(-Xd))/Xd);
   S0bd=(Phibd*vbd*Nbd)*Pbd;
 
   S0ca=S0ac;
   S0cb=S0bc;
-  Pcc=2.0*(exp(-Xc)-1.0+Xc)/(Xc*Xc); // Free C chain
+  Pcc=2.0*(exp(-Xc)-1.0+Xc)/(Xc*Xc);
   S0cc=N[2]*Phi[2]*v[2]*Pcc;
-  Pcd=((1.0-exp(-Xc))/Xc)*((1.0-exp(-Xd))/Xd); // CD diblock
+  Pcd=((1.0-exp(-Xc))/Xc)*((1.0-exp(-Xd))/Xd);
   S0cd=(Phicd*vcd*Ncd)*Pcd;
 
@@ -118 +111 @@
   S0db=S0bd;
   S0dc=S0cd;
-  Pdd=2.0*(exp(-Xd)-1.0+Xd)/(Xd*Xd); // free D chain
+  Pdd=2.0*(exp(-Xd)-1.0+Xd)/(Xd*Xd);
   S0dd=N[3]*Phi[3]*v[3]*Pdd;
-
-  // Reset all unused partial structure factors to 0 (depends on case)
   //icase was shifted to N-1 from the original code
   switch(icase){
@@ -202 +193 @@
   S0dc=S0cd;
 
-  // self chi parameter is 0 ... of course
   Kaa=0.0;
   Kbb=0.0;
@@ -253 +243 @@
   ZZ=S0ad*(T11*S0ad+T12*S0bd+T13*S0cd)+S0bd*(T21*S0ad+T22*S0bd+T23*S0cd)+S0cd*(T31*S0ad+T32*S0bd+T33*S0cd);
 
-  // D is considered the matrix or background component so enters here
   m=1.0/(S0dd-ZZ);
 
@@ -308 +297 @@
   S44=S11+S22+S33+2.0*S12+2.0*S13+2.0*S23;
 
-  //calculate contrast where L[i] is the scattering length of i and D is the matrix
-  //need to verify why the sqrt of Nav rather than just Nav (assuming v is molar volume)
   Nav=6.022045e+23;
   Lad=(L[0]/v[0]-L[3]/v[3])*sqrt(Nav);
@@ -316 +303 @@
 
   Intg=Lad*Lad*S11+Lbd*Lbd*S22+Lcd*Lcd*S33+2.0*Lad*Lbd*S12+2.0*Lbd*Lcd*S23+2.0*Lad*Lcd*S13;
-
-  //rescale for units of Lij^2 (in 10e-12 m^2 to m^2 ?)
-  Intg *= 1.0e-24;    
 
   return Intg;