Changes in / [56fac50:4b0e1f3] in sasmodels

Files:

sasmodels/compare.py

-                      r6869ceb
+                      ra4a7308
 import sys
 import math
+from os.path import basename, dirname, join as joinpath
+import glob
 import datetime
 import traceback
 …
 kerneldll.ALLOW_SINGLE_PRECISION_DLLS = True
+MODELS = core.list_models()
+# List of available models
+ROOT = dirname(__file__)
+MODELS = [basename(f)[:-3]
+          for f in sorted(glob.glob(joinpath(ROOT, "models", "[a-zA-Z]*.py")))]
 # CRUFT python 2.6
 …
     Parse command line options.
     """
-    MODELS = core.list_models()
     flags = [arg for arg in sys.argv[1:]
              if arg.startswith('-')]
 …
         print(columnize(MODELS, indent="  "))
         sys.exit(1)
+    name = args[0]
+    try:
+        model_definition = core.load_model_definition(name)
+    except ImportError, exc:
+        print(str(exc))
+        print("Use one of:\n    " + models)
+    if args[0] not in MODELS:
+        print("Model %r not available. Use one of:\n    %s"%(args[0], models))
         sys.exit(1)
     if len(args) > 3:
 …
         del engines[2:]
+    name = args[0]
+    model_definition = core.load_model_definition(name)
     n1 = int(args[1]) if len(args) > 1 else 1
     n2 = int(args[2]) if len(args) > 2 else 1

r7824276	rd18582e
548	548	#plottable = Iq
549	549	plottable = masked_array(image, ~valid \| data.mask)
550		~~# Divide range by 10 to convert from angstroms to nanometers~~
551	550	xmin, xmax = min(data.qx_data)/10, max(data.qx_data)/10
552	551	ymin, ymax = min(data.qy_data)/10, max(data.qy_data)/10

-                      r5cfda00
+                      rfa8011eb
     case_num = pars.get("case_num", parameters[0][2])
     if case_num < 2:
+        return HIDE_A
+    elif case_num < 5:
         return HIDE_AB
-    elif case_num < 5:
-        return HIDE_A
     else:
         return HIDE_NONE

Note: See TracChangeset for help on using the changeset viewer.