Changeset 530 for trunk/python

Timestamp:

03/01/05 15:12:17 (20 years ago)

Author:

mar637

Message:

*added get_fit

• added more commands()

Location:

trunk/python

Files:

• __init__.py (modified) (5 diffs)
• scantable.py (modified) (2 diffs)

trunk/python/__init__.py

@@ -215 +215 @@
 from scantable import *
 from asaplinefind import *
+from asapfit import *
 
 from numarray import logical_and as mask_and
@@ -232 +233 @@
 
 __date__ = '$Date$'
-__version__  = '0.9'
+__version__  = '0.99'
 
 def list_scans(t = scantable):
@@ -285 +286 @@
             nbeam,nif,nchan,npol - the number of beams/IFs/Pols/Chans
             history         - print the history of the scantable
-
+            get_fit         - get a fit which has been stored witnh the data
             average_time    - return the (weighted) time average of a scan 
                               or a list of scans
@@ -321 +322 @@
                               commited.
             fit             - execute the actual fitting process
+            store_fit       - store the fit paramaters in the data (scantable)
             get_chi2        - get the Chi^2
             set_scan        - set the scantable to be fit
@@ -339 +341 @@
                               what is to be plotted 'colour stacked'
                               and what 'panelled'
-            set_range       - set the abcissa 'zoom' range
+            set_cursor      - only plot a selected part of the data
+            set_range       - set a 'zoom' window
             set_legend      - specify user labels for the legend indeces
             set_title       - specify user labels for the panel indeces

trunk/python/scantable.py

@@ -1061 +1061 @@
             # not using a mask
             bscan = scan.poly_baseline(order=3)
-        """
+        """('', 'TOPO', 'RADIO', 'TOPO')
         if insitu is None: insitu = rcParams['insitu']
         varlist = vars()
@@ -1358 +1358 @@
         s._add_history("operator /", varlist)
         return s
+
+    def get_fit(self, row=0):
+        """
+        Print or return the stored fits for a row in the scantable
+        Parameters:
+            row:    the row which the fit has been applied to.
+        """
+        if row > self.nrow():
+            return
+        from asap import asapfit
+        fit = asapfit(self._getfit(row))
+        if self._vb:
+            print fit
+            return
+        else:
+            return fit.as_dict()
 
     def _add_history(self, funcname, parameters):