Changeset 2793 for trunk/src

Timestamp:

03/15/13 17:28:55 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CSV-2333

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

Fixed an issue that FIELD table sometimes has empty (invalid) rows.

File:

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

trunk/src/MSWriter.cpp

@@ -866 +866 @@
     // fill empty SPECTRAL_WINDOW rows
     infillSpectralWindow() ;
+
+    // fill empty FIELD rows
+    infillField() ;
   }
 
@@ -1058 +1061 @@
       if ( nchan[i] == 0 )
         tr.put( i ) ;
+    }
+  }
+  void infillField()
+  {
+    ScalarColumn<Int> sourceIdCol(fieldtab, "SOURCE_ID");
+    ArrayColumn<Double> delayDirCol(fieldtab, "DELAY_DIR");
+    ArrayColumn<Double> phaseDirCol(fieldtab, "PHASE_DIR");
+    ArrayColumn<Double> referenceDirCol(fieldtab, "REFERENCE_DIR");
+    uInt nrow = fieldtab.nrow();
+    Matrix<Double> dummy(IPosition(2, 2, 1), 0.0);
+    for (uInt irow = 0; irow < nrow; ++irow) {
+      if (!phaseDirCol.isDefined(irow)) {
+        delayDirCol.put(irow, dummy);
+        phaseDirCol.put(irow, dummy);
+        referenceDirCol.put(irow, dummy);
+        sourceIdCol.put(irow, -1);
+      }
     }
   }