From b5d25b08b15f5bee1a2fdd88386b7b5f2397e4f9 Mon Sep 17 00:00:00 2001
From: Catrin Bernius <Catrin.Bernius@cern.ch>
Date: Tue, 26 Mar 2019 16:55:05 +0100
Subject: [PATCH] fixing a couple of things
---
.../python/HLTMenuConfig/Egamma/ElectronDef.py | 8 ++++++--
.../TriggerMenuMT/scripts/generateL1MenuMT.sh | 5 ++---
.../TriggerMenuMT/scripts/generateLVL1MenuMT.py | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
index 8f4803da933..2f2755fdce1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
@@ -44,7 +44,11 @@ class ElectronChainConfiguration(ChainConfigurationBase):
# --------------------
# define here the names of the steps and obtain the chainStep configuration
# --------------------
- if 'etcut' in self.chainName:
+ if 'etcut1step' in self.chainPart['addInfo']:
+ myStepNames += ["Step1_etcut"]
+ for step in myStepNames:
+ chainSteps += [self.getEtCutStep(step)]
+ elif 'etcut' in self.chainPart['addInfo']:
myStepNames += ["Step1_etcut"]
myStepNames += ["Step2_etcut"]
for step in myStepNames:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuMT.sh b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuMT.sh
index 73f39133d54..7aa74cb295e 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuMT.sh
+++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuMT.sh
@@ -47,7 +47,6 @@ fi
# Temporary run directroy and cleanup traps in case of termination
rundir=`mktemp -t -d tmxml.${menu}.XXXXXXXXXX`
-echo "Rundirectory is $rundir"
TRAPINT() {
rm -rf $rundir
@@ -67,8 +66,8 @@ logfilelvl1=lvl1_${menu}.log
cd $rundir
-generateLVL1MenuMT.py $menu 2>&1 | tee $logfilelvl1
-generateL1TopoMenuMT.py $menu 2>&1 | tee $logfiletopo
+generateLVL1MenuMT.py $menu 2>&1 >> $logfilelvl1
+generateL1TopoMenuMT.py $menu 2>&1 >> $logfiletopo
cp L1Topoconfig_*.xml ${dest}
cp LVL1config_*.xml ${dest}
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateLVL1MenuMT.py b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateLVL1MenuMT.py
index 3a190790454..efa5ab258bb 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateLVL1MenuMT.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateLVL1MenuMT.py
@@ -36,7 +36,7 @@ def generateL1Menu(menu, doFTK="False",useTopoMenu="MATCH"):
if checkResult == 0:
log.info("XML file %s is conform with LVL1config.dtd" % outfilename)
else:
- log.error("the XML does not follow the document type definition LVL1config.dtd")
+ log.error("The XML does not follow the document type definition LVL1config.dtd")
return tpcl1.menu
--
GitLab