Changeset 875

Timestamp:

03/06/06 11:32:22 (19 years ago)

Author:

mar637

Message:

SDMemTable -> Scantable handling (asap2)

Location:

trunk/src

Files:

• python_asap.cpp (modified) (3 diffs)
• python_asap.h (modified) (3 diffs)

trunk/src/python_asap.cpp

@@ -1 +1 @@
 //#---------------------------------------------------------------------------
-//# python_SD.cc: python module for single dish package
+//# python_asap.cc: python module for single dish package asap
 //#---------------------------------------------------------------------------
 //# Copyright (C) 2004
@@ -37 +37 @@
 #include <casa/aips.h>
 #include <casa/Exceptions/Error.h>
+#include "ScantableWrapper.h"
+
 
 #include "pyconversions.h"
-#include "python_SD.h"
+#include "python_asap.h"
 
 namespace asap {
@@ -54 +56 @@
 
 BOOST_PYTHON_MODULE(_asap) {
-  asap::python::python_SDMemTable();
-  asap::python::python_SDReader();
+  asap::python::python_Scantable();
+  asap::python::python_STFiller();
+  asap::python::python_STSelector();
+  asap::python::python_STMath();
+  asap::python::python_SDFitter();
+  /*
   asap::python::python_SDWriter();
-  asap::python::python_SDMath();
-  asap::python::python_SDFitter();
   asap::python::python_SDFitTable();
   asap::python::python_SDLineFinder();
+  */
   asap::python::python_SDLog();
+  register_exception_translator<casa::AipsError>(&asap::python::translate_ex);
 
-  register_exception_translator<casa::AipsError>(&asap::python::translate_ex);
+  //std_vector_to_tuple <  > ();
+  from_python_sequence < std::vector< asap::ScantableWrapper >,
+    variable_capacity_policy > ();
 
   std_vector_to_tuple < int > ();

trunk/src/python_asap.h

@@ -1 +1 @@
 //#---------------------------------------------------------------------------
-//# python_SD.h: python module for single dish package
+//# python_asap.h: python module for single dish package asap
 //#---------------------------------------------------------------------------
 //# Copyright (C) 2004
@@ -29 +29 @@
 //# $Id$
 //#---------------------------------------------------------------------------
-#ifndef PYTHON_SD_H
-#define PYTHON_SD_H
+#ifndef PYTHON_ASAP_H
+#define PYTHON_ASAP_H
 
 class casa::AipsError;
@@ -37 +37 @@
   namespace python {
     void translate_ex(const casa::AipsError& e);
-    void python_SDMemTable();
-    void python_SDReader();
+    void python_Scantable();
+    void python_STFiller();
+    void python_STSelector();
+    void python_STMath();
+    void python_SDFitter();
+    /*
     void python_SDWriter();
     void python_SDMath();
-    void python_SDFitter();
     void python_SDFitTable();
     void python_SDLineFinder();
+    */
     void python_SDLog();