Changeset 1217 for trunk

Timestamp:

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

Author:

mar637

Message:

Merge from Release2.1.0b tag

Location:

trunk

Files:

• doc/userguide.tex (modified) (28 diffs)
• external/casa_asap/configure.sh (modified) (2 diffs)
• python/asapfitter.py (modified) (5 diffs)
• python/asapplotter.py (modified) (4 diffs)
• python/scantable.py (modified) (4 diffs)

trunk/doc/userguide.tex

@@ -13 +13 @@
 \setlength{\parskip}{1ex}
 
-\title{ATNF Spectral Analysis Package\\User Guide v2.0 }
+\title{ATNF Spectral Analysis Package\\User Guide v2.1\\DRAFT }
 \author{Chris Phillips}
 
@@ -24 +24 @@
 }
 
+\newcommand{\commanddef}[3]{
+  \begin{minipage}[t]{27mm}\tt #1\end{minipage}\hspace{3mm}
+  \begin{minipage}[t]{\textwidth-30mm}#2 \\ \tt #3\end{minipage}
+}
+
+\newcommand{\bigcommanddef}[3]{
+  \begin{minipage}[t]{45mm}\tt #1\end{minipage}\hspace{3mm}
+  \begin{minipage}[t]{\textwidth-47mm}#2 \\ \tt #3\end{minipage}
+}
+
 \makeindex
-
 
 \begin{document}
@@ -39 +48 @@
 package.
 
-This userguide has been updated for the ASAP 2.0 release which has a
-number of significant changes which affect the user interface. Please
-report any mistakes you find.
+This userguide is being updated for the ASAP 2.1. Please report any
+mistakes you find.
 
 \section{Installation and Running}
@@ -53 +61 @@
 \item Mopra - use host {\tt minos}
 \end{itemize}
+
+Or use your own Linux desktop.
+
+{\em Note. ASAP2.1 only runs on ATNF Linux machines which have been
+updated to Debian Sarge and are using the ``DEBIANsarge''
+/usr/local. If your favourite machine has not been upgraded, send a
+request your your friendly IT support.}
 
 \index{Running}To start asap log onto one of these Linux hosts and enter
@@ -266 +281 @@
 
 The building block of a scantable is an integration, which is a single
-row of a scantable. Each row contains just one spectrum for each beam, IF and
-polarisation. For example Parkes multibeam data would contain many
-beams, one IF and 2-4 polarisations, while the new Mopra 8-GHz
-filterbank will eventually produce one beam, many IFs, and 2-4
-polarisations. All of the combinations of Beams/IFs an Polarisations are
+row of a scantable. Each row contains just one spectrum for each beam,
+IF and polarisation. For example Parkes OH-multibeam data would
+normally contain 13 beams, 1 IF and 2 polarisations, Parkes
+methanol-multibeam data would contain 7 beams, 2 IFs and 2
+polarisations while the Mopra 8-GHz MOPDS filterbank will produce one
+beam, many IFs, and 2-4 polarisations.
+
+All of the combinations of Beams/IFs an Polarisations are
 contained in seperate rows. These rows are grouped in cycles (same time stamp).
 
-A collection of cycles for one source is termed
-a scan (and each scan has a unique numeric identifier, the SCANNO). A
-scantable is then a collection  of one or more scans. If you have
-scan-averaged your data in time, i.e. you have averegaed all cycles within
-a scan, then each scan would hold just one (averaged) integration.
-
-Many of the functions which work on scantables can either return a
-new scantable with modified data or change the scantable insitu. Which
+A collection of cycles for one source is termed a scan (and each scan
+has a unique numeric identifier, the SCANNO). A scantable is then a
+collection of one or more scans. If you have scan-averaged your data
+in time, i.e. you have averegaed all cycles within a scan, then each
+scan would hold just one (averaged) integration.
+
+Many of the functions which work on scantables can either return a new
+scantable with modified data or change the scantable insitu. Which
 method is used depends on the users preference. The default can be
 changed via the {\tt .asaprc} resource file.
@@ -309 +327 @@
 The data are stored in columns (the length of a column is the number of
 rows/spectra of course).
-
 
 Two important columns are those that describe the frequency setup.  We mention
@@ -476 +493 @@
 \end{verbatim}
 
-{\em Currently the following is not implemented}
+{\em Currently the following is not implemented
 
 In both of the above modes, you can also specify the rest frequencies via
@@ -486 +503 @@
   ASAP> scans.set_restfreqs(freqs=['OH1665','OH1667'])
 \end{verbatim}
-
+}
 
 \subsubsection{Masks}
@@ -649 +666 @@
 \end{verbatim}
 
-%If this is not sufficient the following alternative method can be used.
-%
-%\subsection{Separate reference and source observations}
-%
-%\index{Quotient spectra}Most data from ATNF observatories
-%distinguishes on and off source data using the file name. This makes
-%it easy to create two scantables with the source and reference
-%data. As long as there was exactly one reference observation for each
-%on source observation for following method will work.
-%
-%For Mopra and Parkes data:
-%\begin{verbatim}
-%  ASAP> r = scans.get_scan('*_R')
-%  ASAP> s = scans.get_scan('*_S')
-%\end{verbatim}
-%
-%For Tidbinbilla data
-%\begin{verbatim}
-%  ASAP> r = scans.get_scan('*_[ew]')
-%  ASAP> s = scans.get_scan('*_[^ew]')
-%\end{verbatim}
-%
-%\subsection{Make the quotient spectra}
-%
-%Use the quotient function
-%
-%\begin{verbatim}
-%  ASAP> q = s.quotient(r)
-%\end{verbatim}
-%
-%This uses the rows in scantable \cmd{r} as reference spectra for the
-%rows in scantable \cmd{s}. Scantable \cmd{r} must have either 1 row
-%(which is applied to all rows in \cmd{s}) or both scantables must have
-%the same number of rows.
+If this is not sufficient the following alternative method can be used.
+
+\subsection{Separate reference and source observations}
+
+\index{Quotient spectra}Most data from ATNF observatories
+distinguishes on and off source data using the file name. This makes
+it easy to create two scantables with the source and reference
+data. As long as there was exactly one reference observation for each
+on source observation for following method will work.
+
+For Mopra and Parkes data:
+\begin{verbatim}
+  ASAP> r = scans.get_scan('*_R')
+  ASAP> s = scans.get_scan('*_S')
+\end{verbatim}
+
+For Tidbinbilla data
+\begin{verbatim}
+  ASAP> r = scans.get_scan('*_[ew]')
+  ASAP> s = scans.get_scan('*_[^ew]')
+\end{verbatim}
+
+\subsection{Make the quotient spectra}
+
+Use the quotient function
+
+\begin{verbatim}
+  ASAP> q = s.quotient(r)
+\end{verbatim}
+
+This uses the rows in scantable \cmd{r} as reference spectra for the
+rows in scantable \cmd{s}. Scantable \cmd{r} must have either 1 row
+(which is applied to all rows in \cmd{s}) or both scantables must have
+the same number of rows.
 
 \subsection{Time average separate scans}
@@ -702 +719 @@
 
 The default is to use integration time weighting. The alternative is
-to use none, variance, Tsys weighting or Tsys \& integration time.
+to use none, variance, Tsys weighting, Tsys \& integration time or
+median averaging.
 
 \begin{verbatim}
@@ -808 +826 @@
   # Or in two steps
   ASAP> scans = scantable('2004-11-23_1841-P484.rpf')
-  ASAP> scans.set_fluxunit('Jy)
+  ASAP> scans.set_fluxunit('Jy')
+\end{verbatim}
+
+\subsubsection{Feed Polarisation}
+
+\index{Brightness Units}The RPFITS files also do not contain any
+information as to the feed polarisation. ASAP will set a default based
+on the antenna, but this will often be wrong the data has been read,
+the default can be changed using the \cmd{set\_feedtype} function with
+an argument of \cmd{'linear'} or \cmd{'circular'}.
+
+E.g:
+
+\begin{verbatim}
+  ASAP> scans = scantable('2004-11-23_1841-P484.rpf')
+  ASAP> scans.set_feedtype('circular')
 \end{verbatim}
 
@@ -996 +1029 @@
 \end{verbatim}
 
-
 \section{Plotter}
 
@@ -1135 +1167 @@
   ASAP> plotter.save('myplot.ps')
   ASAP> plotter.save('myplot.png', dpi=80)
+\end{verbatim}
+
+\subsection{Plotter Customisation}
+
+The plotter allows the user to change most properties such as text
+size and colour. The \cmd{commands} funcation and {\cmd help\
+asapplotter} list all the possible commands that can be used with the
+plotter.
+
+\commanddef{set\_colors}{Change the default colours used for line
+plotting. Colours can be given either by name, using the html standard
+(e.g. red, blue or hotpink), or hexadecimal code (e.g. for black
+\#000000). If less colours are specified than lines plotted , the
+plotter cycles through the colours. Example:} {ASAP>
+plotter.set\_colors('red blue green')\\ ASAP>
+plotter.set\_colors(`\#0000 blue \#FF00FF')\\ }
+
+\commanddef{set\_linestyles}{Change the line styles used for
+plots. Allowable values are 'line', 'dashed', 'dotted', 'dashdot', 
+'dashdotdot' and 'dashdashdot. Example: }{
+  ASAP> plotter.set\_linestyles('line dash cotted datshot.)\\
+  ASAP> plotter.set\_font(size=10)\\
+}
+
+\commanddef{set\_font}{Change the font style and size. Example}{
+  ASAP> plotter.set\_font(weight='bold')\\
+  ASAP> plotter.set\_font(size=10)\\
+  ASAP> plotter.set\_font(style='italic')\\
+}
+
+\commanddef{set\_layout}{Change the multi-panel layout, ie now many
+  rows and columns}{
+  ASAP> plotter.set\_layout(3,2)
+}
+
+\commanddef{set\_legend}{Set the position, size and optional value of the legend}{
+  ASAP> plotter.set\_legend(fontsize=16)\\
+  ASAP> plotter.set\_legend(mode=0)  \# ASAP chooses where to put the legend\\
+  ASAP> plotter.set\_legend(mode=4)  \# Put legend on lower right\\
+  ASAP> plotter.set\_legend(mode=-1) \# No legend\\
+  ASAP> plotter.set\_legend(mp=['RR','LL']) \# Specify legend labels\\
+  ASAP> plotter.set\_legend(mp=[r'\$\^\{12\}CO\$',r'\$\^\{13\}CO\$']) \# Latex labels
+}
+
+\commanddef{set\_title}{Set the plot title. If multiple panels are
+  plotted, multiple titles have to be specified}{
+  ASAP> plotter.set\_title(`G323.12$-$1.79`)\\
+  ASAP> plotter.set\_title([`SiO`, 'Methanol'], fontsize=18)\\
+}
+
+\subsection{Plotter Annotations}
+
+The plotter allows various annontations (lines, arrows, text and
+``spans'') to be added to the plot. These annotations are
+``temporary'', when the plotter is next refreshed
+(e.g. \cmd{plotter.plot} or \cmd{plotter.set\_range}) the annotations
+will be removed. 
+
+\bigcommanddef{arrow(x,y,x+dx,y+dy)}{Draw an arrow from a specifed
+\cmd{(x,y)} position to \cmd{(x+dx, y+dy)}. The values are in world
+coordinates. \em {HOW TO SET ARROW HEAD??}}{
+  ASAP> plotter.arrow(-40,7,35,0)
+}
+
+\bigcommanddef{axhline(y, xmin, xmax)}{Draw a horizontal line at the
+specifed \cmd{y} position (in world coordinates) between xmin and xmax
+(in relative coordinates, ie 0.0 is the left hand edge of the plot
+while 1.0 is the right side of the plot.}{
+ ASAP> plotter.axhline(6.0,0.2,0.8)
+}
+
+\bigcommanddef{avhline(x, ymin, ymax)}{Draw a vertical line at the
+specifed \cmd{x} position (in world coordinates) between \cmd{ymin}
+and \cmd{ymax} (in relative coordinates, ie 0.0 is the left hand edge
+of the plot while 1.0 is the right side of the plot).}{
+ ASAP> plotter.axvline(-50.0,0.1,1.0)
+}
+
+\bigcommanddef{axhspan(ymin, ymax, \\ \hspace*{20mm}xmin,
+ xmax)}{Overlay a transparent colour rectangle. \cmd{ymin} and
+ \cmd{ymax} are given in world coordnates while \cmd{xmin} and
+ \cmd{xmax} are given in relative coordinates}{ 
+ASAP> plotter.axhspan(2,4,0.25,0.75) 
+}
+
+\bigcommanddef{axvspan(xmin, xmax, \\ \hspace*{20mm} ymin,
+ ymax)}{Overlay a transparent colour rectangle. \cmd{ymin} and
+ \cmd{ymax} are given in relative coordnates while \cmd{xmin} and
+ \cmd{xmax} are given in world coordinates}{ 
+ASAP> plotter.axvspan(-50,60,0.2,0.5) 
+}
+
+\bigcommanddef{text(x, y, str)}{Place the string \cmd{str} at the
+ given \cmd{(x,y)} position in world coordinates.}{
+ASAP>plotter.text(-10,7,"CO") 
+}
+
+
+
+These functions all take a set of \cmd{kwargs} commands. These can be
+used to set colour, linewidth fontsize etc. These are standard
+matplotlib settings. Common ones include:
+
+\begin{tabular}{ll}
+ \tt color  \\
+ \tt linewidth \\
+ \tt fontsize \\
+ \tt fontname & Sans, Helvetica, Courier, Times etc\\
+ \tt rotation & Text rotation (horizontal, vertical) \\
+ \tt alpha & The alpha transparency on 0-1 scale\\
+\end{tabular}
+
+Examples: 
+\begin{verbatim}
+  ASAP> plotter.axhline(6.0,0.2,0.8, color='red', linewidth=3)
+  ASAP> plotter.text(-10,7,"CO", fontsize=20)
 \end{verbatim}
 
@@ -1347 +1495 @@
 \end{verbatim}
 
+\section{Specialised Processing}
+
+\subsection{Multibeam MX mode}
+
+MX mode is a specific observing approach with a multibeam where a
+single source is observed cycling through each beam. The scans when
+the beam is off source is used as a reference for the onsource
+scan. The function \cmd{mx\_quotient} is used to make a quotient
+spectrum from an MX cycle. This works averaging the ``off-source''
+scans for each beam (either a median average or mean) and using this
+as a reference scan in a normal quotient (for each beam). The final
+spectrum for each beam is returned on a new scantable containing
+single scan (it the scan numbers are re-labelled to be the same). Note
+that the current version of \cmd{mx\_quotient} only handles a single
+MX cycle, ie if each beam has observed the source multiple times you
+will need to use the selector object multiple times to select a single
+MX cycle, run \cmd{mx\_quotient} for each cycle then merge the
+resulting scan tables back together.
+
+Example:
+
+\begin{verbatim}
+  ASAP> scans = scantable('mydata.rpf')
+  ASAP> q = scans.mx_quotient()
+  ASAP> plotter.plot(q)
+\end{verbatim}
+
+The function \cmd{average\_beam} averages multiple beam data
+together. This is need if MX mode has been used to make a long
+integration on a single source. E.g.
+
+\begin{verbatim}
+  ASAP> av = q.average_beam()
+\end{verbatim}
+
+\subsection{Frequency Switching}
+
+{\em FILL ME IN}
+
 \section{Scantable Mathematics}
 
@@ -1639 +1826 @@
 \index{Functions!summary}%
 \begin{verbatim}
-ASAP> commands()
+
     [The scan container]
         scantable           - a container for integrations/scans
@@ -1646 +1833 @@
             get_scan        - gets a specific scan out of a scantable
                               (by name or number)
+            drop_scan       - drops a specific scan out of a scantable
+                              (by number)
             set_selection   - set a new subselection of the data
             get_selection   - get the current selection object
@@ -1669 +1858 @@
             set_dirframe    - set the frame for the direction on the sky
             set_instrument  - set the instrument name
+            set_feedtype    - set the feed type
             get_fluxunit    - get the brightness flux unit
             set_fluxunit    - set the brightness flux unit
@@ -1676 +1866 @@
             get_restfreqs   - get the current list of rest frequencies
             set_restfreqs   - set a list of rest frequencies
-            flag_spectrum   - flag data
-            save            - save the scantable to disk as either 'ASAP'
-                              or 'SDFITS'
+            flag            - flag selected channels in the data
+            lag_flag        - flag specified frequency in the data
+            save            - save the scantable to disk as either 'ASAP',
+                              'SDFITS' or 'ASCII'
             nbeam,nif,nchan,npol - the number of beams/IFs/Pols/Chans
             nscan           - the number of scans in the scantable
@@ -1687 +1878 @@
                               or a list of scans
             average_pol     - average the polarisations together.
-                              The dimension won't be reduced and
-                              all polarisations will contain the
-                              averaged spectrum.
+            average_beam    - average the beams together.
             convert_pol     - convert to a different polarisation type
             auto_quotient   - return the on/off quotient with
-                              automatic detection of the on/off scans
-                              (matched pairs and 1 off - n on)
-            scale           - return a scan scaled by a given factor
-            add             - return a scan with given value added
+                              automatic detection of the on/off scans (closest
+                              in time off is selected)
+            mx_quotient     - Form a quotient using MX data (off beams)
+            scale, *, /     - return a scan scaled by a given factor
+            add, +, -       - return a scan with given value added
             bin             - return a scan with binned channels
             resample        - return a scan with resampled channels
@@ -1708 +1898 @@
                               units
             freq_align      - align spectra in frequency frame
+            invert_phase    - Invert the phase of the cross-correlation
+            swap_linears    - Swap XX and YY
             rotate_xyphase  - rotate XY phase of cross correlation
             rotate_linpolphase - rotate the phase of the complex
@@ -1716 +1908 @@
             stddev          - Determine the standard deviation of the current
                               beam/if/pol
+     [Selection]
+         selector              - a selection object to set a subset of a scantable
+            set_scans          - set (a list of) scans by index
+            set_cycles         - set (a list of) cycles by index
+            set_beams          - set (a list of) beamss by index
+            set_ifs            - set (a list of) ifs by index
+            set_polarisations  - set (a list of) polarisations by name
+                                 or by index
+            set_names          - set a selection by name (wildcards allowed)
+            set_tsys           - set a selection by tsys thresholds
+            reset              - unset all selections
+            +                  - merge to selections
 
      [Math] Mainly functions which operate on more than one scantable
@@ -1724 +1928 @@
             simple_math     - simple mathematical operations on two scantables,
                               'add', 'sub', 'mul', 'div'
+            quotient        - build quotient of the given on and off scans
+                              (matched pairs and 1 off/n on are valid)
+            merge           - merge a list of scantables
+
+     [Line Catalog]
+        linecatalog              - a linecatalog wrapper, taking an ASCII or
+                                   internal format table
+            summary              - print a summary of the current selection
+            set_name             - select a subset by name pattern, e.g. '*OH*'
+            set_strength_limits  - select a subset by line strength limits
+            set_frequency_limits - select a subset by frequency limits
+            reset                - unset all selections
+            save                 - save the current subset to a table (internal
+                                   format)
+            get_row              - get the name and frequency from a specific
+                                   row in the table
      [Fitting]
         fitter
@@ -1746 +1966 @@
                               called 'plotter'
             plot            - plot a scantable
+            plot_lines      - plot a linecatalog overlay
             save            - save the plot to a file ('png' ,'ps' or 'eps')
             set_mode        - set the state of the plotter, i.e.
@@ -1760 +1981 @@
             set_linestyles  - specify a set of linestyles to use if only
                               using one color
+            set_font        - set general font properties, e.g. 'family'
+            set_histogram   - plot in historam style
             set_mask        - set a plotting mask for a specific polarization
+            text            - draw text annotations either in data or relative
+                              coordinates
+            arrow           - draw arrow annotations either in data or relative
+                              coordinates
+            set_abcissa     - specify a user label for the abcissa
+            set_ordinate    - specify a user label for the ordinate
+            set_layout      - specify the multi-panel layout (rows,cols)
+            set_colors      - specify a set of colours to use
+            set_linestyles  - specify a set of linestyles to use if only
+                              using one color
+            set_font        - set general font properties, e.g. 'family'
+            set_histogram   - plot in historam style
+            set_mask        - set a plotting mask for a specific polarization
+            text            - draw text annotations either in data or relative
+                              coordinates
+            arrow           - draw arrow annotations either in data or relative
+                              coordinates
+            axhline,axvline - draw horizontal/vertical lines
+            axhspan,axvspan - draw horizontal/vertical regions
+
+        xyplotter           - matplotlib/pylab plotting functions
 
     [Reading files]
@@ -1780 +2024 @@
         execfile            - execute an asap script, e.g. execfile('myscript')
         list_rcparameters   - print out a list of possible values to be
-                              put into $HOME/.asaprc
+                              put into .asaprc
+        rc                  - set rc parameters from within asap
         mask_and,mask_or,
         mask_not            - boolean operations on masks created with
                               scantable.create_mask
-
-    Note:
-        How to use this with help:
-                                         # function 'summary'
-        [xxx] is just a category
-        Every 'sub-level' in this list should be replaces by a '.' Period when
-        using help
-        Example:
-            ASAP> help scantable # to get info on ths scantable
-            ASAP> help scantable.summary # to get help on the scantable's
-            ASAP> help average_time
-
-
 \end{verbatim}
 
@@ -1808 +2040 @@
 scantable or return new one}
 
-% plotting
-
 \asaprc{useplotter}{{\bf True}/False}{Preload a default plotter}
 
@@ -1827 +2057 @@
 points plotted by a factor of nchan/1024}
 
-% default colours/linestyles
-%\asaprc{plotter.colours}{.}{.}
-%\asaprc{plotter.linestyles{.}{.}
+\asaprc{plotter.histogram}{True/{\bf False}}{Plot spectrum using
+histogram rather than lines.}
+
+{\em MALTE TO FIX}
+
+\asaprc{plotter.colours}{}{Set default colours for plotting}
+
+\asaprc{plotter.colours}{}{Set default line styles}
+
+\asaprc{plotter.papersze}{{\bf A4}}{}
 
 % scantable
@@ -1841 +2078 @@
 frequency frame to set when function scantable.set\_freqframe is
 called or the data is imported}
+
+\asaprc{scantable.verbosesummary}{True/{\bf False}}{Control the level
+of information printed by summary}
+
+\asaprc{scantable.storage}{{\bf memory}/disk}{Storage of scantables in
+memory of via based disk tables}
 
 \subsection{Installation}

trunk/external/casa_asap/configure.sh

@@ -32 +32 @@
     mv $ROOTDIR/linux $ROOTDIR/linux_64b
     cd $ROOTDIR/linux_64b/UNKNOWN_SITE
-    cat makedefs.64 | sed -e  "s#-Wall  #-Wall $flags#" > makedefs
+    cat makedefs.64 | sed -e  "s#-Wall  #-Wall $cppflags#" > makedefs
     cd $ROOTDIR
 elif [ $arch == 'Darwin' ]; then
@@ -43 +43 @@
     echo "configuring linux..."
     cd $ROOTDIR/linux/UNKNOWN_SITE
-    cat makedefs.32 | sed -e  "s#-Wall  #-Wall $flags#" > makedefs
+    cat makedefs.32 | sed -e  "s#-Wall  #-Wall $cppflags#" > makedefs
     cd $ROOTDIR
 fi

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):