Changeset 1c6286d in sasmodels
 Timestamp:
 Mar 3, 2017 4:26:08 PM (3 years ago)
 Branches:
 master, core_shell_microgels, costrafo411, magnetic_model, ticket1257vesicleproduct, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
 Children:
 3f853beb
 Parents:
 5a0b3d7
 Location:
 sasmodels/models
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

sasmodels/models/lamellar_hg_stack_caille.c
rabb6e4f r1c6286d 28 28 29 29 Sq = 0.0; 30 for(int ii=1; ii <=Nlayers1; ii++) {30 for(int ii=1; ii < Nlayers; ii++) { 31 31 temp = 0.0; 32 32 alpha = Cp/4.0/M_PI/M_PI*(log(M_PI*ii) + Euler); … … 40 40 //if (temp < 0) printf("q=%g: ii=%d, cos(dd*q*ii)=cos(%g) < 0\n",qval,ii,dd*qval*ii); 41 41 //temp *= exp(1.0*(t2 + t3)/(2.0*(1.0+t1)) ); 42 temp *= exp(t2/2.0 42 temp *= exp(t2/2.0); 43 43 //temp /= sqrt(1.0+t1); 44 44 
sasmodels/models/lamellar_stack_caille.c
r56b0435 r1c6286d 26 26 27 27 Sq = 0.0; 28 // the vital "=" in ii<= added March 2015 29 for (int ii=1; ii<=Nlayers1; ii++) { 30 31 //fii = (double)ii; //do I really need to do this?  unused variable, removed 18Feb2015 32 28 for (int ii=1; ii < Nlayers; ii++) { 33 29 temp = 0.0; 34 30 alpha = Cp/4.0/M_PI/M_PI*(log(M_PI*ii) + Euler); … … 41 37 temp *= cos(dd*qval*ii); 42 38 //temp *= exp(1.0*(t2 + t3)/(2.0*(1.0+t1)) ); 43 temp *= exp(t2/2.0 39 temp *= exp(t2/2.0); 44 40 //temp /= sqrt(1.0+t1); 45 41
Note: See TracChangeset
for help on using the changeset viewer.