Changeset 1947

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.

Location:

trunk

Files:

• python/scantable.py (modified) (2 diffs)
• src/Scantable.cpp (modified) (2 diffs)
• src/Scantable.h (modified) (2 diffs)
• src/ScantableWrapper.h (modified) (1 diff)
• src/python_Scantable.cpp (modified) (1 diff)

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)
 
 

trunk/src/Scantable.cpp

@@ -684 +684 @@
 std::string Scantable::formatTime(const MEpoch& me, bool showdate) const
 {
+  return formatTime(me, showdate, 0);
+}
+
+std::string Scantable::formatTime(const MEpoch& me, bool showdate, uInt prec) const
+{
   MVTime mvt(me.getValue());
   if (showdate)
-    mvt.setFormat(MVTime::YMD);
+    //mvt.setFormat(MVTime::YMD);
+    mvt.setFormat(MVTime::YMD, prec);
   else
-    mvt.setFormat(MVTime::TIME);
+    //mvt.setFormat(MVTime::TIME);
+    mvt.setFormat(MVTime::TIME, prec);
   ostringstream oss;
   oss << mvt;
@@ -1035 +1042 @@
 }
 
-std::string Scantable::getTime(int whichrow, bool showdate) const
-{
-  MEpoch::ROScalarColumn timeCol(table_, "TIME");
+// std::string Scantable::getTime(int whichrow, bool showdate) const
+// {
+//   MEpoch::ROScalarColumn timeCol(table_, "TIME");
+//   MEpoch me;
+//   if (whichrow > -1) {
+//     me = timeCol(uInt(whichrow));
+//   } else {
+//     Double tm;
+//     table_.keywordSet().get("UTC",tm);
+//     me = MEpoch(MVEpoch(tm));
+//   }
+//   return formatTime(me, showdate);
+// }
+
+std::string Scantable::getTime(int whichrow, bool showdate, uInt prec) const
+{
   MEpoch me;
-  if (whichrow > -1) {
-    me = timeCol(uInt(whichrow));
-  } else {
-    Double tm;
-    table_.keywordSet().get("UTC",tm);
-    me = MEpoch(MVEpoch(tm));
-  }
-  return formatTime(me, showdate);
+  me = getEpoch(whichrow);
+  return formatTime(me, showdate, prec);
 }
 

trunk/src/Scantable.h

@@ -368 +368 @@
 
   std::string summary(bool verbose=false);
-  std::string getTime(int whichrow=-1, bool showdate=true) const;
+  //std::string getTime(int whichrow=-1, bool showdate=true) const;
+  std::string getTime(int whichrow=-1, bool showdate=true, casa::uInt prec=0) const;
   double getIntTime(int whichrow) const { return integrCol_(whichrow); }
 
@@ -505 +506 @@
 
   std::string formatTime(const casa::MEpoch& me, bool showdate)const;
+  std::string formatTime(const casa::MEpoch& me, bool showdate, casa::uInt prec)const;
 
   /**

trunk/src/ScantableWrapper.h

@@ -84 +84 @@
     { return table_->getTsys(whichrow); }
 
-  std::string getTime(int whichrow=0) const
-    { return table_->getTime(whichrow); }
+  //std::string getTime(int whichrow=0) const
+  //  { return table_->getTime(whichrow); }
+  std::string getTime(int whichrow=0, int prec = 0) const
+    { return table_->getTime(whichrow, true, casa::uInt(prec)); }
 
   double getIntTime(int whichrow=0) const

trunk/src/python_Scantable.cpp

@@ -99 +99 @@
     .def("_getparangle", &ScantableWrapper::getParAngle,
          (boost::python::arg("whichrow")=0) )
+    //.def("_gettime", &ScantableWrapper::getTime,
+    //     (boost::python::arg("whichrow")=0) )
     .def("_gettime", &ScantableWrapper::getTime,
-         (boost::python::arg("whichrow")=0) )
+         (boost::python::arg("whichrow")=0,
+          boost::python::arg("prec")=0) )
     .def("_getinttime", &ScantableWrapper::getIntTime,
          (boost::python::arg("whichrow")=0) )