Changeset 259

Timestamp:

01/21/05 22:33:45 (19 years ago)

Author:

mar637

Message:

*renaming in scantable

File:

• trunk/python/asapfitter.py (modified) (8 diffs)

trunk/python/asapfitter.py

@@ -1 +1 @@
 import _asap
+from asap import rcParams
 
 class fitter:
@@ -80 +81 @@
         """
         #default poly order 0
-        self.fitfunc = 'poly'
-        n=0
+        
+
         if kwargs.has_key('poly'):
             self.fitfunc = 'poly'
@@ -110 +111 @@
         else:
             if self.data is not None:
-                self.x = self.data.getabcissa()
-                self.y = self.data.getspectrum()
+                self.x = self.data._getabcissa()
+                self.y = self.data._getspectrum()
                 print "Fitting:"
-                vb = self.data._verbose
-                self.data._verbose(True)
-                s = self.data.get_selection()
-                self.data._verbose(vb)
+                vb = self.data._vb
+                self.data._vb = True
+                s = self.data.get_cursor()
+                self.data._vb = vb
         
         self.fitter.setdata(self.x,self.y,self.mask)
@@ -213 +214 @@
             return
         scan = self.data.copy()
-        scan.setspectrum(self.fitter.getresidual())
+        scan._setspectrum(self.fitter.getresidual())
 
     def plot(self, residual=False):
@@ -235 +236 @@
         if self.data:
             tlab = self.data._getsourcename(0)
-            xlab = self.data.getabcissalabel(0)
+            xlab = self.data._getabcissalabel(0)
         ylab = r'Flux'
         m = self.data.getmask(0)
@@ -252 +253 @@
 
 
-    def auto_fit(self):
+    def auto_fit(self, insitu=None):
         """
         Return a scan where the function is applied to all rows for all Beams/IFs/Pols.
@@ -261 +262 @@
             print "Only works with scantables"
             return
-        scan = self.data.copy()
-        vb = scan._verbose
-        scan._verbose(False)
-        sel = scan.get_selection()
+        if insitu is None: insitu = rcParams['insitu']
+        if not insitu:
+            scan = self.data.copy()
+        else:
+            scan = self.data
+        vb = scan._vb
+        scan._vb = False
+        sel = scan.get_cursor()
         rows = range(scan.nrow())
         for i in range(scan.nbeam()):
@@ -276 +281 @@
                         print 'Beam[%d], IF[%d], Pol[%d]' % (i,j,k)
                     for iRow in rows:
-                        self.x = scan.getabcissa(iRow)
-                        self.y = scan.getspectrum(iRow)
+                        self.x = scan._getabcissa(iRow)
+                        self.y = scan._getspectrum(iRow)
                         self.data = None
                         self.fit()                    
                         x = self.get_parameters()
-                        scan.setspectrum(self.fitter.getresidual(),iRow)
-        scan.set_selection(sel[0],sel[1],sel[2])
-        scan._verbose(vb)
-        return scan
+                        scan._setspectrum(self.fitter.getresidual(),iRow)
+        scan.set_cursor(sel[0],sel[1],sel[2])
+        scan._vb = vb
+        if not insitu:
+            return scan