Changeset 6458608 in sasmodels

Timestamp:

Jan 20, 2016 2:03:29 PM (9 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:

0420af7, 3a45c2c

Parents:

14ba6f6

Message:

fix compare for scale=None

Location:

sasmodels

Files:

• compare_many.py (modified) (1 diff)
• convert.py (modified) (1 diff)

sasmodels/compare_many.py

@@ -164 +164 @@
     model = sys.argv[1]
     if not (model in MODELS) and (model != "all"):
-        print('Bad model %s.  Use "all" or one of:')
+        print('Bad model %s.  Use "all" or one of:'%model)
         print_models()
         sys.exit(1)

sasmodels/convert.py

@@ -75 +75 @@
     for new, old in mapping.items():
         for pd, dot in PD_DOT:
-            if old+pd == new+dot:
+            if old and old+pd == new+dot:
                 continue
             if new+pd in newpars: