[yoda-svn] r229 - trunk/include/YODA

[blackhole at projects.hepforge.org]

Author: buckley
Date: Mon Aug  8 22:10:00 2011
New Revision: 229

Log:
Add declarations of the Scatter3D arithmetic operators

Modified:
   trunk/include/YODA/Scatter3D.h

Modified: trunk/include/YODA/Scatter3D.h
==============================================================================
--- trunk/include/YODA/Scatter3D.h	Mon Aug  8 22:09:37 2011	(r228)
+++ trunk/include/YODA/Scatter3D.h	Mon Aug  8 22:10:00 2011	(r229)
@@ -222,8 +222,31 @@
   /// @name Conversion functions from other data types
   //@{
 
-  /// Make a Scatter3D representation of a Histo1D
-  //Scatter3D mkScatter(const Histo2D& h);
+  /// Make a Scatter3D representation of a Histo2D
+  /// @todo Implement!
+  // Scatter3D mkScatter(const Histo2D& h);
+
+  /// Make a Scatter3D representation of a Profile2D
+  /// @todo Implement!
+  // Scatter3D mkScatter(const Profile2D& h);
+
+  //@}
+
+
+  /////////////////////////////////
+
+
+  /// @name Combining scatters: global operators, assuming aligned points
+  //@{
+
+  /// Add two scatters
+  Scatter3D operator + (const Scatter3D& first, const Scatter3D& second);
+
+  /// Subtract two scatters
+  Scatter3D operator - (const Scatter3D& first, const Scatter3D& second);
+
+  /// Divide two scatters
+  Scatter3D operator / (const Scatter3D& numer, const Scatter3D& denom);
 
   //@}