Merge pull request #44 from joequant/dev/fcalccluster

fix #43 to compile with c++17
key4hep · Sep 20, 2020 · 1ed06f7 · 1ed06f7
1 parent ddb9629
commit 1ed06f7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/packages/fcalclusterer/package.py b/packages/fcalclusterer/package.py
@@ -30,6 +30,7 @@ class Fcalclusterer(CMakePackage):
 
     # CMAKE_INSTALL_PREFIX is overwritten by the package
     patch("install.patch", when="@:1.0.1")
+    patch("random-shuffle-c17.patch", when="@:1.0.1")
 
     def cmake_args(self):
         args = []

diff --git a/packages/fcalclusterer/random-shuffle-c17.patch b/packages/fcalclusterer/random-shuffle-c17.patch
@@ -0,0 +1,21 @@
+diff --git source/BeamCalReco/src/BeamCalBkgPregen.cpp source/BeamCalReco/src/BeamCalBkgPregen.cpp
+index 80b217e..839cf13 100644
+--- a/source/BeamCalReco/src/BeamCalBkgPregen.cpp
++++ b/source/BeamCalReco/src/BeamCalBkgPregen.cpp
+@@ -29,6 +29,7 @@
+ #include <map>
+ #include <set>
+ #include <stdexcept>
++#include <random>
+
+ using std::vector;
+ using std::string;
+@@ -67,7 +67,7 @@ void BeamCalBkgPregen::init(vector<string> &bg_files, const int n_bx)
+   m_backgroundBX = new TChain("bcTree");
+
+   //mix up the files, because the random numbers are ordered to avoid repeating
+-  std::random_shuffle(bg_files.begin(), bg_files.end());
++  std::shuffle(bg_files.begin(), bg_files.end(), std::mt19937(std::random_device()()));
+
+   for (std::vector<std::string>::iterator file = bg_files.begin(); file != bg_files.end(); ++file) {
+     streamlog_out(DEBUG1) << *file << std::endl;