Changeset 1280 for trunk

Timestamp:

11/03/06 16:08:22 (18 years ago)

Author:

mar637

Message:

Merge from Release2.1.1b tag

Location:

trunk

Files:

• SConstruct (modified) (1 diff)
• admin/asap2-close.doc (copied) (copied from tags/Release2.1.1b/admin/asap2-close.doc )
• admin/reqmatrix.sxc (modified) ( previous)
• doc/userguide.tex (modified) (3 diffs)
• python/__init__.py (modified) (1 diff)
• python/scantable.py (modified) (3 diffs)
• src/STWriter.cpp (modified) (4 diffs)

trunk/SConstruct

@@ -79 +79 @@
     env = conf.Finish()
 
-env["version"] = "2.1.0"
+env["version"] = "2.1.1b"
 
 # general CPPFLAGS

trunk/doc/userguide.tex

@@ -1021 +1021 @@
 \begin{verbatim}
   ASAP>scans.save('myscans') # Save in default format
-  ASAP>scans.save('myscans', 'FITS') # Save as FITS for exporting into CLASS
   ASAP>scans.save('myscans', overwrite=True) # Overwrite an existing file
 \end{verbatim}
@@ -1621 +1620 @@
 Scan, beam and IF selection are also available in the selector object as
 describe in section~\ref{sec:selection}.
-
-\subsection{Saving}
-
-\index{Polarisation!saving}When saving data using the \cmd{save}
-function, the \cmd{stokes} argument can be used to save the data as
-Stoke values when saving in FITS format.
-
-Example:
-
-\begin{verbatim}
-  ASAP>scans.save('myscan.sdfits', 'SDFITS', stokes=True)
-\end{verbatim}
 
 \section{Specialised Processing}
@@ -2233 +2220 @@
 
 % scantable
-\asaprc{scantable.save}{{\bf ASAP} SDFITS FITS ASCII MS2}{Default output
+\asaprc{scantable.save}{{\bf ASAP} SDFITS ASCII MS2}{Default output
 format when saving}
 

trunk/python/__init__.py

@@ -355 +355 @@
 
 __date__ = '$Date$'.split()[1]
-__version__  = '2.1'
+__version__  = '2.1.1b'
 
 def is_ipython():

trunk/python/scantable.py

@@ -77 +77 @@
     def save(self, name=None, format=None, overwrite=False):
         """
-        Store the scantable on disk. This can be an asap (aips++) Table, SDFITS,
-        Image FITS or MS2 format.
+        Store the scantable on disk. This can be an asap (aips++) Table,
+        SDFITS or MS2 format.
         Parameters:
             name:        the name of the outputfile. For format "ASCII"
@@ -1223 +1223 @@
 
     def auto_poly_baseline(self, mask=[], edge=(0, 0), order=0,
-                           threshold=3, chan_avg_limit=1, plot=False, 
-                           insitu=None):
+                           threshold=3, chan_avg_limit=1, plot=False,
+                           insitu=None):
         """
         Return a scan which has been baselined (all rows) by a polynomial.
@@ -1243 +1243 @@
                         keep it large as only strong lines affect the
                         baseline solution.
-            chan_avg_limit:  
-                        a maximum number of consequtive spectral channels to
-                        average during the search of weak and broad lines.
-                        The default is no averaging (and no search for weak
-                        lines). If such lines can affect the fitted baseline
-                        (e.g. a high order polynomial is fitted), increase this
-                        parameter (usually values up to 8 are reasonable). Most
-                        users of this method should find the default value 
-                        sufficient.
+            chan_avg_limit:
+                        a maximum number of consequtive spectral channels to
+                        average during the search of weak and broad lines.
+                        The default is no averaging (and no search for weak
+                        lines). If such lines can affect the fitted baseline
+                        (e.g. a high order polynomial is fitted), increase this
+                        parameter (usually values up to 8 are reasonable). Most
+                        users of this method should find the default value
+                        sufficient.
             plot:       plot the fit and the residual. In this each
                         indivual fit has to be approved, by typing 'y'

trunk/src/STWriter.cpp

@@ -65 +65 @@
   } else if (t== "SDFITS") {
     writer_ = new PKSSDwriter();
-  } else if (t== "FITS") {
-    writer_ = 0;
   } else if (t== "ASCII") {
     writer_ = 0;
@@ -94 +92 @@
   } else if (t== "SDFITS") {
     writer_ = new PKSSDwriter();
-  } else if (t== "FITS") {
-    writer_ = 0;
   } else if (t== "ASCII") {
     writer_ = 0;
@@ -108 +104 @@
 {
 
-// Image FITS
-
-  if (format_=="FITS") {
-//      Bool verbose = True;
-//      SDFITSImageWriter iw;
-//      if (iw.write(*in, filename, verbose)) {
-//         return 0;
-//      } else {
-//         return 1;
-//      }
-  } else if (format_=="ASCII") {
-     STAsciiWriter iw;
-     if (iw.write(*in, filename)) {
-        return 0;
-     } else {
-        return 1;
-     }
+  if (format_=="ASCII") {
+    STAsciiWriter iw;
+    if (iw.write(*in, filename)) {
+      return 0;
+    } else {
+      return 1;
+    }
   }
 
@@ -143 +129 @@
 
   const Table table = in->table();
-//   ROArrayColumn<uInt> freqIDCol(table, "FREQ_ID");
-//   Vector<uInt> freqIDs;
 
   // Create the output file and write static data.
   Int status;
-  //Bool havexpol = Bool(in->npol() > 2);
   status = writer_->create(String(filename), hdr.observer, hdr.project,
                                hdr.antennaname, hdr.antennaposition,