[yoda-svn] r450 - trunk/pyext/yoda

[blackhole at projects.hepforge.org]

Author: dgrell
Date: Wed May  2 13:04:46 2012
New Revision: 450

Log:
Fixed removal of the Cython build of Histo2D

Modified:
   trunk/pyext/yoda/Makefile.am
   trunk/pyext/yoda/shims.h

Modified: trunk/pyext/yoda/Makefile.am
==============================================================================
--- trunk/pyext/yoda/Makefile.am	Wed May  2 12:49:55 2012	(r449)
+++ trunk/pyext/yoda/Makefile.am	Wed May  2 13:04:46 2012	(r450)
@@ -9,8 +9,10 @@
 	include/30-HistoBin1D.pyx include/30-ProfileBin1D.pyx include/30-HistoBin2D.pyx include/30-Reader.pyx include/30-Scatter2D.pyx \
 	include/40-Histo1D.pyx include/40-Profile1D.pyx include/40-WriterAIDA.pyx \
 	include/99-ReaderAIDA.pyx include/99-ReaderYODA.pyx
+	cat $+ > yoda.pyx
+
 ##include/40-Histo2D.pyx
-	cat include/*.pyx > yoda.pyx
+
 
 clean-local:
 	rm yoda.cpp yoda.pyx

Modified: trunk/pyext/yoda/shims.h
==============================================================================
--- trunk/pyext/yoda/shims.h	Wed May  2 12:49:55 2012	(r449)
+++ trunk/pyext/yoda/shims.h	Wed May  2 13:04:46 2012	(r450)
@@ -5,8 +5,8 @@
 #include "YODA/Profile1D.h"
 #include "YODA/Scatter2D.h"
 #include "YODA/HistoBin1D.h"
-#include "YODA/Histo2D.h"
-#include "YODA/Scatter3D.h"
+// #include "YODA/Histo2D.h"
+// #include "YODA/Scatter3D.h"
 #include "YODA/WriterAIDA.h"
 #include <string>
 #include <vector>
@@ -36,19 +36,19 @@
   return a - b;
 }
 
-/// Histo2D operators
+// /// Histo2D operators
 
-inline Histo2D add_Histo2D(const Histo2D& a, const Histo2D& b) {
-  return a + b;
-}
-
-inline Histo2D subtract_Histo2D(const Histo2D& a, const Histo2D& b) {
-  return a - b;
-}
-
-inline Scatter3D divide_Histo2D(const Histo2D& a, const Histo2D& b) {
-  return a / b;
-}
+// inline Histo2D add_Histo2D(const Histo2D& a, const Histo2D& b) {
+//   return a + b;
+// }
+
+// inline Histo2D subtract_Histo2D(const Histo2D& a, const Histo2D& b) {
+//   return a - b;
+// }
+
+// inline Scatter3D divide_Histo2D(const Histo2D& a, const Histo2D& b) {
+//   return a / b;
+// }
 
 
 void WriterAIDA_write (const std::string& filename, const std::vector<AnalysisObject*>& aos) {