Changes in trunk/src/PKSFiller.cpp [1832:1916]

File:

• trunk/src/PKSFiller.cpp (modified) (6 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>
 
+#include <casa/Containers/Record.h>
 #include <measures/Measures/MDirection.h>
 #include <measures/Measures/MeasConvert.h>
@@ -34 +36 @@
 
 #include <time.h>
+#include <sstream>
 
 #include "STDefs.h"
@@ -58 +61 @@
 }
 
-bool PKSFiller::open( const std::string& filename)
+bool PKSFiller::open( const std::string& filename, const Record& rec)
 {
   Bool haveBase, haveSpectra;
@@ -74 +77 @@
   Vector<uInt> nchans,npols;
 
-  String antenna("0");
+  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,
@@ -146 +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);
@@ -263 +286 @@
     Int match = pksrec.srcName.matches(rx);
     std::string srcname;
+    Int srctype = Int(SrcType::NOTYPE);
     if (match) {
       srcname = pksrec.srcName;
+      srctype =  Int(SrcType::PSOFF);
     } else {
       srcname = pksrec.srcName.before(rx2);
-    }
-    Int srctype = match;
-    if ( pksrec.srcType != -1 ) {
+      srctype =  Int(SrcType::PSON);
+    }
+    if ( pksrec.srcType != Int(SrcType::NOTYPE)) {
       srctype = pksrec.srcType ;
     }