Changeset 265c657 in sasmodels for sasmodels/models/sphere.py

Timestamp:

Mar 26, 2019 7:24:03 AM (5 years ago)

Author:

richardh

Branches:

master, ticket-1257-vesicle-product, ticket_1156, ticket_822_more_unit_tests

Children:

d8b7efa

Parents:

2464785

Message:

making _mode variables consistent

File:

• sasmodels/models/sphere.py (modified) (1 diff)

sasmodels/models/sphere.py

@@ -98 +98 @@
     [{"radius": 120., "radius_pd": 0.2, "radius_pd_n":45},
      0.1, None, None, 120., None, 1.0],
-    [{"@S": "hardsphere"}, 0.1, 0.7940350343881906], # this is current value, not verified elsewhere yet
-#       [{"@S": "hardsphere",          # hard sphere structure factor
-#     "structure_factor_mode": 1,  # decoupling approximation  -  currently objecting to these new parameters
-#     "effective_radius_mode": 1   # equivalent sphere
-#        }, 0.1, None],
+    [{"@S": "hardsphere"},
+       0.1, 0.7940350343881906], # this is current value, not verified elsewhere yet
+        [{"@S": "hardsphere",          # hard sphere structure factor
+     "structure_factor_mode": 1,  # decoupling approximation
+     "effective_radius_mode": 1   # equivalent sphere
+         }, 0.1, 0.7940350343881906],
+        [{"@S": "hardsphere",          # hard sphere structure factor
+     "structure_factor_mode": 2,  #  -  WHY same result?
+     "effective_radius_mode": 2   # 
+         }, 0.1, 0.7940350343881906]
 ]
 # putting None for expected result will pass the test if there are no errors from the routine, but without any check on the value of the result