[yoda-svn] yoda: 3 new changesets

[YODA Mercurial]

details:   https://yoda.hepforge.org/hg/yoda/rev/64969f8d82df
branches:  multiweight
changeset: 1314:64969f8d82df
user:      Chris Pollard <cspollard at gmail.com>
date:      Tue Oct 25 15:30:13 2016 +0100
description:
adding T::Ptr and T::FillType to basic YODA classes.

details:   https://yoda.hepforge.org/hg/yoda/rev/4da51ec0e12e
branches:  multiweight
changeset: 1315:4da51ec0e12e
user:      Chris Pollard <cspollard at gmail.com>
date:      Tue Oct 25 17:34:00 2016 +0100
description:
merge from David's copy

details:   https://yoda.hepforge.org/hg/yoda/rev/bc578593cfd9
branches:  multiweight
changeset: 1316:bc578593cfd9
user:      Chris Pollard <cspollard at gmail.com>
date:      Tue Oct 25 17:43:31 2016 +0100
description:
adding 'BinType' to fillable objects.

diffs (truncated from 165 to 50 lines):

--- a/include/YODA/Counter.h	Tue Oct 25 14:53:37 2016 +0100
+++ b/include/YODA/Counter.h	Tue Oct 25 17:43:31 2016 +0100
@@ -13,6 +13,7 @@
 #include <vector>
 #include <string>
 #include <map>
+#include <tuple>
 
 namespace YODA {
 
@@ -21,6 +22,10 @@
   class Counter : public AnalysisObject {
   public:
 
+
+    typedef std::tuple<> FillType;
+    typedef std::shared_ptr<Counter> Ptr;
+
     /// @name Constructors
     //@{
 
@@ -89,6 +94,9 @@
       _dbn.fill(weight, fraction);
     }
 
+    virtual void fill(FillType, double weight=1.0, double fraction=1.0) {
+      fill(weight, fraction);
+    }
 
     /// @brief Reset the histogram.
     ///
--- a/include/YODA/Histo1D.h	Tue Oct 25 14:53:37 2016 +0100
+++ b/include/YODA/Histo1D.h	Tue Oct 25 17:43:31 2016 +0100
@@ -32,6 +32,7 @@
     typedef HistoBin1D Bin;
 
     typedef double FillType;
+    typedef FillType BinType;
     typedef std::shared_ptr<Histo1D> Ptr;
 
     /// @name Constructors
--- a/include/YODA/Histo2D.h	Tue Oct 25 14:53:37 2016 +0100
+++ b/include/YODA/Histo2D.h	Tue Oct 25 17:43:31 2016 +0100
@@ -14,6 +14,7 @@
 #include "YODA/Exceptions.h"
 
 #include <vector>
+#include <tuple>
 
 namespace YODA {