Changeset 3058 for trunk/src

Timestamp:

11/10/15 15:57:08 (9 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-8062

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Do not add redundant row to POINTING table.

File:

• trunk/src/MSWriter.cpp (modified) (4 diffs)

trunk/src/MSWriter.cpp

@@ -676 +676 @@
     : BaseMSWriterVisitor(table),
       ms(mstable),
-      addScanrate_(False)
+      addScanrate_(False),
+      pointingTimeList_(table.nrow(), -1.0),
+      referenceBeam_(-1)
   { 
     rowidx = 0 ;
@@ -752 +754 @@
     
     feedId = (Int)columnValue ;
+    if (referenceBeam_ < 0) {
+      referenceBeam_ = feedId;
+      LogIO os;
+      os << "Reference beam is " << referenceBeam_ << LogIO::POST;
+    }
 
     // put value
@@ -806 +813 @@
     Double interval = intervalCol.asdouble( recordNo ) ;
 
-    if ( ptName.empty() ) {
+    // add POINTING row only when 1) BEAMNO is 0 and
+    // 2) there is no row corresponding to the current timestamp
+    //LogIO os;
+    //os << "feedId = " << feedId << LogIO::POST;
+    if ( ptName.empty() && //feedId == referenceBeam_ &&
+        (potab.nrow() == 0 || allNE(pointingTimeList_(Slice(0, potab.nrow())), timeSec))) {
+      LogIO os;
+      os << LogIO::DEBUGGING << "ROW " << recordNo << " Beam " << feedId
+          << ": adding pointing row, potab.nrow() = " << potab.nrow() << LogIO::POST;
+      pointingTimeList_[potab.nrow()] = timeSec;
       Vector<Double> dir = directionCol( recordNo ) ;
       Vector<Double> rate = scanRateCol( recordNo ) ;
+      if (feedId != referenceBeam_) {
+        os << LogIO::DEBUGGING << "TODO: Need to store pointing direction of reference beam"
+            << " if only non-reference beam row is available for certain timestamp" << LogIO::POST;
+      }
       //if ( anyNE( rate, 0.0 ) ) {
       if (addScanrate_) {
@@ -1532 +1552 @@
   Record srcRec;
   map< Int, Matrix<Int> > corrProductTemplate;
+  Vector<Double> pointingTimeList_;
+  Int referenceBeam_;
 };