Changeset 8698a0d in sasmodels for sasmodels/compare.py

Timestamp:

Oct 17, 2017 9:53:01 PM (7 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:

32f87a5

Parents:

becded3

git-author:

Paul Kienzle <pkienzle@…> (10/17/17 16:23:09)

git-committer:

Paul Kienzle <pkienzle@…> (10/17/17 21:53:01)

Message:

revise api for oriented shapes, allowing jitter in the frame of the sample

File:

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

sasmodels/compare.py

@@ -91 +91 @@
 
     === precision options ===
-    -calc=default uses the default calcution precision
+    -engine=default uses the default calcution precision
     -single/-double/-half/-fast sets an OpenCL calculation engine
     -single!/-double!/-quad! sets an OpenMP calculation engine
@@ -110 +110 @@
 vary from 64-bit to 128-bit, with 80-bit floats being common (1e-19 precision).
 On unix and mac you may need single quotes around the DLL computation
-engines, such as -calc='single!,double!' since !, is treated as a history
+engines, such as -engine='single!,double!' since !, is treated as a history
 expansion request in the shell.
 
@@ -122 +122 @@
 
     # compare single and double precision calculation for a barbell
-    sascomp barbell -calc=single,double
+    sascomp barbell -engine=single,double
 
     # generate 10 random lorentz models, with seed=27
@@ -131 +131 @@
 
     # model timing test requires multiple evals to perform the estimate
-    sascomp pringle -calc=single,double -timing=100,100 -noplot
+    sascomp pringle -engine=single,double -timing=100,100 -noplot
 """
 
@@ -1017 +1017 @@
 
     # Precision options
-    'calc=',
+    'engine=',
     'half', 'fast', 'single', 'double', 'single!', 'double!', 'quad!',
     'sasview',  # TODO: remove sasview 3.x support
@@ -1167 +1167 @@
         elif arg.startswith('-title='):    opts['title'] = arg[7:]
         elif arg.startswith('-data='):     opts['datafile'] = arg[6:]
-        elif arg.startswith('-calc='):     opts['engine'] = arg[6:]
+        elif arg.startswith('-engine='):   opts['engine'] = arg[8:]
         elif arg.startswith('-neval='):    opts['evals'] = arg[7:]
         elif arg == '-random':  opts['seed'] = np.random.randint(1000000)