Changeset 762

Timestamp:

11/30/05 14:37:54 (18 years ago)

Author:

mar637

Message:

merge from Release12 branch

Location:

trunk

Files:

• admin/sourcerelease.sh (added)
• python/asapplotter.py (modified) (7 diffs)
• python/scantable.py (modified) (2 diffs)
• web/commands.html (modified) (8 diffs)
• web/index.html (modified) (3 diffs)

trunk/python/asapplotter.py

@@ -105 +105 @@
         if self._panelling == 't':
             maxrows = 25
-            if self._data[0].nrow() > maxrows:
+            if self._data[0].nrow() > maxrows and not (self._rows and self._cols):
                 if self._cursor["t"] is None or \
                        (isinstance(self._cursor["t"],list) and \
@@ -149 +149 @@
             self._plotter.set_panels()
         rows = self._cursor["t"]
+        rows = rows[:n]
         self._plotter.palette(0)
         for rowsel in rows:
@@ -721 +722 @@
                     if rcParams['verbose']:
                         print msg
-                        return        
+                        return
                     else:
                         raise IndexError(msg)
@@ -735 +736 @@
                     if rcParams['verbose']:
                         print msg
-                        return        
+                        return
                     else:
                         raise IndexError(msg)
@@ -750 +751 @@
                     if rcParams['verbose']:
                         print msg
-                        return        
+                        return
                     else:
                         raise IndexError(msg)
@@ -787 +788 @@
                         if rcParams['verbose']:
                             print msg
-                            return        
+                            return
                         else:
-                            raise TypeError(msg)                       
+                            raise TypeError(msg)
                 elif 0 > i >= n:
                     print "Pol index '%d' out of range" %i
                     if rcParams['verbose']:
                         print msg
-                        return        
-                    else:
-                        raise IndexError(msg)                    
+                        return
+                    else:
+                        raise IndexError(msg)
                 else:
                     pols.append(i)
@@ -818 +819 @@
             if rcParams['verbose']:
                 print msg
-                return        
+                return
             else:
-                raise RuntimeError(msg)                       
+                raise RuntimeError(msg)
         if isinstance(mask, array):
             self._usermask = mask

trunk/python/scantable.py

@@ -69 +69 @@
                 r._open(filename,ifSel,beamSel)
                 asaplog.push('Importing data...')
+                print_log()
                 r._read([-1])
                 tbl = r._getdata()
@@ -76 +77 @@
                     from asap._asap import average as _av
                     asaplog.push('Auto averaging integrations...')
+                    print_log()
                     tbl2 = _av((tbl,),(),True,'none')
                     sdtable.__init__(self,tbl2)

trunk/web/commands.html

@@ -41 +41 @@
 <h1><a href="index.html">ASAP</a> 'commands'</h1>
 <pre class="commands">
-ASAP> commands()
+ASAP> commands
+----> commands()
 
     [The scan container]
@@ -48 +49 @@
             copy            - returns a copy of a scan
             get_scan        - gets a specific scan out of a scantable
+                              (by name or number)
             summary         - print info about the scantable contents
             set_cursor      - set a specific Beam/IF/Pol 'cursor' for
@@ -58 +60 @@
             get_tsys        - get the TSys
             get_time        - get the timestamps of the integrations
+            get_sourcename  - get the source names of the scans
             get_unit        - get the currnt unit
             set_unit        - set the abcissa unit to be used from this
@@ -79 +82 @@
                               or 'SDFITS'
             nbeam,nif,nchan,npol - the number of beams/IFs/Pols/Chans
+            nscan           - the number of scans in the scantable
+            nrow            - te number of integrations in the scantable
             history         - print the history of the scantable
             get_fit         - get a fit which has been stored witnh the data
@@ -89 +94 @@
             auto_quotient   - return the on/off quotient with
                               automatic detection of the on/off scans
+                              (matched pairs and 1 off - n on)
             quotient        - return the on/off quotient
             scale           - return a scan scaled by a given factor
@@ -105 +111 @@
             rotate_linpolphase - rotate the phase of the complex
                                  polarization O=Q+iU correlation
+            freq_switch     - perform frequency switching on the data
+            stats           - Determine the specified statistic, e.g. 'min'
+                              'max', 'rms' etc.
+            stddev          - Determine the standard deviation of the current
+                              beam/if/pol
+
      [Math] Mainly functions which operate on more than one scantable
 
@@ -139 +151 @@
                               and what 'panelled'
             set_cursor      - only plot a selected part of the data
-            set_range       - set a 'zoom' window
+            set_range       - set a 'zoom' window [xmin,xmax,ymin,ymax]
             set_legend      - specify user labels for the legend indeces
             set_title       - specify user labels for the panel indeces
+            set_abcissa     - specify a user label for the abcissa
             set_ordinate    - specify a user label for the ordinate
-            set_abcissa     - specify a user label for the abcissa
             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_mask        - set a plotting mask for a specific polarization
 
     [Reading files]
@@ -177 +193 @@
             ASAP> help average_time
 
+
 </pre>
 <!-- End Content -->

trunk/web/index.html

@@ -44 +44 @@
 line observations</em>. At this stage it is tuned towards data from
 ATNF instruments and reads/writes <em>rpfits, sdfits and ms</em> data.
-A release 1.1 of ASAP is available on linux systems at ATNF
+A release 1.2 of ASAP is available on linux systems at ATNF
 <a href="intro.html">more...<a>
 
@@ -54 +54 @@
 <pre style="color: blue">
 Loading ASAP...
-Initialising plotter...
-Welcome to ASAP v1.1 (2005/06/22) - the ATNF Spectral Analysis Package
+Welcome to ASAP v1.2 (2005/11/24) - the ATNF Spectral Analysis Package
 
 Please report any bugs to:
 asap@atnf.csiro.au
 
-[NOTE: ASAP is 0-based]
+[IMPORTANT: ASAP is 0-based]
 Type commands() to get a list of all available ASAP commands.
 
@@ -83 +82 @@
 <ul>
   <li> The current release source code snapshot <a
-      href="ftp://ftp.atnf.csiro.au/pub/software/asap/asap_src.tar.gz">asap source</a> </li>
+      href="ftp://ftp.atnf.csiro.au/pub/software/asap/asap_src.tar.bz2">asap source</a> </li>
   <li> A binary tar archive <a
       href=ftp://ftp.atnf.csiro.au/pub/software/asap/asap_linux.tar.bz2>linux binary</a>.