Changeset 1856

Timestamp:

08/05/10 10:24:41 (14 years ago)

Author:

Malte Marquarding

Message:

removed redundant print_log calls as the @print_log_dec handles them already

File:

• trunk/python/scantable.py (modified) (35 diffs)

trunk/python/scantable.py

@@ -145 +145 @@
         self.parallactify(parallactify)
         self._add_history("scantable", varlist)
-        print_log()
 
     @print_log_dec
@@ -204 +203 @@
             writer = stw(format2)
             writer.write(self, name)
-        print_log()
         return
 
@@ -237 +235 @@
         if not _is_valid(scanid):
             if rcParams['verbose']:
-                #print "Please specify a scanno to drop from the scantable"
                 asaplog.push( 'Please specify a scanno to drop from the scantable' )
                 print_log( 'ERROR' )
@@ -251 +248 @@
         except ValueError:
             if rcParams['verbose']:
-                #print "Couldn't find any match."
                 print_log()
                 asaplog.push( "Couldn't find any match." )
@@ -262 +258 @@
         except RuntimeError:
             if rcParams['verbose']:
-                #print "Couldn't find any match."
                 print_log()
                 asaplog.push( "Couldn't find any match." )
@@ -887 +882 @@
         self._setInstrument(instr)
         self._add_history("set_instument", vars())
-        print_log()
 
     @print_log_dec
@@ -901 +895 @@
         self._setfeedtype(feedtype)
         self._add_history("set_feedtype", vars())
-        print_log()
 
     @print_log_dec
@@ -918 +911 @@
         self._setcoordinfo(inf)
         self._add_history("set_doppler", vars())
-        print_log()
 
     @print_log_dec
@@ -957 +949 @@
             else:
                 raise TypeError(msg)
-        print_log()
 
     def set_dirframe(self, frame=""):
@@ -1000 +991 @@
         return unit
 
+    @print_log_dec
     def get_abcissa(self, rowno=0):
         """\
@@ -1017 +1009 @@
         abc = self._getabcissa(rowno)
         lbl = self._getabcissalabel(rowno)
-        print_log()
         return abc, lbl
 
@@ -1142 +1133 @@
             else: raise
         s._add_history("lag_flag", varlist)
-        print_log()
         if insitu:
             self._assign(s)
@@ -1218 +1208 @@
             if kwargs.get('invert'):
                 msk = mask_not(msk)
-        print_log()
         return msk
 
@@ -1586 +1575 @@
             else: raise
         s._add_history("average_time", varlist)
-        print_log()
         return s
 
@@ -1620 +1608 @@
         s = scantable(self._math._convertflux(self, d, eta, jyperk))
         s._add_history("convert_flux", varlist)
-        print_log()
         if insitu: self._assign(s)
         else: return s
@@ -1679 +1666 @@
         s = scantable(self._math._gainel(self, poly, filename, method))
         s._add_history("gain_el", varlist)
-        print_log()
         if insitu:
             self._assign(s)
@@ -1712 +1698 @@
         s = scantable(self._math._freq_align(self, reftime, method))
         s._add_history("freq_align", varlist)
-        print_log()
         if insitu: self._assign(s)
         else: return s
@@ -1745 +1730 @@
         s = scantable(self._math._opacity(self, tau))
         s._add_history("opacity", varlist)
-        print_log()
         if insitu: self._assign(s)
         else: return s
@@ -1768 +1752 @@
         s = scantable(self._math._bin(self, width))
         s._add_history("bin", varlist)
-        print_log()
         if insitu:
             self._assign(s)
@@ -1797 +1780 @@
         s = scantable(self._math._resample(self, method, width))
         s._add_history("resample", varlist)
-        print_log()
         if insitu: self._assign(s)
         else: return s
@@ -1820 +1802 @@
         s = scantable(self._math._averagepol(self, mask, weight.upper()))
         s._add_history("average_pol", varlist)
-        print_log()
         return s
 
@@ -1841 +1822 @@
         s = scantable(self._math._averagebeams(self, mask, weight.upper()))
         s._add_history("average_beam", varlist)
-        print_log()
         return s
 
@@ -1884 +1864 @@
                 raise
         s._add_history("convert_pol", varlist)
-        print_log()
         return s
 
@@ -1962 +1941 @@
             del orgscan
 
-        print_log()
         if insitu: self._assign(s)
         else: return s
@@ -2046 +2024 @@
                 f._p = None
             workscan._add_history("poly_baseline", varlist)
-            print_log()
-            if insitu: self._assign(workscan)
-            else: return workscan
+            if insitu:
+                self._assign(workscan)
+            else:
+                return workscan
         except RuntimeError:
             msg = "The fit failed, possibly because it didn't converge."
@@ -2237 +2216 @@
         self._math._rotate_linpolphase(self, angle)
         self._add_history("rotate_linpolphase", varlist)
-        print_log()
         return
 
@@ -2259 +2237 @@
         self._math._rotate_xyphase(self, angle)
         self._add_history("rotate_xyphase", varlist)
-        print_log()
         return
 
@@ -2271 +2248 @@
         self._math._swap_linears(self)
         self._add_history("swap_linears", varlist)
-        print_log()
         return
 
@@ -2340 +2316 @@
             s = scantable(self._math._unaryop(self.copy(), factor, "MUL", tsys))
         s._add_history("scale", varlist)
-        print_log()
         if insitu:
             self._assign(s)
@@ -2431 +2406 @@
             s = scantable(self._math._auto_quotient(self, mode, preserve))
         s._add_history("auto_quotient", varlist)
-        print_log()
         return s
 
@@ -2461 +2435 @@
         q = quotient(on, off, preserve)
         q._add_history("mx_quotient", varlist)
-        print_log()
         return q
 
@@ -2481 +2454 @@
         s = scantable(self._math._freqswitch(self))
         s._add_history("freq_switch", varlist)
-        print_log()
-        if insitu: self._assign(s)
-        else: return s
+        if insitu:
+            self._assign(s)
+        else:
+            return s
 
     @print_log_dec
@@ -2491 +2465 @@
         self._recalcazel()
         self._add_history("recalc_azel", varlist)
-        print_log()
         return
 
@@ -2558 +2531 @@
         return s
 
+    @print_log_dec
     def get_fit(self, row=0):
         """\
@@ -2574 +2548 @@
             #print fit
             asaplog.push( '%s' %(fit) )
-            print_log()
             return
         else: