Changes in / [0c3e5d2:c5b7d07] in sasmodels

Files:

• compare.py (modified) (2 diffs)
• doc/developer/index.rst (deleted)
• example/sesansfit.py (deleted)
• sasmodels/bumps_model.py (modified) (8 diffs)
• sasmodels/generate.py (modified) (1 diff)
• sasmodels/hankel.py (added)
• sasmodels/models/fcc.c (deleted)
• sasmodels/models/fcc.py (deleted)
• sasmodels/sasview_model.py (modified) (3 diffs)
• sasmodels/sesans.py (deleted)
• sesansdemo.py (modified) (4 diffs)

compare.py

@@ -301 +301 @@
     ]
 
-def get_demo_pars(name):
-    import sasmodels.models
-    __import__('sasmodels.models.'+name)
-    model = getattr(sasmodels.models, name)
-    pars = getattr(model, 'demo', None)
-    if pars is None: pars = dict((p[0],p[2]) for p in model.parameters)
-    return pars
-
 def main():
     opts = [arg for arg in sys.argv[1:] if arg.startswith('-')]
@@ -330 +322 @@
     # if model does not define demo parameters
     name = args[0]
-    pars = get_demo_pars(name)
+    import sasmodels.models
+    __import__('sasmodels.models.'+name)
+    model = getattr(sasmodels.models, name)
+    pars = getattr(model, 'demo', None)
+    if pars is None: pars = dict((p[0],p[2]) for p in model.parameters)
 
     Nopencl = int(args[1]) if len(args) > 1 else 5

sasmodels/bumps_model.py

@@ -4 +4 @@
 import sys, os
 import datetime
-
-from sasmodels import sesans
 
 # CRUFT python 2.6
@@ -215 +213 @@
     #plt.axhline(-1, color='black', ls='--',lw=1, hold=True)
 
-def _plot_sesans(data, theory, view):
-    import matplotlib.pyplot as plt
-    resid = (theory - data.data)/data.err_data
-    plt.subplot(121)
-    plt.errorbar(data.SElength, data.data, yerr=data.err_data)
-    plt.plot(data.SElength, theory, '-', hold=True)
-    plt.xlabel('spin echo length (A)')
-    plt.ylabel('polarization')
-    plt.subplot(122)
-    plt.plot(data.SElength, resid, 'x')
-    plt.xlabel('spin echo length (A)')
-    plt.ylabel('residuals')
 
 def _plot_result2D(data, theory, view):
@@ -244 +230 @@
     plt.colorbar()
 
+def plot_result(data, theory, view='log'):
+    """
+    Plot the data and residuals.
+    """
+    if hasattr(data, 'qx_data'):
+        _plot_result2D(data, theory, view)
+    else:
+        _plot_result1D(data, theory, view)
+
+
 class BumpsModel(object):
     """
@@ -267 +263 @@
         self.model = model
         self.cutoff = cutoff
-        if hasattr(data, 'SElength'):
-            self.data_type = 'sesans'
-        elif hasattr(data, 'qx_data'):
-            self.data_type = 'Iqxy'
-        else:
-            self.data_type = 'Iq'
 
         partype = model.info['partype']
 
         # interpret data
-        if self.data_type == 'sesans':
-            q = sesans.make_q(data.q_zmax, data.Rmax)
-            self.index = slice(None,None)
-            self.iq = data.data
-            self.diq = data.err_data
-            self._theory = np.zeros_like(q)
-            q_vectors = [q]
-        elif self.data_type == 'Iqxy':
+        if hasattr(data, 'qx_data'):
             self.index = (data.mask==0) & (~np.isnan(data.data))
             self.iq = data.data[self.index]
@@ -293 +276 @@
             else:
                 q_vectors = [data.qx_data, data.qy_data]
-        elif self.data_type == 'Iq':
+        else:
             self.index = (data.x>=data.qmin) & (data.x<=data.qmax) & ~np.isnan(data.y)
             self.iq = data.y[self.index]
@@ -299 +282 @@
             self._theory = np.zeros_like(data.y)
             q_vectors = [data.x]
-        else:
-            raise ValueError("Unknown data type") # never gets here
 
         # Remember function inputs so we can delay loading the function and
@@ -352 +333 @@
             self._theory[self.index] = self._fn(pars, pd_pars, self.cutoff)
             #self._theory[:] = self._fn.eval(pars, pd_pars)
-            if self.data_type == 'sesans':
-                P = sesans.hankel(self.data.SElength, self.data.wavelength,
-                                  self.data.thickness, self._fn_inputs[0],
-                                  self._theory)
-                self._cache['theory'] = P
-            else:
-                self._cache['theory'] = self._theory
+            self._cache['theory'] = self._theory
         return self._cache['theory']
 
@@ -374 +349 @@
 
     def plot(self, view='log'):
-        """
-        Plot the data and residuals.
-        """
-        data, theory = self.data, self.theory()
-        if self.data_type == 'Iq':
-            _plot_result1D(data, theory, view)
-        elif self.data_type == 'Iqxy':
-            _plot_result2D(data, theory, view)
-        elif self.data_type == 'sesans':
-            _plot_sesans(data, theory, view)
-        else:
-            raise ValueError("Unknown data type")
-
-    def simulate_data(self, noise=None):
-        print "noise", noise
-        if noise is None:
-            noise = self.diq[self.index]
-        else:
-            noise = 0.01*noise
-            self.diq[self.index] = noise
-        y = self.theory()
-        y += y*np.random.randn(*y.shape)*noise
-        if self.data_type == 'Iq':
-            self.data.y[self.index] = y
-        elif self.data_type == 'Iqxy':
-            self.data.data[self.index] = y
-        elif self.data_type == 'sesans':
-            self.data.data[self.index] = y
-        else:
-            raise ValueError("Unknown model")
+        plot_result(self.data, self.theory(), view=view)
 
     def save(self, basename):

sasmodels/generate.py

@@ -722 +722 @@
         parameters = COMMON_PARAMETERS + kernel_module.parameters,
         source = getattr(kernel_module, 'source', []),
-        oldname = kernel_module.oldname,
-        oldpars = kernel_module.oldpars,
         )
     # Fill in attributes which default to None

sasmodels/sasview_model.py

@@ -32 +32 @@
 
 
-def make_class(kernel_module, dtype='single', namestyle='name'):
+def make_class(kernel_module, dtype='single'):
     """
     Load the sasview model defined in *kernel_module*.
 
     Returns a class that can be used directly as a sasview model.
-
-    Defaults to using the new name for a model. Setting namestyle='name'
-    will produce a class with a name compatible with SasView
     """
     model =  load_model(kernel_module, dtype=dtype)
@@ -45 +42 @@
         SasviewModel.__init__(self, model)
     attrs = dict(__init__=__init__)
-    ConstructedModel = type(model.info[namestyle],  (SasviewModel,), attrs)
+    ConstructedModel = type(model.info['name'],  (SasviewModel,), attrs)
     return ConstructedModel
 
@@ -57 +54 @@
 
         self.name = model.info['name']
-        self.oldname = model.info['oldname']
         self.description = model.info['description']
         self.category = None

sesansdemo.py

@@ -10 +10 @@
 
 # q-range parameters
-
 q = arange(0.0003, 1.0, 0.0003);    # [nm^-1] range wide enough for  Hankel transform
 dq=(q[1]-q[0])*1e9;   # [m^-1] step size in q, needed for integration
@@ -35 +34 @@
 
 clf()
-subplot(211)  # plot the SANS calculation
+subplot(1,2,1)  # plot the SANS calculation
 plot(q,I,'k')
 loglog(q,I)
@@ -56 +55 @@
 PP=exp(th*Lambda**2/4/pi/pi*(G-G[0]));
 
-subplot(212)
+subplot(1,2,2)
 plot(zz,PP,'k',label="Hankel transform") # Hankel transform 1D
 xlabel('spin-echo length [nm]')
@@ -63 +62 @@
 
 # Cosine transformation of 2D scattering patern
-if False:
+if True:
     qy,qz = meshgrid(q,q)
     qr=R*sqrt(qy**2 + qz**2); # reuse variable names Hankel transform, but now 2D