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

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu Aug 18 22:39:08 2011
New Revision: 298

Log:
Hiding the 2D histo (bin) -> 1D profile functions from Python, since the SWIG interface is demanding default constructors that don't exist and this is currently breaking the build.

Modified:
   trunk/pyext/yoda/yodawrap.i

Modified: trunk/pyext/yoda/yodawrap.i
==============================================================================
--- trunk/pyext/yoda/yodawrap.i	Thu Aug 18 22:36:54 2011	(r297)
+++ trunk/pyext/yoda/yodawrap.i	Thu Aug 18 22:39:08 2011	(r298)
@@ -3,9 +3,8 @@
 %{
   #define SWIG_FILE_WITH_INIT
   #include "YODA/Histo1D.h"
-  #include "YODA/Profile1D.h"
-
   #include "YODA/Histo2D.h"
+  #include "YODA/Profile1D.h"
 
   #include "YODA/Point2D.h"
   #include "YODA/Scatter2D.h"
@@ -15,6 +14,7 @@
 
   #include "YODA/WriterYODA.h"
   #include "YODA/WriterAIDA.h"
+
   using namespace YODA;
 %}
 
@@ -29,6 +29,7 @@
 %template(DoublePair) std::pair<double, double>;
 %template(IntDoubleDict) std::map<size_t, double>;
 
+
 ////////////////////////////////////////////////
 
 
@@ -49,58 +50,34 @@
 
 
 // Histos
-%feature("ignore") std::vector<YODA::HistoBin1D>::vector(size_type size);
-%feature("ignore") std::vector<YODA::HistoBin1D>::resize(size_type size);
-%feature("ignore") std::vector<YODA::HistoBin1D>::pop();
 %include "YODA/HistoBin1D.h"
 %include "YODA/Histo1D.h"
-%template(HistoBin1Ds) std::vector<YODA::HistoBin1D>;
-
-%feature("ignore") std::vector<YODA::HistoBin2D>::vector(size_type size);
-%feature("ignore") std::vector<YODA::HistoBin2D>::resize(size_type size);
-%feature("ignore") std::vector<YODA::HistoBin2D>::pop();
+// %feature("ignore") std::vector<YODA::HistoBin1D>::vector(size_type size);
+// %feature("ignore") std::vector<YODA::HistoBin1D>::resize(size_type size);
+// %feature("ignore") std::vector<YODA::HistoBin1D>::pop();
+// %template(HistoBin1Ds) std::vector<YODA::HistoBin1D>;
+
+/// @todo We currently have to hide these functions from the Python wrapper: let's fix that!
+%feature("ignore") YODA::HistoBin2D::transformX;
+%feature("ignore") YODA::HistoBin2D::transformY;
+%feature("ignore") YODA::Histo2D::mkProfileX;
+%feature("ignore") YODA::Histo2D::mkProfileY;
 %include "YODA/HistoBin2D.h"
 %include "YODA/Histo2D.h"
-%template(HistoBin2Ds) std::vector<YODA::HistoBin2D>;
-
+// %feature("ignore") std::vector<YODA::HistoBin2D>::vector(size_type size);
+// %feature("ignore") std::vector<YODA::HistoBin2D>::resize(size_type size);
+// %feature("ignore") std::vector<YODA::HistoBin2D>::pop();
+// %template(HistoBin2Ds) std::vector<YODA::HistoBin2D>;
 
 // Profile histos
-%feature("ignore") std::vector<YODA::ProfileBin1D>::vector(size_type size);
-%feature("ignore") std::vector<YODA::ProfileBin1D>::resize(size_type size);
-%feature("ignore") std::vector<YODA::ProfileBin1D>::pop();
 %include "YODA/ProfileBin1D.h"
 %include "YODA/Profile1D.h"
-%template(ProfileBin1Ds) std::vector<YODA::ProfileBin1D>;
-
-
-// // Scatter plot errors
-// %ignore YODA::ErrorCombiner;
-// %include "YODA/Error.h"
-// %template(PointError1D) YODA::PointError<1>;
-// %template(PointError2D) YODA::PointError<2>;
-// %template(PointError3D) YODA::PointError<3>;
-// //%template(ErrorSet1D) YODA::ErrorSet<1>; // ?
-// //%template(ErrorSet2D) YODA::ErrorSet<2>; // ?
-// //%template(ErrorSet3D) YODA::ErrorSet<3>; // ?
+// %feature("ignore") std::vector<YODA::ProfileBin1D>::vector(size_type size);
+// %feature("ignore") std::vector<YODA::ProfileBin1D>::resize(size_type size);
+// %feature("ignore") std::vector<YODA::ProfileBin1D>::pop();
+// %template(ProfileBin1Ds) std::vector<YODA::ProfileBin1D>;
 
 
-// // Scatter plot points
-// %ignore YODA::Point::error(size_t dim, ErrorCombiner& ec);
-// %ignore YODA::Point::symmError(size_t dim, ErrorCombiner& ec);
-// %ignore YODA::Point::errors(size_t dim, ErrorCombiner& ec);
-// %ignore YODA::Point::symmErrors(size_t dim, ErrorCombiner& ec);
-// %include "YODA/Point.h"
-
-
-// // Scatter plots
-// %include "YODA/Scatter.h"
-// %template(Point1D) YODA::Point<1>;
-// %template(Point2D) YODA::Point<2>;
-// %template(Point3D) YODA::Point<3>;
-// %template(Scatter1D) YODA::Scatter<1>;
-// %template(Scatter2D) YODA::Scatter<2>;
-// %template(Scatter3D) YODA::Scatter<3>;
-
 
 // Scatter plots
 %ignore operator ==(const YODA::Point2D&, const YODA::Point2D&);
@@ -138,3 +115,31 @@
 //     }
 //   }
 // %}
+
+
+
+// // Scatter plot errors
+// %ignore YODA::ErrorCombiner;
+// %include "YODA/Error.h"
+// %template(PointError1D) YODA::PointError<1>;
+// %template(PointError2D) YODA::PointError<2>;
+// %template(PointError3D) YODA::PointError<3>;
+// //%template(ErrorSet1D) YODA::ErrorSet<1>; // ?
+// //%template(ErrorSet2D) YODA::ErrorSet<2>; // ?
+// //%template(ErrorSet3D) YODA::ErrorSet<3>; // ?
+
+// // Scatter plot points
+// %ignore YODA::Point::error(size_t dim, ErrorCombiner& ec);
+// %ignore YODA::Point::symmError(size_t dim, ErrorCombiner& ec);
+// %ignore YODA::Point::errors(size_t dim, ErrorCombiner& ec);
+// %ignore YODA::Point::symmErrors(size_t dim, ErrorCombiner& ec);
+// %include "YODA/Point.h"
+
+// // Scatter plots
+// %include "YODA/Scatter.h"
+// %template(Point1D) YODA::Point<1>;
+// %template(Point2D) YODA::Point<2>;
+// %template(Point3D) YODA::Point<3>;
+// %template(Scatter1D) YODA::Scatter<1>;
+// %template(Scatter2D) YODA::Scatter<2>;
+// %template(Scatter3D) YODA::Scatter<3>;