Changeset a807206 in sasmodels for sasmodels/models/lamellar_hg_stack_caille.c

Timestamp:

Sep 30, 2016 10:42:06 PM (8 years ago)

Author:

butler

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:

caddb14, 5031ca3

Parents:

2222134

Message:

updating more parameter names addressing #649

File:

• sasmodels/models/lamellar_hg_stack_caille.c (modified) (3 diffs)

sasmodels/models/lamellar_hg_stack_caille.c

@@ -4 +4 @@
 
 double Iq(double qval,
-      double tail_length,
-      double head_length,
+      double length_tail,
+      double length_head,
       double Nlayers, 
       double dd,
@@ -14 +14 @@
 
 double Iq(double qval,
-      double tail_length,
-      double head_length,
+      double length_tail,
+      double length_head,
       double Nlayers, 
       double dd,
@@ -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)) +
-              (tail_sld-solvent_sld)*sin(qval*tail_length);
+  Pq = (head_sld-solvent_sld)*(sin(qval*(length_head+length_tail))-sin(qval*length_tail)) +
+              (tail_sld-solvent_sld)*sin(qval*length_tail);
   Pq *= Pq;
   Pq *= 4.0/(qval*qval);