[yoda-svn] yoda: 7 new changesets

[YODA Mercurial]

details:   https://yoda.hepforge.org/hg/yoda/rev/fdb53c30e9a4
branches:  
changeset: 1248:fdb53c30e9a4
user:      Andy Buckley <andy at insectnation.org>
date:      Sun Apr 17 12:27:03 2016 +0100
description:
Remove C++11 for-loops from public headers, to not force C++11 on all client code

details:   https://yoda.hepforge.org/hg/yoda/rev/1c829c07c16b
branches:  
changeset: 1249:1c829c07c16b
user:      Andy Buckley <andy at insectnation.org>
date:      Sun Apr 17 17:07:30 2016 +0100
description:
Add a missing 'static' keyword and tidying up

details:   https://yoda.hepforge.org/hg/yoda/rev/0ef1d966ef37
branches:  
changeset: 1250:0ef1d966ef37
user:      Andy Buckley <andy at insectnation.org>
date:      Sun Apr 17 20:49:43 2016 +0100
description:
Revert attempts to keep C++11 out of the API -- with the public-facing SFINAE stuff *needing* to be in headers, we don't actually have a choice about that.

details:   https://yoda.hepforge.org/hg/yoda/rev/893d58af6a45
branches:  
changeset: 1251:893d58af6a45
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Apr 18 21:08:47 2016 +0100
description:
Trivialities

details:   https://yoda.hepforge.org/hg/yoda/rev/e49873350ade
branches:  
changeset: 1252:e49873350ade
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Apr 18 21:12:19 2016 +0100
description:
Stop overwriting tests/test.yoda

details:   https://yoda.hepforge.org/hg/yoda/rev/87bd73a29bf3
branches:  
changeset: 1253:87bd73a29bf3
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Apr 18 21:12:33 2016 +0100
description:
Removed tag yoda-1.6.0beta1

details:   https://yoda.hepforge.org/hg/yoda/rev/5f4a15b7f91b
branches:  
changeset: 1254:5f4a15b7f91b
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Apr 18 21:12:54 2016 +0100
description:
Merge

diffs (truncated from 2020 to 50 lines):

--- a/.hgtags	Sat Apr 16 20:19:52 2016 +0100
+++ b/.hgtags	Mon Apr 18 21:12:54 2016 +0100
@@ -37,3 +37,5 @@
 0000000000000000000000000000000000000000 yoda-1.6.0beta1
 0000000000000000000000000000000000000000 yoda-1.6.0beta1
 a1fbfd42fa562688b9843ab9a26f34b81bbe93e2 yoda-1.6.0beta1
+a1fbfd42fa562688b9843ab9a26f34b81bbe93e2 yoda-1.6.0beta1
+0000000000000000000000000000000000000000 yoda-1.6.0beta1
--- a/ChangeLog	Sat Apr 16 20:19:52 2016 +0100
+++ b/ChangeLog	Mon Apr 18 21:12:54 2016 +0100
@@ -18,7 +18,7 @@
 
 2016-04-08  Andy Buckley  <andy.buckley at cern.ch>
 
-	* Add a --guess-prefix flag to rivet-config, cf. fastjet-config.
+	* Add a --guess-prefix flag to yoda-config, cf. fastjet-config.
 
 2015-12-20  Andy Buckley  <andy.buckley at cern.ch>
 
--- a/include/YODA/AnalysisObject.h	Sat Apr 16 20:19:52 2016 +0100
+++ b/include/YODA/AnalysisObject.h	Mon Apr 18 21:12:54 2016 +0100
@@ -84,7 +84,7 @@
     //@{
 
     /// Get all the annotation names
-    const std::vector<std::string> annotations() const {
+    std::vector<std::string> annotations() const {
       std::vector<std::string> rtn;
       rtn.reserve(_annotations.size());
       for (const Annotations::value_type& kv : _annotations) rtn.push_back(kv.first);
--- a/include/YODA/Axis2D.h	Sat Apr 16 20:19:52 2016 +0100
+++ b/include/YODA/Axis2D.h	Mon Apr 18 21:12:54 2016 +0100
@@ -157,11 +157,21 @@
     /// their respective factors.
     void scaleXY(double sx, double sy) {
       _dbn.scaleXY(sx, sy);
-      for (Outflow& outflow : _outflows)
-        for (DBN& dbn : outflow)
+      /// @todo Reinstate when C++11 allowed in API
+      // for (Outflow& outflow : _outflows)
+      //   for (DBN& dbn : outflow)
+      //     dbn.scaleXY(sx, sy);
+      for (size_t io = 0; io < _outflows.size(); ++io) {
+        Outflow& outflow = _outflows[io];
+        for (size_t id = 0; id < outflow.size(); ++id) {
+          DBN& dbn = outflow[id];
           dbn.scaleXY(sx, sy);
-      for (Bin& bin : _bins)
-        bin.scaleXY(sx, sy);
+        }