[yoda-svn] r538 - in trunk: . bin pyext pyext/yoda pyext/yoda/include tests

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu Nov 15 17:19:36 2012
New Revision: 538

Log:
Adding svn:ignore cleanup, wrangling of TODOs, and whitespace changes

Modified:
   trunk/TODO
   trunk/bin/   (props changed)
   trunk/pyext/   (props changed)
   trunk/pyext/yoda/   (props changed)
   trunk/pyext/yoda/include/   (props changed)
   trunk/pyext/yoda/include/Histo1D.pyx
   trunk/tests/Makefile.am

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	Thu Nov 15 16:38:59 2012	(r537)
+++ trunk/TODO	Thu Nov 15 17:19:36 2012	(r538)
@@ -3,51 +3,47 @@
 
 NOW
 
-* Read Plot sections (HH)
-   DM to use this in implementing the make-plots replacement.
-
-* Allow comments on ends of YODA format data lines in ReaderYODA (HH)
-   Ignore anything after "#" on data lines -- use this to write convenience
-   height & error info for each bin since not obvious from sumWX2 etc.
-
-* Remove non-const bin access from Histos and Profiles?
+* Remove non-const bin access from Histos and Profiles
    cf. David D's point re. consistency via email on 7/8/2012
 
-* Multi-error support on Point types
-   Access by index, with negative (enum) indices for quad/linear/largest combn?
+* Auto-determine input and output formats (= readers/writers) from file extn (AB)
 
 * Add Axis2D -> Histo2D/Profile2D bin adding and erasing. (AB)
    Adding 2D operator support and bin-adding/erasing
 
-* Make Python interface test scripts (DM)
+* Make Python interface test scripts (DM,AB)
+   Test Histo2D and Scatter2D from Python
 
 * Add copy assignment to both C++ and Cython (AB)
 
 * Docstrings for Points, Dbns and Bins (AB)
 
-* Reintroduce missing docstrings (DM)
-
 * Add stdErr to HistoBinXD (AB)
 
-* Test Histo2D and Scatter2D from Python (AB)
+* WriterFlat, for Scatter2D representations only. (HH)
 
+* Transform 1D differential to integral histos and vice versa.
+   Bins have to be contiguous. Scatter -> Scatter, and Histo1D -> Scatter (AB)
 
 
 
 NEXT
 
-* Auto-determine input and output formats (= readers/writers) from file extn (AB)
+* ROOT analysis type converter functions
+   In YODA/ROOTCnv.h -- pure header library to avoid bild-time ROOT dependence
 
-* Improve tests Makefile setup to work out the path to the Python build dir. (AB)
+* Optionally configurable ROOT writer.
 
-* Add a merge() method in Bin2D. Add a constructor that takes Dbns (AB)
-   Use merge() to implement merging/rebinning in Axis2D -> Histo2D & Profile2D.
+* Add a Counter type (mostly a UI/persistency wrapper on Dbn1D) (AB)
+   "Binning"/"axis" option on arbitrary types, particularly strings? ->
+   generalised bar charts. Make counter a pure sumW, sumW2 object and use it in
+   implementation of Dbn1D/2D.
 
-* Detecting perfect/imperfect 2D grids (AB)
+* Generalise/expose Axis*D for binning of general objects, e.g. "binned histos"
 
 * 2D bin merging and rebinning (AB)
-   Only rebin perfect grids? Global rebinning of Axis2D -> Histo2D by generally
-   different integer factors in x and y directions.
+   Only rebin perfect grids: need to detect them. Global rebinning of Axis2D ->
+   Histo2D by generally different integer factors in x and y directions.
 
 * Test negative- and mixed-weighted stat calculations, and scaling.
 
@@ -57,29 +53,25 @@
 
 * Add Scatter1D/Point1D (AB)
 
-* Generalise/expose Axis*D for binning of general objects, e.g. "binned histos"
+* "BinnedValues" type: use Axis behaviour to look up fixed values without Dbn "history".
 
-* Transform 1D differential to integral histos and vice versa.
-   Bins have to be contiguous. (AB)
 
-* Add a Counter type (mostly a UI/persistency wrapper on Dbn1D) (AB)
-   "Binning"/"axis" option on arbitrary types, particularly strings? ->
-   generalised bar charts.
 
-* "BinnedValues" type: use Axis behaviour to look up fixed values.
-
-* Multiple errors on Scatters -- via a vector of Errors?
-   Flexible error combination? Error correlations? Max/min?
-
-* WriterFlat and ReaderFlat, for Scatter2D representations only. (HH)
+AND AFTER THAT...
 
-* Arbitrary function transforms on Scatters (AB)
+* Integer axis
 
-* Optionally configurable ROOT writer.
+* Read Plot sections in YODA format (HH)
+   Use this in implementing the make-plots replacement.
 
+* ReaderFlat -> Scatter2D
 
+* Allow comments on ends of YODA format data lines in ReaderYODA (HH)
+   Ignore anything after "#" on data lines -- use this to write convenience
+   height & error info for each bin since not obvious from sumWX2 etc.
 
-AND AFTER THAT...
+* Multi-error support on Point types
+   Access by index, with negative (enum) indices for quad/linear/largest combn?
 
 * Scatter2D -> Scatter<N> again (?) with specialisations for 1D, 2D and 3D
 

Modified: trunk/pyext/yoda/include/Histo1D.pyx
==============================================================================
--- trunk/pyext/yoda/include/Histo1D.pyx	Thu Nov 15 16:38:59 2012	(r537)
+++ trunk/pyext/yoda/include/Histo1D.pyx	Thu Nov 15 17:19:36 2012	(r538)
@@ -26,11 +26,11 @@
     Histo1D(E, path="", title=""). Construct a histogram from an
     iterator of edges, E.
 
-    Should this constructor fail, then 
+    Should this constructor fail, then
     Histo1D(nbins, low, high, path="", title="")
     """
 
-    # Is there a reason why this sounds like an advert? I'M ALREADY SOLD
+    # Is there a reason why this sounds like an advert? I'VE ALREADY SOLD OUT.
     # DAMMIT!
 
 
@@ -107,7 +107,7 @@
     @property
     def totalDbn(self):
         """The Dbn1D representing the total distribution."""
-        # Now does this actually involve a copy in Cython? We should probably
+        # TODO: Now does this actually involve a copy in Cython? We should probably
         # find out!
         return util.new_borrowed_cls(
             Dbn1D, &self._Histo1D().totalDbn(), self)
@@ -115,7 +115,7 @@
     def reset(self):
         """
         Reset the histogram but leave the bin structure.
-        
+
         """
         self._Histo1D().reset()
 
@@ -123,7 +123,7 @@
         """
         (double w=1.0) -> None. Scale Histogram and its statistics as if all
         weights had been scaled by given factor.
-        
+
         """
         self._Histo1D().scaleW(w)
 
@@ -157,10 +157,10 @@
         cdef vector[double] cedges
         for edge in edges:
             cedges.push_back(edge)
-        
+
         if len(edges):
             self._Histo1D().addBins(cedges)
-    
+
     def __addBins_bins(self, bins):
         self.__addBins_tuples(imap(attrgetter('edges'), bins))
 

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	Thu Nov 15 16:38:59 2012	(r537)
+++ trunk/tests/Makefile.am	Thu Nov 15 17:19:36 2012	(r538)
@@ -46,7 +46,6 @@
 # testscatter3Dmodify_SOURCES = Scatter3D/S3DModify.cc
 
 
-# TODO: Search paths are still not complete for the Python tests: need to add the lib.linux-i686-2.7 part to PYTHONPATH
 TESTS_ENVIRONMENT = \
   LD_LIBRARY_PATH=$(top_builddir)/src:$(top_builddir)/src/.libs:$(LD_LIBRARY_PATH) \
   PYTHONPATH=$(top_builddir)/pyext/build:$(PYTHONPATH) \