Georg Brandl avatar Georg Brandl committed 5f7defd

Some smaller changes.

Comments (0)

Files changed (2)

         return res
 
     def _freefit_model(self, v, x):
+        #return v[1] * np.exp(-abs(v[0])*x/658.2) + (1 - v[1])
         return v[1] * np.exp(-abs(v[0])*x/658.2)
 
     def freefit(self, name=None, **kwds):
                         continue
                 dct[point['tau']] = point
                 nread += 1
+        #print 'dict is now', dct
         if not nread:
             print 'Warning: no points read from file', file
 
         finally:
             f.close()
 
-
+# backwards compatibility
 MiezeDataNF = MiezeData
 
 
 
     Fitting routines for general and MIEZE data.
 
-    :copyright: 2008-2009 by Georg Brandl.
+    :copyright: 2008-2010 by Georg Brandl.
     :license: BSD.
 """
 
 
     def __str__(self):
         if self._failed:
-            return 'Fit %-20s failed' % self._name
+            return 'Fit %-35s failed' % self._name
         elif self._method == 'ODR':
-            return 'Fit %-20s success (  ODR  ), chi2: %8.3g, params: %s' % (
+            return 'Fit %-35s success (  ODR  ), chi2: %8.3g, params: %s' % (
                 self._name or '', self.chi2,
                 ', '.join('%s = %8.3g +/- %8.3g' % v for v in zip(*self._pars)))
         else:
-            return 'Fit %-20s success (leastsq), chi2: %8.3g, params: %s' % (
+            return 'Fit %-35s success (leastsq), chi2: %8.3g, params: %s' % (
                 self._name or '', self.chi2,
                 ', '.join('%s = %8.3g' % v[:2] for v in zip(*self._pars)))
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.