Changeset 1501 for trunk/src

Timestamp:

02/11/09 12:54:51 (16 years ago)

Author:

Malte Marquarding

Message:

support linking against pyrap

File:

• trunk/src/python_asap.cpp (modified) (4 diffs)

trunk/src/python_asap.cpp

@@ -39 +39 @@
 #include "ScantableWrapper.h"
 
+#ifndef HAVE_LIBPYRAP
+  #include "pyconversions.h"
+#else
+  #include <pyrap/Converters/PycExcp.h>
+  #include <pyrap/Converters/PycBasicData.h>
+#endif
 
-#include "pyconversions.h"
 #include "python_asap.h"
 
+#ifndef HAVE_LIBPYRAP
 namespace asap {
   namespace python {
+
 void translate_ex(const casa::AipsError& e)
 {
@@ -53 +60 @@
   }
 }
+#endif
+
 using namespace boost::python;
 
@@ -65 +74 @@
   asap::python::python_STWriter();
   asap::python::python_LineCatalog();
+  asap::python::python_Logger();
 
-  asap::python::python_Logger();
+#ifndef HAVE_LIBPYRAP
+  // Use built-in pyconversions.h
   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 > ();
   from_python_sequence < std::vector < int >,
@@ -91 +99 @@
   from_python_sequence < std::vector < bool >,
     variable_capacity_policy > ();
+#else
+  casa::pyrap::register_convert_excp();
+  casa::pyrap::register_convert_basicdata();
+  casa::pyrap::register_convert_std_vector<asap::ScantableWrapper>();
+#endif
 }