[yoda-svn] yoda: 4 new changesets

[YODA Mercurial]

details:   https://yoda.hepforge.org/hg/yoda/rev/c9971f4438d2
branches:  multiweight
changeset: 1306:c9971f4438d2
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Thu Sep 29 12:34:47 2016 +0100
description:
Introduce fractional fills.

The main difference between weight and fraction is the filling of sumw2,
which has the fraction applied linearly, i.e. sumw2 += frac * w * w

The change is invisible to existing code, fraction is assumed to be 1 if not specified.

details:   https://yoda.hepforge.org/hg/yoda/rev/a367e8915e21
branches:  multiweight
changeset: 1307:a367e8915e21
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Fri Sep 30 12:16:59 2016 +0100
description:
hgignore fix

details:   https://yoda.hepforge.org/hg/yoda/rev/1368d222b377
branches:  multiweight
changeset: 1308:1368d222b377
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Fri Sep 30 12:41:50 2016 +0100
description:
Make fill() and fillBin() virtual on Counter, Histo{1,2}D and Profile{1,2}D classes.

details:   https://yoda.hepforge.org/hg/yoda/rev/d529066219eb
branches:  multiweight
changeset: 1309:d529066219eb
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Fri Sep 30 13:10:59 2016 +0100
description:
Change numEntries to a double to hold fractional fills.

diffs (truncated from 1240 to 50 lines):

--- a/.hgignore	Tue Sep 27 18:01:33 2016 +0100
+++ b/.hgignore	Fri Sep 30 13:10:59 2016 +0100
@@ -66,6 +66,7 @@
 ^tests/testsortedvector$
 ^tests/testweights$
 ^tests/testbinsearcher$
+^tests/testannotations$
 ^plots$
 ^a.out$
 ^testplotting$
--- a/include/YODA/Bin.h	Tue Sep 27 18:01:33 2016 +0100
+++ b/include/YODA/Bin.h	Fri Sep 30 13:10:59 2016 +0100
@@ -39,8 +39,8 @@
     /// @name Fill statistics
     //@{
 
-    /// The number of entries
-    virtual unsigned long numEntries() const = 0;
+    /// The number of entries (fractional fills are possible)
+    virtual double numEntries() const = 0;
 
     /// The effective number of entries
     virtual double effNumEntries() const = 0;
--- a/include/YODA/Bin1D.h	Tue Sep 27 18:01:33 2016 +0100
+++ b/include/YODA/Bin1D.h	Fri Sep 30 13:10:59 2016 +0100
@@ -205,7 +205,7 @@
 
 
     /// The number of entries
-    unsigned long numEntries() const {
+    double numEntries() const {
       return _dbn.numEntries();
     }
 
--- a/include/YODA/Bin2D.h	Tue Sep 27 18:01:33 2016 +0100
+++ b/include/YODA/Bin2D.h	Fri Sep 30 13:10:59 2016 +0100
@@ -289,7 +289,7 @@
     }
 
     /// The number of entries
-    unsigned long numEntries() const {
+    double numEntries() const {
       return _dbn.numEntries();
     }
 
--- a/include/YODA/Counter.h	Tue Sep 27 18:01:33 2016 +0100
+++ b/include/YODA/Counter.h	Fri Sep 30 13:10:59 2016 +0100
@@ -85,8 +85,8 @@
     //@{