[Rivet-svn] rivet: intermediate commit for David

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/67da262a18ee
branches:  multiweight
changeset: 5534:67da262a18ee
user:      Chris Pollard <cspollard at gmail.com>
date:      Wed Sep 28 12:26:06 2016 +0100
description:
intermediate commit for David

diffs (truncated from 223 to 50 lines):

--- a/include/Rivet/Tools/RivetYODA.hh	Mon Sep 26 17:02:38 2016 +0100
+++ b/include/Rivet/Tools/RivetYODA.hh	Wed Sep 28 12:26:06 2016 +0100
@@ -5,6 +5,8 @@
 /// @date   2009-01-30
 /// @author David Grellscheid
 /// @date   2011-07-18
+/// @author David Grellscheid
+/// @date   2016-09-27
 
 #include "Rivet/Config/RivetCommon.hh"
 
@@ -46,8 +48,85 @@
             virtual const YODA::AnalysisObject & operator*() const = 0;
 
         protected:
-            /// @todo
-            /// is this new sub event or new event? if so change name please.
+            /// @todo do we need this?
+            // virtual void reset() = 0;
+    };
+
+    /// @todo
+    /// implement scatter1dptr and scatter2dptr here
+    class Scatter1DPtr : public AnalysisObjectPtr {
+        public:
+            Scatter1DPtr() :
+                _scatter(YODA::Scatter1DPtr()) { }
+
+            Scatter1DPtr(YODA::Scatter1DPtr& p) :
+                _scatter(p) { }
+
+            bool operator!() const { return !_scatter; }
+            operator bool() const { return bool(_scatter); }
+
+            YODA::Scatter1D* operator->() { return _scatter.get(); }
+
+            YODA::Scatter1D* operator->() const { return _scatter.get(); }
+
+            YODA::Scatter1D & operator*() { return *_scatter; }
+
+            const YODA::Scatter1D & operator*() const { return *_scatter; }
+
+        protected:
+            YODA::Scatter1DPtr _scatter;
+    };
+
+    class Scatter2DPtr : public AnalysisObjectPtr {
+        public:
+            Scatter2DPtr(YODA::Scatter2DPtr& p) :
+                _scatter(p) { }