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

Timestamp:

Oct 1, 2016 12:42:06 AM (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/parallelepiped.c (modified) (6 diffs)

sasmodels/models/parallelepiped.c

@@ -1 @@
-double form_volume(double a_side, double b_side, double c_side);
-double Iq(double q, double sld, double solvent_sld, double a_side, double b_side, double c_side);
+double form_volume(double length_a, double length_b, double length_c);
+double Iq(double q, double sld, double solvent_sld, double length_a, double length_b, double length_c);
 double Iqxy(double qx, double qy, double sld, double solvent_sld,
-    double a_side, double b_side, double c_side, double theta, double phi, double psi);
+    double length_a, double length_b, double length_c, double theta, double phi, double psi);
 
 // From Igor library
@@ -32 +32 @@
 
 
-double form_volume(double a_side, double b_side, double c_side)
+double form_volume(double length_a, double length_b, double length_c)
 {
-    return a_side * b_side * c_side;
+    return length_a * length_b * length_c;
 }
 
@@ -41 +41 @@
     double sld,
     double solvent_sld,
-    double a_side,
-    double b_side,
-    double c_side)
+    double length_a,
+    double length_b,
+    double length_c)
 {
     double tmp1, tmp2;
     
-    double mu = q * b_side;
+    double mu = q * length_b;
     
     // Scale sides by B
-    double a_scaled = a_side / b_side;
-    double c_scaled = c_side / b_side;
+    double a_scaled = length_a / length_b;
+    double c_scaled = length_c / length_b;
         
     //Order of integration
@@ -102 +102 @@
     }   
    
-    const double vd = (sld-solvent_sld) * form_volume(a_side, b_side, c_side);
+    const double vd = (sld-solvent_sld) * form_volume(length_a, length_b, length_c);
     
     // convert from [1e-12 A-1] to [cm-1] and 0.5 factor for outer integral
@@ -113 +113 @@
     double sld,
     double solvent_sld,
-    double a_side,
-    double b_side,
-    double c_side,
+    double length_a,
+    double length_b,
+    double length_c,
     double theta,
     double phi,
@@ -161 +161 @@
     
     // Call the IGOR library function to get the kernel
-    double form = _pkernel( q*a_side, q*b_side, q*c_side, cos_val_a, cos_val_b, cos_val_c);
+    double form = _pkernel( q*length_a, q*length_b, q*length_c, cos_val_a, cos_val_b, cos_val_c);
   
     // Multiply by contrast^2
-    const double vd = (sld - solvent_sld) * form_volume(a_side, b_side, c_side);
+    const double vd = (sld - solvent_sld) * form_volume(length_a, length_b, length_c);
     return 1.0e-4 * vd * vd * form;
 }