Changeset 1948 for trunk/python

Timestamp:

11/10/10 16:16:23 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: changed default value of prec=-1 in scantable.get_time

Test Programs:

Put in Release Notes: No

Module(s):

Description:

Chenged the default value of parameter prec=-1 in scantable.get_time.
When prec=-1, necessary time precision is automatically calculated based on
minimum integration time in the scantable.

File:

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

trunk/python/scantable.py

@@ -2 +2 @@
 
 import os
+import numpy
 try:
     from functools import wraps as wraps_dec
@@ -735 +736 @@
 
 
-    def get_time(self, row=-1, asdatetime=False, prec=0):
+    def get_time(self, row=-1, asdatetime=False, prec=-1):
         """\
         Get a list of time stamps for the observations.
@@ -747 +748 @@
             asdatetime:   return values as datetime objects rather than strings
 
-            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,
+            prec:         number of digits shown. Default -1 to automatic calculation.
+                          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
+        if prec < 0:
+            # automagically set necessary precision +1
+            prec = 7 - numpy.floor(numpy.log10(min(self.get_inttime())))
+            prec = max(6, int(prec))
+        else:
+            prec = max(0, prec)
+        if asdatetime:
+            #precision can be 1 millisecond at max
+            prec = min(12, prec)
+
         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.%f"
         if prec < 7:
@@ -766 +776 @@
                 format = format.replace(substr[i],"")
         if isinstance(times, list):
-            #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)