Changeset 80

Timestamp:

09/07/04 10:56:27 (20 years ago)

Author:

mar637

Message:

a) Changed interface to "taql" to allow for source name seraches.
b) updated to use CASA include paths

Location:

trunk/src

Files:

• SDMemTable.cc (modified) (3 diffs)
• SDMemTable.h (modified) (4 diffs)
• SDMemTableWrapper.h (modified) (2 diffs)
• python_SDMemTable.cc (modified) (1 diff)

trunk/src/SDMemTable.cc

@@ -31 +31 @@
 
 
-#include <aips/iostream.h>
-#include <aips/iomanip.h>
-#include <aips/Arrays/Array.h>
-#include <aips/Arrays/ArrayMath.h>
-#include <aips/Arrays/MaskArrMath.h>
-#include <aips/Arrays/ArrayLogical.h>
-#include <aips/Arrays/ArrayAccessor.h>
-
-#include <aips/Tables/TableParse.h>
-#include <aips/Tables/TableDesc.h>
-#include <aips/Tables/SetupNewTab.h>
-#include <aips/Tables/ScaColDesc.h>
-#include <aips/Tables/ArrColDesc.h>
-
-#include <aips/Tables/ExprNode.h>
-#include <aips/Tables/ScalarColumn.h>
-#include <aips/Tables/ArrayColumn.h>
-#include <aips/Tables/TableRecord.h>
-#include <aips/Measures/MFrequency.h>
-#include <aips/Measures/MeasTable.h>
-#include <aips/Quanta/MVTime.h>
+#include <casa/iostream.h>
+#include <casa/iomanip.h>
+#include <casa/Arrays/Array.h>
+#include <casa/Arrays/ArrayMath.h>
+#include <casa/Arrays/MaskArrMath.h>
+#include <casa/Arrays/ArrayLogical.h>
+#include <casa/Arrays/ArrayAccessor.h>
+
+#include <tables/Tables/TableParse.h>
+#include <tables/Tables/TableDesc.h>
+#include <tables/Tables/SetupNewTab.h>
+#include <tables/Tables/ScaColDesc.h>
+#include <tables/Tables/ArrColDesc.h>
+
+#include <tables/Tables/ExprNode.h>
+#include <tables/Tables/ScalarColumn.h>
+#include <tables/Tables/ArrayColumn.h>
+#include <tables/Tables/TableRecord.h>
+#include <measures/Measures/MFrequency.h>
+#include <measures/Measures/MeasTable.h>
+#include <casa/Quanta/MVTime.h>
 
 #include "SDMemTable.h"
@@ -88 +88 @@
 }
 
-SDMemTable::SDMemTable(const Table& tab, Int scanID) :
+SDMemTable::SDMemTable(const Table& tab, const std::string& exprs) :
   IFSel_(0),
   beamSel_(0),
   polSel_(0) {
-  String exprs = String("select * from $1 where SCANID == ")
-    +String::toString(scanID);
   //cerr << exprs << endl;
   Table t = tableCommand(exprs,tab);
@@ -104 +102 @@
 
 SDMemTable SDMemTable::getScan(Int scanID) {
-  return SDMemTable(table_, scanID);
+  String cond("SELECT * from $1 WHERE SCANID == ");
+  cond += String::toString(scanID);
+  return SDMemTable(table_, cond);
+}
+
+SDMemTable SDMemTable::getSource(const std::string& source) {
+  String cond("SELECT * from $1 WHERE SRCNAME == ");
+  cond += source;
+  return SDMemTable(table_, cond);
 }
 

trunk/src/SDMemTable.h

@@ -29 +29 @@
 //# $Id:
 //#---------------------------------------------------------------------------
-#ifndef _SDMEMTABLE_H_
-#define _SDMEMTABLE_H_
+#ifndef _SDMEMTABLE_H
+#define _SDMEMTABLE_H
 
 // STL
@@ -36 +36 @@
 #include <vector>
 // AIPS++
-#include <aips/aips.h>
-#include <aips/Utilities/String.h>
-#include <aips/Tables/Table.h>
-#include <aips/Arrays/MaskedArray.h>
+#include <casa/aips.h>
+#include <casa/BasicSL/String.h>
+#include <tables/Tables/Table.h>
+#include <casa/Arrays/MaskedArray.h>
 
-#include <trial/Coordinates/SpectralCoordinate.h>
+#include <coordinates/Coordinates/SpectralCoordinate.h>
 
 namespace atnf_sd {
@@ -63 +63 @@
   // Copy Construct a SDMemTable, give a scanid constraint
   // see also getScan()
-  SDMemTable(const Table& tab, Int scanID);
+  SDMemTable(const Table& tab, const std::string& expr);
 
   virtual ~SDMemTable();
@@ -114 +114 @@
   // get a new SDMemTable containg all rows with the same give SCANID
   SDMemTable getScan(Int scanID);
+  SDMemTable getSource(const std::string& source);
 
   const TableRecord& getHeader() const {return table_.keywordSet();}

trunk/src/SDMemTableWrapper.h

@@ -29 +29 @@
 //# $Id:
 //#---------------------------------------------------------------------------
-#ifndef _SDMEMTABLEWRAPPER_H_
-#define _SDMEMTABLEWRAPPER_H_
+#ifndef _SDMEMTABLEWRAPPER_H
+#define _SDMEMTABLEWRAPPER_H
 
 #include <vector>
@@ -50 +50 @@
   SDMemTableWrapper(SDMemTable* sdmt) : table_(sdmt) {;}
   
-  SDMemTableWrapper(const SDMemTableWrapper& mt, int scan) :
-    table_(new SDMemTable(mt.getCP()->table(), scan)) {;}
+  SDMemTableWrapper(const SDMemTableWrapper& mt, const std::string& expr) :
+    table_(new SDMemTable(mt.getCP()->table(), expr)) {;}
   
   SDMemTableWrapper getScan(int scan) {
-    return SDMemTableWrapper(*this, scan);
+    String cond("SELECT * from $1 WHERE SCANID == ");
+    cond += String::toString(scan);
+    return SDMemTableWrapper(*this, cond);
   }
+
+  SDMemTableWrapper getSource(const std::string& source) {
+    String cond("SELECT * from $1 WHERE SRCNAME == '");
+    cond += source;cond += "'";
+    return SDMemTableWrapper(*this, cond);
+  }
+
   std::vector<float> getSpectrum(int whichRow=0) const {
     return table_->getSpectrum(whichRow);

trunk/src/python_SDMemTable.cc

@@ -44 +44 @@
     .def( init <> () )
     .def( init < std::string > () )
-    .def( init < SDMemTableWrapper, int > () )
+    .def( init < SDMemTableWrapper, std::string > () )
     .def("getscan", &SDMemTableWrapper::getScan)
+    .def("getsource", &SDMemTableWrapper::getSource)
     .def("getspectrum", &SDMemTableWrapper::getSpectrum,
          (boost::python::arg("whichRow")=0) )