Changeset 57cb76d in sasmodels

Timestamp:

Feb 19, 2015 6:05:01 AM (9 years ago)

Author:

ajj

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:

3a45c2c, e7b3d7b

Parents:

e166cb9 (diff), ff58110 (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

Location:

sasmodels

Files:

• generate.py (modified) (1 diff)
• models/bcc.py (modified) (1 diff)

sasmodels/generate.py

@@ -757 +757 @@
     print "time:",toc()
 
-def demo():
-    from .models import cylinder
-    source, info = make(cylinder)
-    #print doc(cylinder)
-    print source
+def main():
+    if len(sys.argv) <= 1:
+        print "usage: python -m sasmodels.generate modelname"
+    else:
+        name = sys.argv[1]
+        import sasmodels.models
+        __import__('sasmodels.models.'+name)
+        model = getattr(sasmodels.models, name)
+        source, info = make(model); print source
+        #print doc(model)
 
 if __name__ == "__main__":
-    demo()
+    main()

sasmodels/models/bcc.py

@@ -80 +80 @@
 from numpy import pi, inf
 
-name = "BCCparacrystal"
+name = "bcc_paracrystal"
 title = "Body-centred cubic lattic with paracrystalline distortion"
 description = """