Changeset 1947 for trunk/python

Timestamp:

11/10/10 14:48:15 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed:
+ An optional parameter 'prec (unsigned int)' is added to

scantable.get_time, python_Scantable::_gettime, ScantableWrapper::getTime and Scantable::getTime.

+ Also Scantable::fromatTime accepts 'prec' as a parameter.
+ scantable._get_column accepts args which will be passed to callback function.

Test Programs:

Put in Release Notes: No

Module(s): scantable

Description:

Add a parameter prec to scantable.get_time which specifies the precision of time returned.
The default value is prec=0.

File:

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

trunk/python/scantable.py

@@ -725 +725 @@
         return outvec
 
-    def _get_column(self, callback, row=-1):
+    def _get_column(self, callback, row=-1, *args):
         """
         """
         if row == -1:
-            return [callback(i) for i in range(self.nrow())]
+            return [callback(i, *args) for i in range(self.nrow())]
         else:
             if  0 <= row < self.nrow():
-                return callback(row)
-
-
-    def get_time(self, row=-1, asdatetime=False):
+                return callback(row, *args)
+
+
+    def get_time(self, row=-1, asdatetime=False, prec=0):
         """\
         Get a list of time stamps for the observations.
@@ -747 +747 @@
             asdatetime:   return values as datetime objects rather than strings
 
-        """
-        from time import strptime
+            prec:         number of digits shown. Note this number is equals to
+                          the digits of MVTime, i.e., 0<prec<3: dates with hh::
+                          only, <5: with hh:mm:, <7 or 0: with hh:mm:ss,
+                          and 6> : with hh:mm:ss.tt... (prec-6 t's added)
+
+        """
+        #from time import strptime
         from datetime import datetime
-        times = self._get_column(self._gettime, row)
+        times = self._get_column(self._gettime, row, prec)
         if not asdatetime:
             return times
-        format = "%Y/%m/%d/%H:%M:%S"
+        #format = "%Y/%m/%d/%H:%M:%S"
+        format = "%Y/%m/%d/%H:%M:%S.%f"
+        if prec < 7:
+            nsub = 1 + (((6-prec)/2) % 3)
+            substr = [".%f","%S","%M"]
+            for i in range(nsub):
+                format = format.replace(substr[i],"")
         if isinstance(times, list):
-            return [datetime(*strptime(i, format)[:6]) for i in times]
-        else:
-            return datetime(*strptime(times, format)[:6])
+            #return [datetime(*strptime(i, format)[:6]) for i in times]
+            return [datetime.strptime(i, format) for i in times]
+        else:
+            #return datetime(*strptime(times, format)[:6])
+            return datetime.strptime(times, format)