Changeset 56fac50 in sasmodels

Timestamp:

Mar 14, 2016 6:35:17 AM (9 years ago)

Author:

smk78

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:

cf95788

Parents:

4b0e1f3 (diff), 6869ceb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasmodels

Files:

• example/model.py (added)
• sasmodels/compare.py (modified) (5 diffs)
• sasmodels/data.py (modified) (1 diff)
• sasmodels/models/_onion.py (added)
• sasmodels/models/img/onion_1d.jpg (added)
• sasmodels/models/img/onion_annotated_profile.gif (added)
• sasmodels/models/img/onion_profile.jpg (added)
• sasmodels/models/onion.c (added)
• sasmodels/models/rpa.py (modified) (1 diff)
• doc/rst_prolog (modified) (1 diff)
• sasmodels/generate.py (deleted)
• sasmodels/models/adsorbed_layer.py (added)
• sasmodels/models/img/adsorbed_layer_1d.jpg (added)

sasmodels/compare.py

@@ -31 +31 @@
 import sys
 import math
-from os.path import basename, dirname, join as joinpath
-import glob
 import datetime
 import traceback
@@ -98 +96 @@
 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 +666 @@
     Parse command line options.
     """
+    MODELS = core.list_models()
     flags = [arg for arg in sys.argv[1:]
              if arg.startswith('-')]
@@ -683 +679 @@
         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 +765 @@
         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

sasmodels/data.py

@@ -548 +548 @@
     #plottable = Iq
     plottable = masked_array(image, ~valid | data.mask)
+    # Divide range by 10 to convert from angstroms to nanometers
     xmin, xmax = min(data.qx_data)/10, max(data.qx_data)/10
     ymin, ymax = min(data.qy_data)/10, max(data.qy_data)/10

sasmodels/models/rpa.py

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

doc/rst_prolog

@@ -60 +60 @@
 .. |deg| unicode:: U+00B0
 .. |g/cm^3| replace:: g\ |cdot|\ cm\ :sup:`-3`
+.. |mg/m^2| replace:: mg\ |cdot|\ m\ :sup:`-2`
 .. |fm^2| replace:: fm\ :sup:`2`
 .. |Ang*cm^-1| replace:: |Ang|\ |cdot|\ cm\ :sup:`-1`