Changeset f72d70a in sasmodels

Timestamp:

Mar 7, 2017 4:44:59 PM (8 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:

598857b

Parents:

c68c5e9

Message:

multi-compare: slightly nicer interface

Location:

sasmodels

Files:

• compare.py (modified) (1 diff)
• compare_many.py (modified) (5 diffs)

sasmodels/compare.py

@@ -321 +321 @@
     if '*' in name:
         name = name.split('*')[0]
+
+    # Suppress magnetism for python models (not yet implemented)
+    if callable(model_info.Iq):
+        pars.update(suppress_magnetism(pars))
 
     if name == 'barbell':

sasmodels/compare_many.py

@@ -189 +189 @@
     Print the command usage string.
     """
-    print("usage: compare_many.py MODEL COUNT (1dNQ|2dNQ) (CUTOFF|mono) (single|double|quad)")
+    print("usage: compare_many.py MODEL COUNT (1dNQ|2dNQ) (CUTOFF|mono) (single|double|quad)",
+          file=sys.stderr)
 
 
@@ -223 +224 @@
 below the cutoff will be ignored.  Use "mono" for monodisperse models.  The
 choice of polydisperse parameters, and the number of points in the distribution
-is set in compare.py defaults for each model.
+is set in compare.py defaults for each model.  Polydispersity is given in the
+"demo" attribute of each model.
 
 PRECISION is the floating point precision to use for comparisons.  If two
-precisions are given, then compare one to the other, ignoring sasview.
+precisions are given, then compare one to the other.  Precision is one of
+fast, single, double for GPU or single!, double!, quad! for DLL.  If no
+precision is given, then use single and double! respectively.
 
 Available models:
@@ -236 +240 @@
     Main program.
     """
-    if len(argv) not in (5, 6):
+    if len(argv) not in (3, 4, 5, 6):
         print_help()
         return
@@ -244 +248 @@
         model_list = [target] if target in MODELS else core.list_models(target)
     except ValueError:
-        print('Bad model %s.  Use model type or one of:'%model)
+        print('Bad model %s.  Use model type or one of:' % target, file=sys.stderr)
         print_models()
         print('model types: all, py, c, double, single, opencl, 1d, 2d, nonmagnetic, magnetic')
@@ -253 +257 @@
         assert argv[2][1] == 'd'
         Nq = int(argv[2][2:])
-        mono = argv[3] == 'mono'
+        mono = len(argv) <= 3 or argv[3] == 'mono'
         cutoff = float(argv[3]) if not mono else 0
-        base = argv[4]
-        comp = argv[5] if len(argv) > 5 else "sasview"
+        base = argv[4] if len(argv) > 4 else "single"
+        comp = argv[5] if len(argv) > 5 else "double!"
     except Exception:
         traceback.print_exc()