Changeset 2969 for trunk/src

Timestamp:

07/04/14 17:25:35 (10 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-6109)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: runUnitTest.main(test_sdlist)

Put in Release Notes: No

Module(s): scantable, sdlist

Description: Fixed a bug in time range calculation in scantable.summary (sdlist).

Also enhanced precision of time and direction listed in the method.
Added a parameter, prec, in a private funtion, Scantable::formatDirection to allow setting precision.

Location:

trunk/src

Files:

• Scantable.cpp (modified) (4 diffs)
• Scantable.h (modified) (1 diff)

trunk/src/Scantable.cpp

@@ -483 +483 @@
 };
 
-std::string Scantable::formatDirection(const MDirection& md) const
+  std::string Scantable::formatDirection(const MDirection& md, Int prec) const
 {
   Vector<Double> t = md.getAngle(Unit(String("rad"))).getValue();
-  Int prec = 7;
+  if (prec<0)
+    prec = 7;
 
   String ref = md.getRefString();
@@ -1174 +1175 @@
     meanIntTim = sum(intervalCol.getColumn()) / (double) snrow;
     minMax(btime, etime, mjdCol.getColumn());
-    etime += meanIntTim/C::day;
+    double shiftInDay(0.5*meanIntTim/C::day);
+    btime -= shiftInDay;
+    etime += shiftInDay;
 
     // MOLECULE_ID and FREQ_ID
@@ -1279 +1282 @@
         << std::left << setw(1) << ""
         << setw(15) << rec.asString("SRCNAME")
-        << setw(21) << MVTime(btime).string(MVTime::YMD,7)
-        << setw(3) << " - " << MVTime(etime).string(MVTime::TIME,7)
+        << setw(21) << MVTime(btime).string(MVTime::YMD,8)
+        << setw(3) << " - " << MVTime(etime).string(MVTime::TIME,8)
         << setw(3) << "" << setw(6) << meanIntTim << setw(1) << "" 
         << std::right << setw(5) << snrow << setw(2) << ""
@@ -1289 +1292 @@
     for (uInt j=0; j < nbeam; j++) {
       oss << setw(7) << "" << setw(6) << beamids(j) << setw(1) << ""
-          << formatDirection(beamDirs(j)) << endl;
+          << formatDirection(beamDirs(j),9) << endl;
     }
     // Flush summary every scan and clear up the string

trunk/src/Scantable.h

@@ -692 +692 @@
    *  Turns a casa::MDirection into a nicely formatted string
    * @param md an casa::MDirection
+   * @param prec output precision of direction
    * @return
    */
-  std::string formatDirection(const casa::MDirection& md) const;
+  std::string formatDirection(const casa::MDirection& md, casa::Int prec=7) const;
 
   /**