Changeset 2207 for trunk/src

Timestamp:

07/06/11 13:13:16 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

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

If getPt_ is True, path to POINTING subtable is not stored in header
keyword.

Bug fix on MSWriter:

write TARGET column in POINTING table
NUM_POLY must be dir.ncolumn()-1, not dir.ncolumn()

Location:

trunk/src

Files:

• MSFiller.cpp (modified) (1 diff)
• MSWriter.cpp (modified) (2 diffs)

trunk/src/MSFiller.cpp

@@ -979 +979 @@
 
   // save path to POINTING table
-  // 2011/3/2 TN
-  // So far, path to original POINTING table is always stored 
-  // since sd tasks and regressions don't support getpt control
-  //if ( !getPt_ ) {
+  // 2011/07/06 TN
+  // Path to POINTING table in original MS will not be written
+  // if getPt_ is True
   Path datapath( tablename_ ) ;
-  String pTabName = datapath.absoluteName() + "/POINTING" ;
-  stab.rwKeywordSet().define( "POINTING", pTabName ) ;
-  //}
+  if ( !getPt_ ) {
+    String pTabName = datapath.absoluteName() + "/POINTING" ;
+    stab.rwKeywordSet().define( "POINTING", pTabName ) ;
+  }
 
   // for GBT

trunk/src/MSWriter.cpp

@@ -1362 +1362 @@
   *antennaRF = 0 ;
   RecordFieldPtr<Int> numpolyRF( rec, "NUM_POLY" ) ;
-  *numpolyRF = dir.ncolumn() ;
+  *numpolyRF = dir.ncolumn() - 1 ;
   RecordFieldPtr<Double> timeRF( rec, "TIME" ) ;
   *timeRF = me ;
@@ -1376 +1376 @@
   *dirRF = dir ;
   RecordFieldPtr< Array<Double> > targetRF( rec, "TARGET" ) ;
-  *dirRF = dir ;
+  *targetRF = dir ;
   row.put( nrow ) ;