Changes in / [a006b63:ea7ffce] in sasmodels

Files:

• example/sesansfit.py (modified) (2 diffs)
• sasmodels/bumps_model.py (modified) (5 diffs)

example/sesansfit.py

@@ -6 +6 @@
 
 
-if True: # fix when data loader exists
-#    from sas.dataloader.readers\
-    from sas.dataloader.loader import Loader
-    loader=Loader()
-    data=loader.load('testsasview1.ses')
-    
-#    data = load_sesans('mydatfile.pz')
-#    sans_data = load_sans('mysansfile.xml')
-
+radius = 1000
+if False: # fix when data loader exists
+    from sasmodels.dataloader import load_sesans, load_sans
+    data = load_sesans('mydatfile.pz')
+    sans_data = load_sans('mysansfile.xml')
 else:
     SElength = np.linspace(0, 2400, 61) # [A]
@@ -20 +16 @@
     err_data = np.ones_like(SElength)*0.03
 
-    class SESANSData1D:
+    class SesansData:
         #q_zmax = 0.23 # [A^-1]
-        zacceptance = 0.1 # [A^-1]
-        lam = 2e-10 # [m]
+        q_zmax = 0.1 # [A^-1]
+        SElength = np.linspace(0, 2400, 61) # [A]
+        Rmax = 3*radius # [A]
+        wavelength = 2e-10 # [m]
         thickness = 0.2 # [cm]
-        x = SElength
-        y = data
-        dy = err_data
+        SElength = SElength
+        data = data
+        err_data = err_data
     data = SesansData()
-print dir(data)
-
-radius = 1000
-data.Rmax = 3*radius # [A]
 
 phi = Parameter(0.1, name="phi")

sasmodels/bumps_model.py

@@ -217 +217 @@
 def _plot_sesans(data, theory, view):
     import matplotlib.pyplot as plt
-    resid = (theory - data.y)/data.dy
+    resid = (theory - data.data)/data.err_data
     plt.subplot(121)
-    plt.errorbar(data.x, data.y, yerr=data.dy)
-    plt.plot(data.x, theory, '-', hold=True)
+    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.x, resid, 'x')
+    plt.plot(data.SElength, resid, 'x')
     plt.xlabel('spin echo length (A)')
     plt.ylabel('residuals')
@@ -267 +267 @@
         self.model = model
         self.cutoff = cutoff
-# TODO       if  isinstance(data,SESANSData1D)        
-        if hasattr(data, 'lam'):
+        if hasattr(data, 'SElength'):
             self.data_type = 'sesans'
         elif hasattr(data, 'qx_data'):
@@ -279 +278 @@
         # interpret data
         if self.data_type == 'sesans':
-            q = sesans.make_q(data.sample.zacceptance, data.Rmax)
+            q = sesans.make_q(data.q_zmax, data.Rmax)
             self.index = slice(None,None)
-            self.iq = data.y
-            self.diq = data.dy
+            self.iq = data.data
+            self.diq = data.err_data
             self._theory = np.zeros_like(q)
             q_vectors = [q]
@@ -354 +353 @@
             #self._theory[:] = self._fn.eval(pars, pd_pars)
             if self.data_type == 'sesans':
-                P = sesans.hankel(self.data.x, self.data.lam,
-                                  self.data.sample.thickness/10, self._fn_inputs[0],
+                P = sesans.hankel(self.data.SElength, self.data.wavelength,
+                                  self.data.thickness, self._fn_inputs[0],
                                   self._theory)
                 self._cache['theory'] = P
@@ -402 +401 @@
             self.data.data[self.index] = y
         elif self.data_type == 'sesans':
-            self.data.y[self.index] = y
+            self.data.data[self.index] = y
         else:
             raise ValueError("Unknown model")