Changeset 29172aa in sasmodels for sasmodels/models/core_shell_ellipsoid.c

Timestamp:

Mar 18, 2016 4:25:12 AM (8 years ago)

Author:

richardh

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:

325e89a

Parents:

76d78c2

Message:

rename params and sort equations in docs for core_shell_ellipsoid

File:

• sasmodels/models/core_shell_ellipsoid.c (modified) (10 diffs)

sasmodels/models/core_shell_ellipsoid.c

@@ -8 +8 @@
           double equat_shell,
           double polar_shell,
-          double core_sld,
-          double shell_sld,
-          double solvent_sld);
+          double sld_core,
+          double sld_shell,
+          double sld_solvent);
 
 
@@ -18 +18 @@
           double equat_shell,
           double polar_shell,
-          double core_sld,
-          double shell_sld,
-          double solvent_sld,
+          double sld_core,
+          double sld_shell,
+          double sld_solvent,
           double theta,
           double phi);
@@ -40 +40 @@
           double equat_shell,
           double polar_shell,
-          double core_sld,
-          double shell_sld,
-          double solvent_sld)
+          double sld_core,
+          double sld_shell,
+          double sld_solvent)
 {
 
@@ -51 +51 @@
     double summ = 0.0;   //initialize intergral
 
-    const double delpc = core_sld - shell_sld;    //core - shell
-    const double delps = shell_sld - solvent_sld; //shell - solvent
+    const double delpc = sld_core - sld_shell;    //core - shell
+    const double delps = sld_shell - sld_solvent; //shell - solvent
 
     for(int i=0;i<N_POINTS_76;i++) {
@@ -81 +81 @@
           double equat_shell,
           double polar_shell,
-          double core_sld,
-          double shell_sld,
-          double solvent_sld,
+          double sld_core,
+          double sld_shell,
+          double sld_solvent,
           double theta,
           double phi)
@@ -96 +96 @@
     const double cyl_y = sin(theta);
 
-    const double sldcs = core_sld - shell_sld;
-    const double sldss = shell_sld- solvent_sld;
+    const double sldcs = sld_core - sld_shell;
+    const double sldss = sld_shell- sld_solvent;
 
     // Compute the angle btw vector q and the
@@ -124 +124 @@
           double equat_shell,
           double polar_shell,
-          double core_sld,
-          double shell_sld,
-          double solvent_sld)
+          double sld_core,
+          double sld_shell,
+          double sld_solvent)
 {
     double intensity = core_shell_ellipsoid_kernel(q,
@@ -133 +133 @@
            equat_shell,
            polar_shell,
-           core_sld,
-           shell_sld,
-           solvent_sld);
+           sld_core,
+           sld_shell,
+           sld_solvent);
 
     return intensity;
@@ -146 +146 @@
           double equat_shell,
           double polar_shell,
-          double core_sld,
-          double shell_sld,
-          double solvent_sld,
+          double sld_core,
+          double sld_shell,
+          double sld_solvent,
           double theta,
           double phi)
@@ -159 +159 @@
                        equat_shell,
                        polar_shell,
-                       core_sld,
-                       shell_sld,
-                       solvent_sld,
+                       sld_core,
+                       sld_shell,
+                       sld_solvent,
                        theta,
                        phi);