From 24660ebbffc0bb8d4058a6f6de41bc894877b4cb Mon Sep 17 00:00:00 2001
From: James Beacham <j.beacham@cern.ch>
Date: Mon, 16 Oct 2017 10:33:24 +0200
Subject: [PATCH] Revert "Revert "Merge branch '21.0-gene-trf' into '21.0'""
This reverts commit eb54b88ec5675851c7fcd756975f40454d5ff37c [formerly 278a8b658a3bce45328ae987d317d2e2bb804cab].
Former-commit-id: af7af939d5301ce3369d838ed16c03c5019d4194
---
Generators/EvgenProdTools/python/LogicalExpressionFilter.py | 3 ++-
Generators/EvtGen_i/CMakeLists.txt | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Generators/EvgenProdTools/python/LogicalExpressionFilter.py b/Generators/EvgenProdTools/python/LogicalExpressionFilter.py
index d1d202c44d220..fa7f3f12bb274 100644
--- a/Generators/EvgenProdTools/python/LogicalExpressionFilter.py
+++ b/Generators/EvgenProdTools/python/LogicalExpressionFilter.py
@@ -158,7 +158,8 @@ class LogicalExpressionFilter( PyAthena.Alg ):
def evalFilter(self, filterName):
if not self.algdict[filterName].isExecuted():
- self.algdict[filterName].sysExecute( self.getContext() )
+ self.algdict[filterName].sysExecute( )
+# self.algdict[filterName].sysExecute( self.getContext() ) # for rel. 22
self.algdict[filterName].setExecuted(True)
decision = self.algdict[filterName].filterPassed()
self.msg.verbose(filterName + " decision=" + str(decision))
diff --git a/Generators/EvtGen_i/CMakeLists.txt b/Generators/EvtGen_i/CMakeLists.txt
index e47c478b9ab9c..4346887042892 100644
--- a/Generators/EvtGen_i/CMakeLists.txt
+++ b/Generators/EvtGen_i/CMakeLists.txt
@@ -44,6 +44,7 @@ atlas_add_library( EvtGen_iLib
src/EvtPythiaEngine.cxx
src/EvtInclusiveDecay.cxx
PUBLIC_HEADERS EvtGen_i
+ DEFINITIONS -DEVTGEN_PYTHIA -DEVTGEN_PHOTOS -DEVTGEN_TAUOLA
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${PYTHIA8_INCLUDE_DIRS} ${PHOTOSPP_INCLUDE_DIRS} ${TAUOLAPP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${EVTGEN_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
--
GitLab