Changeset 1916 for trunk/src

Timestamp:

08/30/10 19:13:04 (14 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: sd regression tests

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

The antenna and getpt parameters for MS filler is effective again.

File:

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

trunk/src/PKSFiller.cpp

@@ -20 +20 @@
 #include <casa/Arrays/ArrayLogical.h>
 #include <casa/Utilities/Regex.h>
+#include <casa/Utilities/DataType.h>
 #include <casa/Logging/LogIO.h>
 
@@ -35 +36 @@
 
 #include <time.h>
+#include <sstream>
 
 #include "STDefs.h"
@@ -76 +78 @@
 
   String antenna("");
+  Bool getPt = False;
+
+  // parsing MS options
+  if ( rec.isDefined( "ms" ) ) {
+    Record msrec = rec.asRecord( "ms" ) ;
+    //msrec.print( cout ) ;
+    if ( msrec.isDefined( "getpt" ) ) {
+      getPt = msrec.asBool( "getpt" ) ;
+    }
+    if ( msrec.isDefined( "antenna" ) ) {
+      if ( msrec.type( msrec.fieldNumber( "antenna" ) ) == TpInt ) {
+        Int antInt = msrec.asInt( "antenna" ) ;
+        ostringstream oss ;
+        oss << antInt ;
+        antenna = String( oss ) ;
+      }
+      else {
+        antenna = msrec.asString( "antenna" ) ;
+      }
+    }
+  }
 
   reader_ = getPKSreader(inName, antenna, 0, 0, format, beams, ifs,
@@ -147 +170 @@
   Vector<Int> start(nIF_, 1);
   Vector<Int> end(nIF_, 0);
-  Bool getPt = False;
   reader_->select(beams, ifs, start, end, ref, True, haveXPol_[0], False, getPt);
   setHeader(header);