Changeset 1bf66d9 in sasmodels

Timestamp:

Apr 18, 2016 10:26:43 AM (9 years ago)

Author:

wojciech

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:

3a45c2c, 1448db7a

Parents:

a7c2cfe

Message:

Spherical SLD model doesn't crash but still some work needs to be done

Location:

sasmodels/models

Files:

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

sasmodels/models/spherical_sld.c

@@ -5 +5 @@
     double thick_inter[])
 {
-    double radius = 0.0;
     int i;
     double r = radius_core;
@@ -196 +195 @@
     dp[5] = sld_solvent;
     dp[6] = 0.0;
-
-    for (int i=1; i<n_shells; i++){
+    dp[7] = sld_flat[0];
+    //TODO: Something is messed up with this data strcucture!
+    dp[17] = thick_inter[0];
+    dp[27] = thick_flat[0];
+    dp[37] = func_inter[0];
+    dp[47] = nu_inter[0];
+
+    for (int i=1; i<=n_shells; i++){
         dp[i+7] = sld_flat[i];
         dp[i+17] = thick_inter[i];

sasmodels/models/spherical_sld.py

@@ -260 +260 @@
 
 
-demo = dict(
-    n=4,
-    scale=1.0,
-    sld_solvent=1.0,
-    background=0.0,
-    npts_inter=35.0,
-    )
+demo = {
+    "n_shells":4,
+    "npts_inter":35.0,
+    "radius_core":50.0,
+    "sld_core":2.07,
+    "sld_solvent": 1.0,
+    "sld_flat":[4.0,3.5,4.0,3.5,4.0],
+    "thick_flat":[100.0,100.0,100.0,100.0,100.0],
+    "func_inter":[0,0,0,0,0],
+    "thick_inter":[50.0,50.0,50.0,50.0,50.0],
+    "nu_inter":[2.5,2.5,2.5,2.5,2.5]
+    }
 
 #TODO: Not working yet