Changeset d51ea74 in sasmodels

Timestamp:

Feb 25, 2016 7:37:32 AM (9 years ago)

Author:

piotr

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:

d2950f4

Parents:

fa8011eb

Message:

Code review from TN

Location:

sasmodels/models

Files:

• multi_shell.c (modified) (2 diffs)
• multi_shell.py (modified) (1 diff)

sasmodels/models/multi_shell.c

@@ -9 +9 @@
 {
     //calculate with a loop, two shells at a time
-    int ii=0;
-    double fval=0.0;
+    int ii = 0;
+    double fval = 0.0;
     double voli = 0.0;
     const double sldi = core_sld-shell_sld;
@@ -28 +28 @@
 
         //do 2 layers at a time
-        ii+=1;
+        ii += 1;
 
-    } while(ii<=n_pairs-1);  //change to make 0 < n_pairs < 2 correspond to
-                             //unilamellar vesicles (C. Glinka, 11/24/03)
+    } while(ii <= n_pairs-1);  //change to make 0 < n_pairs < 2 correspond to
+                               //unilamellar vesicles (C. Glinka, 11/24/03)
 
     fval *= 1.0e-4*fval/voli;

sasmodels/models/multi_shell.py

@@ -4 +4 @@
 interleaved with layers of solvent. For *N = 1*, this returns the VesicleModel.
 
+For information about polarised and magnetic scattering, click here_.
+
+.. _here: polar_mag_help.html
+
 Definition
 ----------
+
+This model is a trivial extension of the CoreShell function to a larger number
+of shells. See the core_shell_ function for a diagram and documentation.
+
+.. _core_shell: core_shell_sphere.html
+
+Be careful! The SLDs and scale can be highly correlated. Hold as many of these
+parameters fixed as possible.
 
 .. figure:: img/multi_shell_fig1.jpg