Changeset 989 for trunk/python

Timestamp:

04/05/06 14:33:42 (19 years ago)

Author:

mar637

Message:

reactivated scantable.save as in Ticket #4.
added scantable.set_dirframe as in ticket #13

File:

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

trunk/python/scantable.py

@@ -115 +115 @@
             self._save(name)
         else:
-            print "NYI"
-#             from asap._asap import sdwriter as _sw
-#             w = _sw(format2)
-#             w.write(self, name, stokes)
-
+            from asap._asap import stwriter as stw
+            w = stw(format2)
+            w.write(self, name)
         print_log()
         return
@@ -529 +527 @@
                    'GEO','GALACTO','LGROUP','CMB']
 
-        if 1:#frame in valid:
+        if frame in valid:
             inf = list(self._getcoordinfo())
             inf[1] = frame
@@ -541 +539 @@
                 raise TypeError(msg)
         print_log()
+
+    def set_dirframe(self, frame=""):
+        """
+        Set the frame type of the Direction on the sky.
+        Parameters:
+            frame:   an optional frame type, default ''. Valid frames are:
+                     'J2000', 'B1950', 'GALACTIC'
+        Examples:
+            scan.set_dirframe('GALACTIC')
+        """
+        varlist = vars()
+        try:
+            Scantable.set_dirframe(self, frame)
+        except RuntimeError,msg:
+            if rcParams['verbose']:
+                print msg
+            else:
+                raise
+        self._add_history("set_dirframe",varlist)
 
     def get_unit(self):
@@ -761 +778 @@
             scanav = "NONE"
         scan = (self,)
-        if align:
-            scan = (self.freq_align(insitu=False),)
-        s = scantable(self._math._average(scan, mask, weight.upper(),
-                      scanav))
+        try:
+          if align:
+              scan = (self.freq_align(insitu=False),)
+          s = scantable(self._math._average(scan, mask, weight.upper(),
+                        scanav))
+        except RuntimeError,msg:
+            if rcParams['verbose']:
+                print msg
+                return
+            else: raise
         s._add_history("average_time",varlist)
         print_log()