Changeset 1280 for trunk


Ignore:
Timestamp:
11/03/06 16:08:22 (18 years ago)
Author:
mar637
Message:

Merge from Release2.1.1b tag

Location:
trunk
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/SConstruct

    r1267 r1280  
    7979    env = conf.Finish()
    8080
    81 env["version"] = "2.1.0"
     81env["version"] = "2.1.1b"
    8282
    8383# general CPPFLAGS
  • trunk/doc/userguide.tex

    r1267 r1280  
    10211021\begin{verbatim}
    10221022  ASAP>scans.save('myscans') # Save in default format
    1023   ASAP>scans.save('myscans', 'FITS') # Save as FITS for exporting into CLASS
    10241023  ASAP>scans.save('myscans', overwrite=True) # Overwrite an existing file
    10251024\end{verbatim}
     
    16211620Scan, beam and IF selection are also available in the selector object as
    16221621describe in section~\ref{sec:selection}.
    1623 
    1624 \subsection{Saving}
    1625 
    1626 \index{Polarisation!saving}When saving data using the \cmd{save}
    1627 function, the \cmd{stokes} argument can be used to save the data as
    1628 Stoke values when saving in FITS format.
    1629 
    1630 Example:
    1631 
    1632 \begin{verbatim}
    1633   ASAP>scans.save('myscan.sdfits', 'SDFITS', stokes=True)
    1634 \end{verbatim}
    16351622
    16361623\section{Specialised Processing}
     
    22332220
    22342221% scantable
    2235 \asaprc{scantable.save}{{\bf ASAP} SDFITS FITS ASCII MS2}{Default output
     2222\asaprc{scantable.save}{{\bf ASAP} SDFITS ASCII MS2}{Default output
    22362223format when saving}
    22372224
  • trunk/python/__init__.py

    r1259 r1280  
    355355
    356356__date__ = '$Date$'.split()[1]
    357 __version__  = '2.1'
     357__version__  = '2.1.1b'
    358358
    359359def is_ipython():
  • trunk/python/scantable.py

    r1268 r1280  
    7777    def save(self, name=None, format=None, overwrite=False):
    7878        """
    79         Store the scantable on disk. This can be an asap (aips++) Table, SDFITS,
    80         Image FITS or MS2 format.
     79        Store the scantable on disk. This can be an asap (aips++) Table,
     80        SDFITS or MS2 format.
    8181        Parameters:
    8282            name:        the name of the outputfile. For format "ASCII"
     
    12231223
    12241224    def auto_poly_baseline(self, mask=[], edge=(0, 0), order=0,
    1225                            threshold=3, chan_avg_limit=1, plot=False, 
    1226                            insitu=None):
     1225                           threshold=3, chan_avg_limit=1, plot=False,
     1226                           insitu=None):
    12271227        """
    12281228        Return a scan which has been baselined (all rows) by a polynomial.
     
    12431243                        keep it large as only strong lines affect the
    12441244                        baseline solution.
    1245             chan_avg_limit: 
    1246                         a maximum number of consequtive spectral channels to
    1247                         average during the search of weak and broad lines.
    1248                         The default is no averaging (and no search for weak
    1249                         lines). If such lines can affect the fitted baseline
    1250                         (e.g. a high order polynomial is fitted), increase this
    1251                         parameter (usually values up to 8 are reasonable). Most
    1252                         users of this method should find the default value
    1253                         sufficient.
     1245            chan_avg_limit:
     1246                        a maximum number of consequtive spectral channels to
     1247                        average during the search of weak and broad lines.
     1248                        The default is no averaging (and no search for weak
     1249                        lines). If such lines can affect the fitted baseline
     1250                        (e.g. a high order polynomial is fitted), increase this
     1251                        parameter (usually values up to 8 are reasonable). Most
     1252                        users of this method should find the default value
     1253                        sufficient.
    12541254            plot:       plot the fit and the residual. In this each
    12551255                        indivual fit has to be approved, by typing 'y'
  • trunk/src/STWriter.cpp

    r1259 r1280  
    6565  } else if (t== "SDFITS") {
    6666    writer_ = new PKSSDwriter();
    67   } else if (t== "FITS") {
    68     writer_ = 0;
    6967  } else if (t== "ASCII") {
    7068    writer_ = 0;
     
    9492  } else if (t== "SDFITS") {
    9593    writer_ = new PKSSDwriter();
    96   } else if (t== "FITS") {
    97     writer_ = 0;
    9894  } else if (t== "ASCII") {
    9995    writer_ = 0;
     
    108104{
    109105
    110 // Image FITS
    111 
    112   if (format_=="FITS") {
    113 //      Bool verbose = True;
    114 //      SDFITSImageWriter iw;
    115 //      if (iw.write(*in, filename, verbose)) {
    116 //         return 0;
    117 //      } else {
    118 //         return 1;
    119 //      }
    120   } else if (format_=="ASCII") {
    121      STAsciiWriter iw;
    122      if (iw.write(*in, filename)) {
    123         return 0;
    124      } else {
    125         return 1;
    126      }
     106  if (format_=="ASCII") {
     107    STAsciiWriter iw;
     108    if (iw.write(*in, filename)) {
     109      return 0;
     110    } else {
     111      return 1;
     112    }
    127113  }
    128114
     
    143129
    144130  const Table table = in->table();
    145 //   ROArrayColumn<uInt> freqIDCol(table, "FREQ_ID");
    146 //   Vector<uInt> freqIDs;
    147131
    148132  // Create the output file and write static data.
    149133  Int status;
    150   //Bool havexpol = Bool(in->npol() > 2);
    151134  status = writer_->create(String(filename), hdr.observer, hdr.project,
    152135                               hdr.antennaname, hdr.antennaposition,
Note: See TracChangeset for help on using the changeset viewer.