Changeset 31eea1f in sasmodels for sasmodels/compare.py

Timestamp:

Oct 22, 2017 5:00:50 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

f728001

Parents:

2bccb5a

Message:

explore accuracy of different 1D integration schemes

File:

• sasmodels/compare.py (modified) (3 diffs)

sasmodels/compare.py

@@ -1196 +1196 @@
         elif arg.startswith('-accuracy='): opts['accuracy'] = arg[10:]
         elif arg.startswith('-cutoff='):   opts['cutoff'] = arg[8:]
-        elif arg.startswith('-random='):   opts['seed'] = int(arg[8:])
         elif arg.startswith('-title='):    opts['title'] = arg[7:]
         elif arg.startswith('-data='):     opts['datafile'] = arg[6:]
         elif arg.startswith('-engine='):   opts['engine'] = arg[8:]
         elif arg.startswith('-neval='):    opts['count'] = arg[7:]
+        elif arg.startswith('-random='):
+            opts['seed'] = int(arg[8:])
+            opts['sets'] = 0
+        elif arg == '-random':
+            opts['seed'] = np.random.randint(1000000)
+            opts['sets'] = 0
         elif arg.startswith('-sphere'):
             opts['sphere'] = int(arg[8:]) if len(arg) > 7 else 150
             opts['is2d'] = True
-        elif arg == '-random':  opts['seed'] = np.random.randint(1000000)
         elif arg == '-preset':  opts['seed'] = -1
         elif arg == '-mono':    opts['mono'] = True
@@ -1309 +1313 @@
     # Set the integration parameters to the half sphere
     opts['values'].extend([
-        'theta=90',
+        #'theta=90',
         'theta_pd=%g'%(90/np.sqrt(3)),
         'theta_pd_n=%d'%steps,
         'theta_pd_type=rectangle',
-        'phi=0',
+        #'phi=0',
         'phi_pd=%g'%(180/np.sqrt(3)),
         'phi_pd_n=%d'%(2*steps),
@@ -1320 +1324 @@
     ])
     if 'psi' in opts['info'][0].parameters:
-        opts['values'].append('psi=0')
+        #opts['values'].append('psi=0')
+        pass
 
 def parse_pars(opts, maxdim=np.inf):