Changeset 12c810f in sasmodels for sasmodels/models/lamellarCailleHG_kernel.c

Timestamp:

Mar 4, 2015 12:33:25 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

b89f519

Parents:

d6adfbe

Message:

fix summation limits on LamellarCailleHG

File:

• sasmodels/models/lamellarCailleHG_kernel.c (modified) (5 diffs)

sasmodels/models/lamellarCailleHG_kernel.c

@@ -8 +8 @@
       double Nlayers, 
       double dd,
-          double Cp, 
+      double Cp,
       double tail_sld,
       double head_sld,
@@ -18 +18 @@
       double Nlayers, 
       double dd,
-          double Cp, 
+      double Cp,
       double tail_sld,
       double head_sld,
@@ -34 +34 @@
   NN = trunc(Nlayers);    //be sure that NN is an integer
   
-  Pq = (head_sld-solvent_sld)*(sin(qval*(head_length+tail_length))-sin(qval*tail_length)) + 
+  Pq = (head_sld-solvent_sld)*(sin(qval*(head_length+tail_length))-sin(qval*tail_length)) +
               (tail_sld-solvent_sld)*sin(qval*tail_length);
   Pq *= Pq;
@@ -42 +42 @@
   ii=0;
   Sq = 0.0;
-  for(ii=1;ii<(NNint-1);ii+=1) {
+  for(ii=1;ii<=(NNint-1);ii+=1) {
 
     //fii = (double)ii;   //do I really need to do this? - unused variable, removed 18Feb2015
@@ -66 +66 @@
   Sq += 1.0;
 
+  //if (Sq < 0) printf("q=%g: S(q) =%g\n", qval, Sq);
+
   inten = 2.0*M_PI*Pq*Sq/(dd*qval*qval);