Changeset 1504

Timestamp:

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

Author:

Malte Marquarding

Message:

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

Location:

trunk

Files:

• python/__init__.py (modified) (2 diffs)
• python/scantable.py (modified) (3 diffs)
• src/STFiller.cpp (modified) (4 diffs)
• src/STFiller.h (modified) (2 diffs)
• src/python_STFiller.cpp (modified) (2 diffs)

trunk/python/__init__.py

@@ -114 +114 @@
     'scantable.verbosesummary'   : [False, _validate_bool],
     'scantable.storage'   : ['memory', str],
-    'scantable.history'   : [True, _validate_bool]
+    'scantable.history'   : [True, _validate_bool],
+    'scantable.reference'      : ['.*(e|w|_R)$', str]
     # fitter
     }
@@ -180 +181 @@
 scantable.verbosesummary   : False
 
+# Control the identification of reference (off) scans
+# This is has to be a regular expression
+scantable.reference         : .*(e|w|_R)$
 # Fitter
 """

trunk/python/scantable.py

@@ -1515 +1515 @@
             return s
 
-    def set_sourcetype(self, match, sourcetype="reference"):
+    def set_sourcetype(self, match, matchtype="pattern",
+                       sourcetype="reference"):
         """
         Set the type of the source to be an source or reference scan
         using the provided pattern:
         Parameters:
-            match:          a Unix style pattern or asap selector
+            match:          a Unix style pattern, regular expression or selector
+            matchtype:      'pattern' (default) UNIX style pattern or
+                            'regex' regular expression
             sourcetype:     the type of the source to use (source/reference)
         """
@@ -1530 +1533 @@
         elif sourcetype.lower().startswith("s"):
             stype = 0
-        if stype == -1:
+        else:
             raise ValueError("Illegal sourcetype use s(ource) or r(eference)")
+        if matchtype.lower().startswith("p"):
+            matchtype = "pattern"
+        elif matchtype.lower().startswith("r"):
+            matchtype = "regex"
+        else:
+            raise ValueError("Illegal matchtype, use p(attern) or r(egex)")
         sel = selector()
         if isinstance(match, selector):
             sel = match
         else:
-            sel.set_query("SRCNAME == pattern('%s')" % match)
+            sel.set_query("SRCNAME == %s('%s')" % (matchtype, match))
         self.set_selection(basesel+sel)
         self._setsourcetype(stype)
@@ -1831 +1840 @@
             tbl = Scantable(stype)
             r = stfiller(tbl)
+            rx = rcParams['scantable.reference']
+            r._setreferenceexpr(rx)
             msg = "Importing %s..." % (name)
             asaplog.push(msg, False)

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)
       ;
     };