Changeset 1504 for trunk/src

Timestamp:

02/13/09 11:27:42 (16 years ago)

Author:

Malte Marquarding

Message:

Fix for ticket #151: added facilities to help with on/off scan identification/setting

Location:

trunk/src

Files:

• STFiller.cpp (modified) (4 diffs)
• STFiller.h (modified) (2 diffs)
• python_STFiller.cpp (modified) (2 diffs)

trunk/src/STFiller.cpp

@@ -44 +44 @@
   reader_(0),
   header_(0),
-  table_(0)
+  table_(0),
+  refRx_(".*(e|w|_R)$")
 {
 }
@@ -51 +52 @@
   reader_(0),
   header_(0),
-  table_(stbl)
+  table_(stbl),
+  refRx_(".*(e|w|_R)$")
 {
 }
@@ -58 +60 @@
   reader_(0),
   header_(0),
-  table_(0)
+  table_(0),
+  refRx_(".*(e|w|_R)$")
 {
   open(filename, whichIF, whichBeam);
@@ -276 +279 @@
     *fieldnCol = pksrec.fieldName;
     // try to auto-identify if it is on or off.
-    Regex rx(".*(e|w|_R)$");
+    Regex rx(refRx_);
     Regex rx2("_S$");
     Int match = pksrec.srcName.matches(rx);

trunk/src/STFiller.h

@@ -93 +93 @@
   casa::CountedPtr<Scantable> getTable() const { return table_;}
 
+  void setReferenceExpr(const std::string& rx) { refRx_ = rx; }
+
 private:
 
@@ -102 +104 @@
   casa::uInt ifOffset_, beamOffset_;
   casa::Vector<casa::Bool> haveXPol_;
+  casa::String refRx_;
 };
 

trunk/src/python_STFiller.cpp

@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id:$
+//# $Id$
 //#---------------------------------------------------------------------------
 #include <boost/python.hpp>
@@ -47 +47 @@
         .def("_close", &STFillerWrapper::close)
         .def("_getdata", &STFillerWrapper::getScantable)
+        .def("_setreferenceexpr", &STFillerWrapper::setReferenceExpr)
       ;
     };