From edd11972c4873583495f58e08693bd0e79f7480c Mon Sep 17 00:00:00 2001 From: Giancarlo Panizzo Date: Wed, 8 Jul 2020 19:34:39 +0000 Subject: [PATCH] update Pythia8_i.cxx: fix redefinition of PYTHIA8_CONVERSION --- Generators/Pythia8_i/src/Pythia8_i.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Generators/Pythia8_i/src/Pythia8_i.cxx b/Generators/Pythia8_i/src/Pythia8_i.cxx index fc1afb074c0..f3e7869bae1 100644 --- a/Generators/Pythia8_i/src/Pythia8_i.cxx +++ b/Generators/Pythia8_i/src/Pythia8_i.cxx @@ -36,11 +36,11 @@ using boost::assign::operator+=; #undef PYTHIA8_NWEIGHTS #undef PYTHIA8_WEIGHT #undef PYTHIA8_WLABEL - #undef PYTHIA8_CONVERSION #define PYTHIA8_NWEIGHTS nVariationGroups #define PYTHIA8_WEIGHT getGroupWeight #define PYTHIA8_WLABEL getGroupName #if PYTHIA_VERSION_INTEGER < 8244 + #undef PYTHIA8_CONVERSION #define PYTHIA8_CONVERSION 1.0e9 #endif #endif -- GitLab