[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/92898132a6a4
branches:  multiweight
changeset: 5964:92898132a6a4
user:      Chris Pollard <cspollard at gmail.com>
date:      Mon Jun 26 09:05:11 2017 +0100
description:
compiling again

details:   https://rivet.hepforge.org/hg/rivet/rev/6375cc481dd0
branches:  multi-scatters
changeset: 5965:6375cc481dd0
user:      Chris Pollard <cspollard at gmail.com>
date:      Fri Jul 28 15:19:23 2017 +0100
description:
making scatters multiweighted

diffs (truncated from 470 to 50 lines):

--- a/include/Rivet/AnalysisHandler.hh	Mon Dec 12 15:51:28 2016 +0000
+++ b/include/Rivet/AnalysisHandler.hh	Fri Jul 28 15:19:23 2017 +0100
@@ -65,7 +65,7 @@
     /// number of events. Should only really be used by external steering code
     /// or analyses in the finalize phase.
     double sumOfWeights() const {
-        return _eventCounter._persistent[0]->sumW();
+        return _eventCounter->sumW();
     }
 
     size_t numWeights() const {
--- a/include/Rivet/Tools/RivetYODA.hh	Mon Dec 12 15:51:28 2016 +0000
+++ b/include/Rivet/Tools/RivetYODA.hh	Fri Jul 28 15:19:23 2017 +0100
@@ -24,9 +24,9 @@
 
 namespace YODA {
     typedef std::shared_ptr<YODA::AnalysisObject> AnalysisObjectPtr;
-    typedef std::shared_ptr<YODA::Scatter1D> Scatter1DPtr;
-    typedef std::shared_ptr<YODA::Scatter2D> Scatter2DPtr;
-    typedef std::shared_ptr<YODA::Scatter3D> Scatter3DPtr;
+    // typedef std::shared_ptr<YODA::Scatter1D> Scatter1DPtr;
+    // typedef std::shared_ptr<YODA::Scatter2D> Scatter2DPtr;
+    // typedef std::shared_ptr<YODA::Scatter3D> Scatter3DPtr;
 }
 
 
@@ -42,6 +42,10 @@
             virtual YODA::AnalysisObject* operator->() const = 0;
             virtual const YODA::AnalysisObject & operator*() const = 0;
 
+            /// @todo 
+            /// rename to setActive(Idx)?
+            virtual void setActiveWeightIdx(unsigned int iWeight) = 0;
+
             bool operator ==(const AnalysisObjectPtr& p) { return (this == &p); }
 
         protected:
@@ -52,74 +56,79 @@
     /// @todo
     /// implement scatter1dptr and scatter2dptr here
     /// these need to be multi-weighted eventually.
+    /*
     class Scatter1DPtr : public AnalysisObjectPtr {
         public:
-            Scatter1DPtr() :
-                _scatter(YODA::Scatter1DPtr()) { }
+            Scatter1DPtr() : _persistent() { }
 
-            Scatter1DPtr(const YODA::Scatter1D& p) :
-                _scatter(make_shared<YODA::Scatter1D>(p)) { }