Changeset 1904

Timestamp:

08/26/10 13:04:24 (14 years ago)

Author:

Malte Marquarding

Message:

pass down record for filler options

Location:

trunk

Files:

• python/scantable.py (modified) (1 diff)
• src/FillerBase.h (modified) (1 diff)
• src/FillerWrapper.h (modified) (3 diffs)
• src/NROFiller.cpp (modified) (2 diffs)
• src/NROFiller.h (modified) (1 diff)
• src/PKSFiller.cpp (modified) (2 diffs)
• src/PKSFiller.h (modified) (2 diffs)

trunk/python/scantable.py

@@ -2549 +2549 @@
             msg = "Importing %s..." % (name)
             asaplog.push(msg, False)
-            r.open(name)# antenna, -1, -1, getpt)
+            opts = {'ms': {'antenna' : antenna, 'getpt': getpt} }
+            r.open(name, opts)# antenna, -1, -1, getpt)
             r.fill()
             if average:

trunk/src/FillerBase.h

@@ -43 +43 @@
     virtual ~FillerBase() {;}
 
-//    virtual bool open(const std::string& filename, const Record& rec) = 0;
-    virtual bool open(const std::string& filename) = 0;
+    virtual bool open(const std::string& filename, const casa::Record& rec) = 0;
+    //    virtual bool open(const std::string& filename) = 0;
     virtual void fill() = 0;
     virtual void close() = 0;

trunk/src/FillerWrapper.h

@@ -16 +16 @@
 #include <casa/Exceptions.h>
 #include <casa/Utilities/CountedPtr.h>
+#include <casa/Containers/Record.h>
 #include <casa/OS/File.h>
 
@@ -38 +39 @@
 
 
-//  void open(const std::string& filename, casa::Record rec) {
-  void open(const std::string& filename) {
+  void open(const std::string& filename, const casa::Record& rec) {
+    //  void open(const std::string& filename) {
     casa::File file(filename);
     if ( !file.exists() ) {
@@ -45 +46 @@
     }
     filler_ = new PKSFiller(stable_);
-//    if (filler_->open(filename, rec)) {
-    if (filler_->open(filename)) {
+    if (filler_->open(filename, rec)) {
+      //    if (filler_->open(filename)) {
       attached_ = true;
       return;
     }
     filler_ = new NROFiller(stable_);
-//    if (filler_->open(filename, rec)) {
-    if (filler_->open(filename)) {
+    if (filler_->open(filename, rec)) {
+      //    if (filler_->open(filename)) {
       attached_ = true;
       return;

trunk/src/NROFiller.cpp

@@ -20 +20 @@
 #include "NROFiller.h"
 #include "STHeader.h"
+#include <casa/Containers/Record.h>
 #include <atnf/PKSIO/SrcType.h>
 
@@ -36 +37 @@
 }
 
-bool NROFiller::open(const std::string& filename) 
+  bool NROFiller::open(const std::string& filename, const Record& rec) 
 {
   bool status = true ;

trunk/src/NROFiller.h

@@ -45 +45 @@
     virtual ~NROFiller();
 
-    bool open(const std::string& filename) ;
+    bool open(const std::string& filename, const casa::Record& rec) ;
     void fill() ;
     void close() ;

trunk/src/PKSFiller.cpp

@@ -22 +22 @@
 #include <casa/Logging/LogIO.h>
 
+#include <casa/Containers/Record.h>
 #include <measures/Measures/MDirection.h>
 #include <measures/Measures/MeasConvert.h>
@@ -58 +59 @@
 }
 
-bool PKSFiller::open( const std::string& filename)
+bool PKSFiller::open( const std::string& filename, const Record& rec)
 {
   Bool haveBase, haveSpectra;

trunk/src/PKSFiller.h

@@ -20 +20 @@
 #include <casa/Arrays/Vector.h>
 
+
 #include "FillerBase.h"
 #include "Scantable.h"
 
+class casa::Record;
 class PKSreader;
 
@@ -34 +36 @@
     virtual ~PKSFiller();
 
-//    bool open(const std::string& filename, const Record& rec)=0;
-    bool open(const std::string& filename);
+    bool open(const std::string& filename, const casa::Record& rec);
+    //    bool open(const std::string& filename);
     void fill();
     void close();