Changeset fc0fcd0 in sasmodels for sasmodels/compare.py

Timestamp:

Mar 11, 2016 7:13:15 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

fdb1487

Parents:

bea7acb

Message:

remove duplicate code: model list is defined in core

File:

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

sasmodels/compare.py

@@ -98 +98 @@
 kerneldll.ALLOW_SINGLE_PRECISION_DLLS = True
 
-# List of available models
-ROOT = dirname(__file__)
-MODELS = [basename(f)[:-3]
-          for f in sorted(glob.glob(joinpath(ROOT, "models", "[a-zA-Z]*.py")))]
+MODELS = core.list_models()
 
 # CRUFT python 2.6
@@ -671 +668 @@
     Parse command line options.
     """
+    MODELS = core.list_models()
     flags = [arg for arg in sys.argv[1:]
              if arg.startswith('-')]
@@ -683 +681 @@
         print(columnize(MODELS, indent="  "))
         sys.exit(1)
-    if args[0] not in MODELS:
-        print("Model %r not available. Use one of:\n    %s"%(args[0], models))
+
+    name = args[0]
+    try:
+        model_definition = core.load_model_definition(name)
+    except ImportError, exc:
+        print(str(exc))
+        print("Use one of:\n    " + models)
         sys.exit(1)
     if len(args) > 3:
@@ -764 +767 @@
         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