Changeset 9762341 in sasmodels

Timestamp:

Oct 17, 2016 1:27:27 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

2126131

Parents:

8393c74

Message:

onion: update variables to match parameter names

Location:

sasmodels/models

Files:

• onion.c (modified) (2 diffs)
• onion.py (modified) (2 diffs)

sasmodels/models/onion.c

@@ -30 +30 @@
 
 static double
-form_volume(double core_radius, double n, double thickness[])
+form_volume(double radius_core, double n, double thickness[])
 {
   int i;
-  double r = core_radius;
+  double r = radius_core;
   for (i=0; i < n; i++) {
     r += thickness[i];
@@ -41 +41 @@
 
 static double
-Iq(double q, double sld_core, double core_radius, double sld_solvent,
+Iq(double q, double sld_core, double radius_core, double sld_solvent,
     double n_shells, double sld_in[], double sld_out[], double thickness[],
     double A[])
 {
   int n = (int)(n_shells+0.5);
-  double r_out = core_radius;
+  double r_out = radius_core;
   double f = f_exp(q, r_out, sld_core, 0.0, 0.0, 0.0, 0.0);
   for (int i=0; i < n; i++){

sasmodels/models/onion.py

@@ -366 +366 @@
     return np.asarray(z), np.asarray(rho)
 
-def ER(core_radius, n, thickness):
+def ER(radius_core, n, thickness):
     """Effective radius"""
-    return np.sum(thickness[:int(n[0])], axis=0) + core_radius
+    return np.sum(thickness[:int(n[0])], axis=0) + radius_core
 
 demo = {
     "sld_solvent": 2.2,
     "sld_core": 1.0,
-    "core_radius": 100,
+    "radius_core": 100,
     "n_shells": 4,
     "sld_in": [0.5, 1.5, 0.9, 2.0],
@@ -381 +381 @@
     # Could also specify them individually as
     # "A1": 0, "A2": -1, "A3": 1e-4, "A4": 1,
-    #"core_radius_pd_n": 10,
-    #"core_radius_pd": 0.4,
+    #"radius_core_pd_n": 10,
+    #"radius_core_pd": 0.4,
     #"thickness4_pd_n": 10,
     #"thickness4_pd": 0.4,