Changeset 1947 for trunk/src

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/src

Files:

• Scantable.cpp (modified) (2 diffs)
• Scantable.h (modified) (2 diffs)
• ScantableWrapper.h (modified) (1 diff)
• python_Scantable.cpp (modified) (1 diff)

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) )