Changeset 1859 for trunk/python/asapplotter.py

Timestamp:

08/05/10 14:40:38 (14 years ago)

Author:

Malte Marquarding

Message:

Ticket #193: the rcParamsverbose? flag is only used in standard asap cli mode. Otherwise log messages are always send to the logger and one needs to call asaplog.disable()/asaplog.enable() to controls this. I have also added the function name as the log origin.

File:

• trunk/python/asapplotter.py (modified) (14 diffs)

trunk/python/asapplotter.py

@@ -102 +102 @@
         if not self._data and not scan:
             msg = "Input is not a scantable"
-            if rcParams['verbose']:
-                #print msg
-                asaplog.push( msg )
-                print_log( 'ERROR' )
-                return
             raise TypeError(msg)
         if scan: self.set_data(scan,refresh=False)
@@ -277 +272 @@
     # end matplotlib.axes fowarding functions
 
+    @print_log_dec
     def set_data(self, scan, refresh=True):
         """
@@ -299 +295 @@
                     msg = "A new scantable is set to the plotter. The masks and data selections are reset."
                     asaplog.push( msg )
-                    print_log( 'INFO' )
             else:
                 self._data = scan
@@ -305 +300 @@
         else:
             msg = "Input is not a scantable"
-            if rcParams['verbose']:
-                #print msg
-                asaplog.push( msg )
-                print_log( 'ERROR' )
-                return
             raise TypeError(msg)
 
@@ -320 +310 @@
         if refresh: self.plot()
 
-
+    @print_log_dec
     def set_mode(self, stacking=None, panelling=None, refresh=True):
         """
@@ -343 +333 @@
         if not self.set_panelling(panelling) or \
                not self.set_stacking(stacking):
-            if rcParams['verbose']:
-                #print msg
-                asaplog.push( msg )
-                print_log( 'ERROR' )
-                return
-            else:
-                raise TypeError(msg)
+            raise TypeError(msg)
         if refresh and self._data: self.plot(self._data)
         return
@@ -745 +729 @@
         return
 
-
+    @print_log_dec
     def set_mask(self, mask=None, selection=None, refresh=True):
         """
@@ -763 +747 @@
         if not self._data:
             msg = "Can only set mask after a first call to plot()"
-            if rcParams['verbose']:
-                #print msg
-                asaplog.push( msg )
-                print_log( 'ERROR' )
-                return
-            else:
-                raise RuntimeError(msg)
+            raise RuntimeError(msg)
         if len(mask):
             if isinstance(mask, list) or isinstance(mask, tuple):
@@ -1171 +1149 @@
     # plot total power data
     # plotting in time is not yet implemented..
+    @print_log_dec
     def plottp(self, scan=None, outfile=None):
         if self._plotter.is_dead:
@@ -1182 +1161 @@
         if not self._data and not scan:
             msg = "Input is not a scantable"
-            if rcParams['verbose']:
-                #print msg
-                asaplog.push( msg )
-                print_log( 'ERROR' )
-                return
             raise TypeError(msg)
         if isinstance(scan, scantable):
@@ -1216 +1190 @@
         self._plotter.tidy()
         self._plotter.show(hardrefresh=False)
-        print_log()
         return
 
@@ -1277 +1250 @@
 
     # printing header information
+    @print_log_dec
     def print_header(self, plot=True, fontsize=9, logger=False, selstr='', extrastr=''):
         """
@@ -1288 +1262 @@
             extrastr:  additional string to print (not verified)
         """
-        if not plot and not logger: return
-        if not self._data: raise RuntimeError("No scantable has been set yet.")
+        if not plot and not logger:
+            return
+        if not self._data:
+            raise RuntimeError("No scantable has been set yet.")
         # Now header will be printed on plot and/or logger.
         # Get header information and format it.
@@ -1322 +1298 @@
             asaplog.push(extrastr)
             asaplog.push(ssum[ssum.find('Beams:'):])
-            print_log()
         del ssum