Changeset 1781 for branches/alma

Timestamp:

07/30/10 11:32:50 (14 years ago)

Author:

Malte Marquarding

Message:

Fix for handling multiple restfrequencies. list of list didn't work and was using fixed units

File:

• branches/alma/python/scantable.py (modified) (14 diffs)

branches/alma/python/scantable.py

@@ -75 +75 @@
             tmpstr = ''
             for i in range( len(antenna) ):
-                if type(antenna[i]) == int: 
-                    tmpstr = tmpstr + ('%s,'%(antenna[i])) 
+                if type(antenna[i]) == int:
+                    tmpstr = tmpstr + ('%s,'%(antenna[i]))
                 elif type(antenna[i]) == str:
                     tmpstr=tmpstr+antenna[i]+','
@@ -82 +82 @@
                     asaplog.push('Bad antenna selection.')
                     print_log('ERROR')
-                    return 
+                    return
             antenna = tmpstr.rstrip(',')
         parallactify = parallactify or rcParams['scantable.parallactify']
@@ -485 +485 @@
         if stat.lower().endswith('_abc'): rtnabc = True
         getchan = False
-        if stat.lower().startswith('min') or stat.lower().startswith('max'): 
+        if stat.lower().startswith('min') or stat.lower().startswith('max'):
             chan = self._math._minmaxchan(self, mask, stat)
             getchan = True
@@ -522 +522 @@
             if self.npol(-1) > 1: out +=  ' Pol[%d] ' % (self.getpol(i))
             #outvec.append(callback(i))
-            #out += ('= %'+form) % (outvec[i]) +'   '+refstr+'\n' 
-            out += ('= %'+form) % (statvals[i]) +'   '+refstr+'\n' 
+            #out += ('= %'+form) % (outvec[i]) +'   '+refstr+'\n'
+            out += ('= %'+form) % (statvals[i]) +'   '+refstr+'\n'
             out +=  sep+"\n"
 
@@ -927 +927 @@
             else: raise
         self._add_history("flag_row", varlist)
-        
+
     def clip(self, uthres=None, dthres=None, clipoutside=True, unflag=False):
         """
@@ -1221 +1221 @@
             # list values are scalars
             if isinstance(freqs[-1], int) or isinstance(freqs[-1], float):
-                self._setrestfreqs(freqs, [""],unit)
+                self._setrestfreqs(freqs, [""], unit)
             # list values are tuples, (value, name)
             elif isinstance(freqs[-1], dict):
@@ -1233 +1233 @@
                 #self._setselection(savesel)
                 self._setrestfreqs(freqs["value"],
-                                   freqs["name"], "MHz")
+                                   freqs["name"], unit)
             elif isinstance(freqs[-1], list) or isinstance(freqs[-1], tuple):
                 sel = selector()
@@ -1243 +1243 @@
                     sel.set_ifs(iflist[i])
                     self._setselection(sel)
-                    self._setrestfreqs(freqs[i]["value"],
-                                       freqs[i]["name"], "MHz")
+                    self._setrestfreqs(freqs[i], [""], unit)
                 self._setselection(savesel)
         # freqs are to be taken from a linecatalog
@@ -1540 +1539 @@
         """
         Return a scan where all spectra have been binned up.
-        
+
         Parameters:
             width:       The bin width (default=5) in pixels
@@ -1734 +1733 @@
         if mask is None:
             mask = [True for i in xrange(self.nchan(-1))]
-        
+
         from asap.asapfitter import fitter
         try:
@@ -1746 +1745 @@
             if len(rows) > 0:
                 self.blpars = []
-            
+
             for r in rows:
                 # take into account flagtra info (CAS-1434)
@@ -1779 +1778 @@
             print_log()
             if insitu: self._assign(workscan)
-            else: return workscan 
+            else: return workscan
         except RuntimeError:
             msg = "The fit failed, possibly because it didn't converge."
@@ -1913 +1912 @@
             f.data = None
             f.fit()
-            
+
             # Show mask list
             masklist=workscan.get_masklist(fl.get_mask(),row=r)
@@ -2416 +2415 @@
         print_log()
         return s
-
-