Changeset d9ec8f9 in sasmodels

Timestamp:

Aug 7, 2017 4:56:57 PM (7 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:

c95d9255

Parents:

92708d8

Message:

elliptical cylinder axis ratio is 1 or greater

Location:

sasmodels

Files:

• compare.py (modified) (3 diffs)
• models/elliptical_cylinder.py (modified) (1 diff)

sasmodels/compare.py

@@ -79 +79 @@
     === model parameters ===
     -preset*/-random[=seed] preset or random parameters
-    -sets=n generates n random datasets, with the seed given by -random=seed
+    -sets=n generates n random datasets with the seed given by -random=seed
     -pars/-nopars* prints the parameter set or not
     -default/-demo* use demo vs default parameters
@@ -1140 +1140 @@
         'title'     : None,
         'datafile'  : None,
-        'sets'      : 1,
+        'sets'      : 0,
         'engine'    : 'default',
         'evals'     : '1',
@@ -1199 +1199 @@
         opts['is2d'] = True
 
-    # Force random if more than one set
-    if opts['sets'] > 1 and opts['seed'] < 0:
+    # Force random if sets is used
+    if opts['sets'] >= 1 and opts['seed'] < 0:
         opts['seed'] = np.random.randint(1000000)
+    if opts['sets'] == 0:
+        opts['sets'] = 1
 
     # Create the computational engines

sasmodels/models/elliptical_cylinder.py

@@ -162 +162 @@
     V = 10**np.random.uniform(3, 9)
     length = 10**np.random.uniform(1, 3)
-    axis_ratio = 10**np.random.uniform(-2, 2)
+    axis_ratio = 10**np.random.uniform(0, 2)
     radius_minor = np.sqrt(V/length/axis_ratio)
     Vf = 10**np.random.uniform(-4, -2)