Changeset 2906 for trunk/src

Timestamp:

03/14/14 19:32:29 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-6284

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: test_sdsave

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Fixed an issue that MS POINTING.DIRECTION column may be non-conformant
when Scantable SCANRATE is a mixture of zero and nonzeros.

File:

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

trunk/src/MSWriter.cpp

@@ -675 +675 @@
   MSWriterVisitor(const Table &table, Table &mstable)
     : BaseMSWriterVisitor(table),
-      ms(mstable)
+      ms(mstable),
+      addScanrate_(False)
   { 
     rowidx = 0 ;
@@ -716 +717 @@
     attachMain() ;
     attachPointing() ;
+
+    // decide whether put SCANRATE to MS POINTING column
+    if (anyNE(scanRateCol.getColumn(), (Double)0.0)) {
+      addScanrate_ = True;
+    }
   }
   
@@ -803 +809 @@
       Vector<Double> dir = directionCol( recordNo ) ;
       Vector<Double> rate = scanRateCol( recordNo ) ;
-      if ( anyNE( rate, 0.0 ) ) {
+      //if ( anyNE( rate, 0.0 ) ) {
+      if (addScanrate_) {
         Matrix<Double> msdir( 2, 2 ) ;
         msdir.column( 0 ) = dir ;
@@ -1480 +1487 @@
   Bool useFloat;
   String poltype;
+  Bool addScanrate_;
 
   // MS subtables