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

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu May  3 15:55:03 2012
New Revision: 467

Log:
Adding TODO targets for Scatter2D

Modified:
   trunk/TODO
   trunk/pyext/yoda/include/30-Scatter2D.pyx

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	Thu May  3 15:51:59 2012	(r466)
+++ trunk/TODO	Thu May  3 15:55:03 2012	(r467)
@@ -3,7 +3,11 @@
 
 NOW
 
-* Axis2D needs a complete rewrite. (AB)
+*
+
+* Complete rewrite of Axis2D. (AB)
+  Rewrite Axis2D to eliminate the crazy hashing scheme and demon code,
+  and use a 2D extension of the map lower/higher bound search now used on Axis1D.
   Additionally: Fix order in which points are specified in the
   Bin2D constructor. Add a merge() method in Bin2D. Add a constructor
   that takes Dbns.

Modified: trunk/pyext/yoda/include/30-Scatter2D.pyx
==============================================================================
--- trunk/pyext/yoda/include/30-Scatter2D.pyx	Thu May  3 15:51:59 2012	(r466)
+++ trunk/pyext/yoda/include/30-Scatter2D.pyx	Thu May  3 15:55:03 2012	(r467)
@@ -1,11 +1,13 @@
 cdef extern from "YODA/Scatter2D.h" namespace "YODA":
     cdef cppclass cScatter2D "YODA::Scatter2D" (cAnalysisObject):
+        cScatter2D()
+        cScatter2D(vector[cPoint2D]&, string, string)
+        cScatter2D(cScatter2D &s)
+        # TODO: Add more constructors
+
         size_t numPoints()
         vector[cPoint2D] points()
         cPoint2D& point(size_t i)
-        cScatter2D (cScatter2D &s)
-        cScatter2D (vector[cPoint2D]&, string, string)
-        cScatter2D ()
 
 
 
@@ -20,6 +22,9 @@
         cdef Point2D item
         cdef cScatter2D *scatter
         cdef int i
+
+        # TODO: Add more constructors and nice arg behaviours cf. Profile1D and Histo1D
+
         for i in range(N):
             item = points[i]
             point_vector[i] = item.ptr()[0]