From eb54b88ec5675851c7fcd756975f40454d5ff37c Mon Sep 17 00:00:00 2001
From: James Beacham <j.beacham@cern.ch>
Date: Sat, 14 Oct 2017 21:18:30 +0200
Subject: [PATCH] Revert "Merge branch '21.0-gene-trf' into '21.0'"
This reverts commit d397ef149af8a1630c9d4f10085d783ba075a296 [formerly 66157e9aa8d2f4eb5063acf04c48b9eac055f4e1], reversing
changes made to bb438e539fefc3382fc4191c5d9e9f1cc34ffdd9 [formerly 0752891bcdea66a09df26b26c87735deae759bd1].
Former-commit-id: 278a8b658a3bce45328ae987d317d2e2bb804cab
---
Generators/EvgenProdTools/python/LogicalExpressionFilter.py | 3 +--
Generators/EvtGen_i/CMakeLists.txt | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/Generators/EvgenProdTools/python/LogicalExpressionFilter.py b/Generators/EvgenProdTools/python/LogicalExpressionFilter.py
index fa7f3f12bb2..d1d202c44d2 100644
--- a/Generators/EvgenProdTools/python/LogicalExpressionFilter.py
+++ b/Generators/EvgenProdTools/python/LogicalExpressionFilter.py
@@ -158,8 +158,7 @@ class LogicalExpressionFilter( PyAthena.Alg ):
def evalFilter(self, filterName):
if not self.algdict[filterName].isExecuted():
- self.algdict[filterName].sysExecute( )
-# self.algdict[filterName].sysExecute( self.getContext() ) # for rel. 22
+ self.algdict[filterName].sysExecute( self.getContext() )
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 43468870428..e47c478b9ab 100644
--- a/Generators/EvtGen_i/CMakeLists.txt
+++ b/Generators/EvtGen_i/CMakeLists.txt
@@ -44,7 +44,6 @@ 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