Changeset 59ce4cb in sasmodels

Timestamp:

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

Author:

krzywon

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:

a146eaa, 170ea69

Parents:

a06430c (diff), f903f0a (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 remote-tracking branch 'origin/master'

Files:

• sasmodels/convert.py (modified) (1 diff)
• setup.py (modified) (1 diff)
• example/sesansfit.py (modified) (2 diffs)
• sasmodels/sesans.py (modified) (1 diff)

sasmodels/convert.py

@@ -15 +15 @@
     'be_polyelectrolyte',
     'correlation_length',
-    'fractal_core_shell'
+    'fractal_core_shell',
     'binary_hard_sphere',
 ]

setup.py

@@ -3 +3 @@
 packages = find_packages(exclude=['contrib', 'docs', 'tests*'])
 package_data = {
-    'sasmodels.models': ['*.c'],
+    'sasmodels.models': ['*.c','lib/*.c'],
+    'sasmodels': ['*.c'],
 }
 required = []

example/sesansfit.py

@@ -1 +1 @@
 from bumps.names import *
-from sas import core, bumps_model, sesans
+from sasmodels import core, bumps_model, sesans
 
 HAS_CONVERTER = True
@@ -30 +30 @@
         data = loader.load(file)
         if data is None: raise IOError("Could not load file %r"%(file))
+        data.needs_all_q = acceptance_angle is not None
         if HAS_CONVERTER == True:
             default_unit = "A"

sasmodels/sesans.py

@@ -23 +23 @@
     return np.arange(q_min, q_max, dq)
     
-def make_allq(data):
+def make_all_q(data):
     if not data.needs_all_q:
         return []