Changeset d507c3a in sasmodels for sasmodels/models

Timestamp:

Feb 18, 2016 5:44:59 AM (8 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:

c9f885e, cc3fac6

Parents:

7d4428c

Message:

Fixed deg→rad conversion

Location:

sasmodels/models

Files:

• stacked_disks.c (modified) (1 diff)
• stacked_disks.py (modified) (4 diffs)

sasmodels/models/stacked_disks.c

@@ -142 +142 @@
 
     double ct, st, cp, sp;
+
+    //convert angle degree to radian
+    theta = theta * M_PI/180.0;
+    phi = phi * M_PI/180.0;
+
     SINCOS(theta, st, ct);
     SINCOS(phi, sp, cp);

sasmodels/models/stacked_disks.py

@@ -166 +166 @@
       'n_stacking': 1.0,
       'sigma_d': 0.0,
-      'core_sld':4.0,
-      'layer_sld':-0.4,
-      'solvent_sd':5.0,
-      'theta':0.0,
-      'phi':0.0,
-      'scale':0.01,
-      'background':0.001,
+      'core_sld': 4.0,
+      'layer_sld': -0.4,
+      'solvent_sd': 5.0,
+      'theta': 0.0,
+      'phi': 0.0,
+      'scale': 0.01,
+      'background': 0.001,
      }, 0.001, 5075.12],
 
@@ -180 +180 @@
       'n_stacking': 1.0,
       'sigma_d': 0.0,
-      'core_sld':4.0,
-      'layer_sld':-0.4,
-      'solvent_sd':5.0,
-      'theta':0.0,
-      'phi':0.0,
-      'scale':0.01,
-      'background':0.001,
+      'core_sld': 4.0,
+      'layer_sld': -0.4,
+      'solvent_sd': 5.0,
+      'theta': 0.0,
+      'phi': 0.0,
+      'scale': 0.01,
+      'background': 0.001,
      }, [0.001, 90.0], [5075.12, 0.001]],
 
@@ -194 +194 @@
       'n_stacking': 1.0,
       'sigma_d': 0.0,
-      'core_sld':4.0,
-      'layer_sld':-0.4,
-      'solvent_sd':5.0,
-      'theta':0.0,
-      'phi':0.0,
-      'scale':0.01,
-      'background':0.001,
+      'core_sld': 4.0,
+      'layer_sld': -0.4,
+      'solvent_sd': 5.0,
+      'theta': 0.0,
+      'phi': 0.0,
+      'scale': 0.01,
+      'background': 0.001,
      }, ([0.4, 0.5]), [0.00105074, 0.00121761]],
 
@@ -208 +208 @@
       'n_stacking': 1.0,
       'sigma_d': 0.0,
-      'core_sld':4.0,
-      'layer_sld':-0.4,
-      'solvent_sd':5.0,
-      'theta':0.0,
-      'phi':0.0,
-      'scale':0.01,
-      'background':0.001,
+      'core_sld': 4.0,
+      'layer_sld': -0.4,
+      'solvent_sd': 5.0,
+      'theta': 0.0,
+      'phi': 0.0,
+      'scale': 0.01,
+      'background': 0.001,
      }, ([1.3, 1.57]), [0.0010039, 0.0010038]],
     ]