Changeset 9a9f5b5 in sasmodels

Timestamp:

Jul 22, 2014 9:16:56 AM (10 years ago)

Author:

HMP1 <helen.park@…>

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:

d772f5d

Parents:

79fcc40

Message:

Added new fit program that fits two different mode

Files:

• compare.py (modified) (4 diffs)
• multi-fit.py (added)
• sasmodel.py (modified) (4 diffs)

compare.py

@@ -15 +15 @@
 
 def sasview_model(modelname, **pars):
-    modelname = modelname.capitalize()+"Model"
+    modelname = modelname+"Model"
     sans = __import__('sans.models.'+modelname)
     ModelClass = getattr(getattr(sans.models,modelname,None),modelname,None)
@@ -54 +54 @@
         )
 
-    model = sasview_model('cylinder', **pars)
+    model = sasview_model('Cylinder', **pars)
     tic()
     for i in range(N):
@@ -91 +91 @@
                 axis_phi_pd_n=6, axis_phi_pd_nsigma=3,)
 
-    model = sasview_model('ellipsoid', **pars)
+    model = sasview_model('Ellipsoid', **pars)
     tic()
     for i in range(N):
@@ -130 +130 @@
                  length_pd=0.1, length_pd_n=1, length_pd_nsigma=0,
                  thickness_pd=0.1, thickness_pd_n=1, thickness_pd_nsigma=0,
-                 axis_theta_pd_n=10, axis_theta_pd_nsigma=3,
-                 axis_phi_pd=0.0008748, axis_phi_pd_n=10, axis_phi_pd_nsigma=3,)
+                 axis_theta_pd_n=20, axis_theta_pd_nsigma=3,
+                 axis_phi_pd=0.0008748, axis_phi_pd_n=60, axis_phi_pd_nsigma=3,)
 
     model = sasview_model('CoreShellCylinder', **pars)

sasmodel.py

@@ -41 +41 @@
                extent=[xmin, xmax, ymin, ymax], vmin=vmin, vmax=vmax)
 
-
-def plot_result(data, theory):
+def plot_result(data, theory, view='linear'):
     import matplotlib.pyplot as plt
+    from numpy.ma import masked_array, masked
     plt.subplot(1, 3, 1)
     #print "not a number",sum(np.isnan(data.data))
     #data.data[data.data<0.05] = 0.5
-    logdata = np.log10(data.data)
-    #print data.data.min(), data.data.max()
-    clean = logdata[~np.isnan(logdata)]
-    vmin, vmax = clean.min(), clean.max()
-    vmin, vmax = np.percentile(clean, 5), 1.05*vmax
-    #vmin,vmax = None,None
-    plot_data(data, logdata, vmin=vmin, vmax=vmax)
+    mdata = masked_array(data.data, data.mask)
+    mdata[np.isnan(mdata)] = masked
+    if view is 'log':
+        mdata[mdata <= 0] = masked
+        mdata = np.log10(mdata)
+        mtheory = masked_array(np.log10(theory), mdata.mask)
+    else:
+        mtheory = masked_array(theory, mdata.mask)
+    mresid = masked_array((theory-data.data)/data.err_data, data.mask)
+    vmin = min(mdata.min(), mtheory.min())
+    vmax = max(mdata.max(), mtheory.max())
+
+    plot_data(data, mdata, vmin=vmin, vmax=vmax)
     plt.colorbar()
     plt.subplot(1, 3, 2)
-    plot_data(data, np.log10(theory), vmin=vmin, vmax=vmax)
+    plot_data(data, mtheory, vmin=vmin, vmax=vmax)
     plt.colorbar()
     plt.subplot(1, 3, 3)
-    plot_data(data, (theory-data.data)/data.err_data)
+    plot_data(data, mresid)
     plt.colorbar()
 
@@ -102 +108 @@
         self._parameters = dict((k, Parameter.default(v, name=k)) for k, v in pars.items())
 
+    def set_result(self, result):
+        self.result = result
+        return self.result
+
+    def get_result(self):
+        return self.result
+
     def numpoints(self):
         return len(self.iq)
@@ -124 +137 @@
     def residuals(self):
         #if np.any(self.err ==0): print "zeros in err"
-        return (self.theory()[self.index]-self.iq)/self.diq
+        return (self.get_result()[self.index]-self.iq)/self.diq
 
     def nllf(self):
@@ -134 +147 @@
         return 2*self.nllf()/self.dof
 
-    def plot(self, view='linear'):
-        plot_result(self.data, self.theory())
+    def plot(self, view='log'):
+        plot_result(self.data, self.get_result(), view=view)
 
     def save(self, basename):