[yoda-svn] yoda: 2 new changesets

YODA Mercurial yoda at projects.hepforge.org
Fri Apr 27 17:15:02 BST 2018


details:   https://yoda.hepforge.org/hg/yoda/rev/9185401b19a0
branches:  release-1-7
changeset: 1448:9185401b19a0
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Apr 27 16:33:19 2018 +0100
description:
Update read/write tests

details:   https://yoda.hepforge.org/hg/yoda/rev/d8e190942aae
branches:  release-1-7
changeset: 1449:d8e190942aae
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Apr 27 17:02:57 2018 +0100
description:
Fix missing lock=false flag initialisation in Histo2D constructor from a Bins vector.

diffs (truncated from 208 to 50 lines):

--- a/ChangeLog	Thu Jan 25 23:49:44 2018 +0000
+++ b/ChangeLog	Fri Apr 27 17:02:57 2018 +0100
@@ -1,3 +1,9 @@
+2018-04-27  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Fix missing lock=false flag initialisation in Histo2D constructor from a Bins vector.
+
+	* Improve axis locking error messages.
+
 2017-12-21  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Version 1.7.0 release
--- a/include/YODA/Axis1D.h	Thu Jan 25 23:49:44 2018 +0000
+++ b/include/YODA/Axis1D.h	Fri Apr 27 17:02:57 2018 +0100
@@ -526,7 +526,7 @@
     void _updateAxis(Bins& bins) {
       // Ensure that axis is not locked
       if (_locked) {
-        throw LockError("Attempting to update a locked axis");
+        throw LockError("Attempting to update a locked 1D axis");
       }
 
       // Get the new cuts and indexes (throws if overlaps), and set them on the searcher
--- a/include/YODA/Axis2D.h	Thu Jan 25 23:49:44 2018 +0000
+++ b/include/YODA/Axis2D.h	Fri Apr 27 17:02:57 2018 +0100
@@ -72,7 +72,9 @@
     }
 
     /// Constructor accepting a list of bins
-    Axis2D(const Bins& bins) {
+    Axis2D(const Bins& bins)
+      : _locked(false)
+    {
       addBins(bins);
       reset();
     }
@@ -490,7 +492,7 @@
     void _checkUnlocked(void) {
       // Ensure that axis is not locked
       if (_locked)
-        throw LockError("Attempting to update a locked axis");
+        throw LockError("Attempting to update a locked 2D axis");
     }
 
 
--- a/src/Histo2D.cc	Thu Jan 25 23:49:44 2018 +0000
+++ b/src/Histo2D.cc	Fri Apr 27 17:02:57 2018 +0100
@@ -13,6 +13,40 @@
 namespace YODA {
 


More information about the yoda-svn mailing list