Changeset 1217 for trunk/python

Timestamp:

08/30/06 13:29:25 (18 years ago)

Author:

mar637

Message:

Merge from Release2.1.0b tag

Location:

trunk/python

Files:

• asapfitter.py (modified) (5 diffs)
• asapplotter.py (modified) (4 diffs)
• scantable.py (modified) (4 diffs)

trunk/python/asapfitter.py

@@ -217 +217 @@
         return
 
-    def set_gauss_parameters(self, peak, centre, fhwm,
+    def set_gauss_parameters(self, peak, centre, fwhm,
                              peakfixed=0, centerfixed=0,
-                             fhwmfixed=0,
+                             fwhmfixed=0,
                              component=0):
         """
@@ -227 +227 @@
             peakfixed,
             centerfixed,
-            fhwmfixed:           Optional parameters to indicate if
+            fwhmfixed:           Optional parameters to indicate if
                                  the paramters should be held fixed during
                                  the fitting process. The default is to keep
@@ -242 +242 @@
                 raise ValueError(msg)
         if 0 <= component < len(self.components):
-            d = {'params':[peak, centre, fhwm],
-                 'fixed':[peakfixed, centerfixed, fhwmfixed]}
+            d = {'params':[peak, centre, fwhm],
+                 'fixed':[peakfixed, centerfixed, fwhmfixed]}
             self.set_parameters(d, component)
         else:
@@ -479 +479 @@
         xlab = 'Abcissa'
         ylab = 'Ordinate'
-        m = None
+        from matplotlib.numerix import ma,logical_not,array
+        m = NUM.ones(len(self.x))
+
         if self.data:
             tlab = self.data._getsourcename(self._fittedrow)
@@ -489 +491 @@
         self._p.palette(0,colours)
         self._p.set_line(label='Spectrum')
-        from matplotlib.numerix import ma,logical_not,array
         y = ma.masked_array(self.y,mask=logical_not(array(m,copy=False)))
         self._p.plot(self.x, y)

trunk/python/asapplotter.py

@@ -2 +2 @@
 from asap import NUM
 import matplotlib.axes
+import sre
 
 class asapplotter:
@@ -153 +154 @@
         Parameters:
             stacking:     tell the plotter which variable to plot
-                          as line color overlays (default 'pol')
+                          as line colour overlays (default 'pol')
             panelling:    tell the plotter which variable to plot
                           across multiple panels (default 'scan'
@@ -329 +330 @@
         return
 
-    def set_colors(self, colormap):
-        """
-        Set the colors to be used. The plotter will cycle through
-        these colors when lines are overlaid (stacking mode).
-        Parameters:
-            colormap:     a list of colour names
+    def set_colors(self, colmap):
+        """
+        Set the colours to be used. The plotter will cycle through
+        these colours when lines are overlaid (stacking mode).
+        Parameters:
+            colmap:     a list of colour names
         Example:
              plotter.set_colors("red green blue")
@@ -341 +342 @@
              # and 'V' will be 'red' again.
         """
-        if isinstance(colormap,str):
-            colormap = colormap.split()
-        self._plotter.palette(0,colormap=colormap)
-        if self._data: self.plot(self._data)
+        if isinstance(colmap,str):
+            colmap = colmap.split()
+        self._plotter.palette(0, colormap=colmap)
+        if self._data: self.plot(self._data)
+
+    # alias for english speakers
+    set_colours = set_colors
 
     def set_histogram(self, hist=True, linewidth=None):

trunk/python/scantable.py

@@ -923 +923 @@
                          Otherwise, the scaling is done in-situ
                          The default is taken from .asaprc (False)
-            allaxes:         if True apply to all spectra. Otherwise
-                         apply only to the selected (beam/pol/if)spectra only
-                         The default is taken from .asaprc (True if none)
         """
         if insitu is None: insitu = rcParams['insitu']
@@ -1184 +1181 @@
             mask = list(NUM.ones(self.nchan(-1)))
         from asap.asapfitter import fitter
-        f = fitter()
-        f.set_scan(self, mask)
-        f.set_function(poly=order)
-        s = f.auto_fit(insitu, plot=plot)
-        s._add_history("poly_baseline", varlist)
-        print_log()
-        if insitu: self._assign(s)
-        else: return s
+        try:
+            f = fitter()
+            f.set_scan(self, mask)
+            f.set_function(poly=order)
+            s = f.auto_fit(insitu, plot=plot)
+            s._add_history("poly_baseline", varlist)
+            print_log()
+            if insitu: self._assign(s)
+            else: return s
+        except RuntimeError:
+            msg = "The fit failed, possibly because it didn't converge."
+            if rcParams['verbose']:
+                print msg
+                return
+            else:
+                raise RuntimeError(msg)
+
 
     def auto_poly_baseline(self, mask=[], edge=(0, 0), order=0,
@@ -1433 +1439 @@
                             preserve: Output = Toff * (on/off) - Toff
                             remove:   Output = Toff * (on/off) - Ton
-    """
+        """
         if mask is None: mask = ()
         varlist = vars()
@@ -1439 +1445 @@
         preoff = scantable(self._math._mx_extract(self, 'off'))
         off = preoff.average_time(mask=mask, weight=weight, scanav=False)
-    from asapmath  import quotient
+        from asapmath  import quotient
         q = quotient(on, off, preserve)
         q._add_history("mx_quotient", varlist)
         print_log()
-    return q
+        return q
 
     def freq_switch(self, insitu=None):