[yoda-svn] r569 - in trunk: . pyext/yoda pyext/yoda/include

[blackhole at projects.hepforge.org]

Author: buckley
Date: Tue Mar  5 12:05:30 2013
New Revision: 569

Log:
Make Cython automatically add a copy of the original call signature to each function's docstring.  Removing the Plot from Cython... and soon from YODA itself: we'll do this stuff manually and less hackily.

Modified:
   trunk/ChangeLog
   trunk/pyext/yoda/core.pyx
   trunk/pyext/yoda/declarations.pxd
   trunk/pyext/yoda/include/IO.pyx

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Tue Mar  5 11:56:02 2013	(r568)
+++ trunk/ChangeLog	Tue Mar  5 12:05:30 2013	(r569)
@@ -1,3 +1,11 @@
+2013-03-05  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Removing the Plot from Cython... and soon from YODA itself:
+	we'll do this stuff manually and less hackily.
+
+	* Make Cython automatically add a copy of the original call
+	signature to each function's docstring.
+
 2013-03-04  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Adding Plot mapping to Cython and improving the AO annotations handling in Python.

Modified: trunk/pyext/yoda/core.pyx
==============================================================================
--- trunk/pyext/yoda/core.pyx	Tue Mar  5 11:56:02 2013	(r568)
+++ trunk/pyext/yoda/core.pyx	Tue Mar  5 12:05:30 2013	(r569)
@@ -1,3 +1,5 @@
+#cython: embedsignature=True
+
 cimport yoda.declarations as c
 cimport yoda.util as util
 import yoda.util as util
@@ -6,13 +8,11 @@
 from libcpp.vector cimport vector
 from libcpp.pair cimport pair
 from libcpp.map cimport map
-#import ctypes # Not done here any more, instead done on transformX/Y.
 
 # Pure python imports
 from itertools import repeat, imap
 from operator import attrgetter
 
-
 include "include/Errors.pyx"
 include "include/Dbn1D.pyx"
 include "include/Dbn2D.pyx"
@@ -20,32 +20,23 @@
 include "include/Point2D.pyx"
 include "include/Point3D.pyx"
 include "include/Bin.pyx"
-
 include "include/Bin1D.pxi"
-
 include "include/HistoBin1D.pyx"
-
 include "include/ProfileBin1D.pyx"
-
 include "include/AnalysisObject.pyx"
-
 include "include/Histo1D.pyx"
-
 include "include/Profile1D.pyx"
-
 include "include/IO.pyx"
-
 include "include/Scatter2D.pyx"
-
 include "include/Bin2D.pxi"
 include "include/ProfileBin2D.pyx"
 include "include/HistoBin2D.pyx"
 include "include/Histo2D.pyx"
 include "include/Profile2D.pyx"
 
-cdef class Plot(AnalysisObject):
-    cdef inline c.Plot *_Plot(self) except NULL:
-        return <c.Plot*> self.ptr()
+# cdef class Plot(AnalysisObject):
+#     cdef inline c.Plot *_Plot(self) except NULL:
+#         return <c.Plot*> self.ptr()
 
-    def __init__(self):
-        util.set_owned_ptr(self, new c.Plot())
+#     def __init__(self):
+#         util.set_owned_ptr(self, new c.Plot())

Modified: trunk/pyext/yoda/declarations.pxd
==============================================================================
--- trunk/pyext/yoda/declarations.pxd	Tue Mar  5 11:56:02 2013	(r568)
+++ trunk/pyext/yoda/declarations.pxd	Tue Mar  5 12:05:30 2013	(r569)
@@ -859,9 +859,9 @@
 # Axis2D }}}
 
 
-# Plot {{{
-cdef extern from "YODA/Plot.h" namespace "YODA":
-    cdef cppclass Plot(AnalysisObject):
-        pass
-    #Histo2D(string path, string title) except+ err
-# Plot }}}
+# # Plot {{{
+# cdef extern from "YODA/Plot.h" namespace "YODA":
+#     cdef cppclass Plot(AnalysisObject):
+#         pass
+#     #Histo2D(string path, string title) except+ err
+# # Plot }}}

Modified: trunk/pyext/yoda/include/IO.pyx
==============================================================================
--- trunk/pyext/yoda/include/IO.pyx	Tue Mar  5 11:56:02 2013	(r568)
+++ trunk/pyext/yoda/include/IO.pyx	Tue Mar  5 12:05:30 2013	(r569)
@@ -29,8 +29,6 @@
 
 def readYODA(file_or_filename):
     """
-    readYODA(file_or_filename)
-
     Read data objects from the provided YODA-format file.
     Returns a list of analysis objects
     """
@@ -52,8 +50,6 @@
 
 def readAIDA(file_or_filename):
     """
-    readAIDA(file_or_filename)
-
     Read data objects from the provided AIDA-format file.
     Returns a list of analysis objects
     """
@@ -79,8 +75,6 @@
 
 def writeYODA(ana_objs, file_or_filename):
     """
-    writeYODA(ana_objs, file_or_filename)
-
     Write data objects to the provided file in YODA format.
     """
     cdef c.ostringstream oss
@@ -103,8 +97,6 @@
 
 def writeFLAT(ana_objs, file_or_filename):
     """
-    writeFLAT(ana_objs, file_or_filename)
-
     Write data objects to the provided file in FLAT format.
     """
     cdef c.ostringstream oss
@@ -127,8 +119,6 @@
 
 def writeAIDA(ana_objs, file_or_filename):
     """
-    writeAIDA(ana_objs, file_or_filename)
-
     Write data objects to the provided file in AIDA format.
     """
     cdef c.ostringstream oss