From 399e98d49c3f23297ee9386b0d602b333755a60e Mon Sep 17 00:00:00 2001
From: Tamara Vazquez Schroeder <tvazquez@cern.ch>
Date: Sat, 16 Dec 2017 11:56:15 +0100
Subject: [PATCH] fix double declaration is ISF and trigger error
---
.../ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx | 7 -------
Trigger/TriggerCommon/TriggerMenu/CMakeLists.txt | 5 -----
.../TriggerCommon/TriggerMenu/python/l1menu/ItemDefRun1.py | 4 +---
3 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx
index cc0bb7f8a4f8..0142ec4d60de 100755
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/ISF_HitAnalysis.cxx
@@ -1003,13 +1003,6 @@ StatusCode ISF_HitAnalysis::execute()
float phi_MID;
- std::vector<float> eta_vec_MID;
- std::vector<float> phi_vec_MID;
- std::vector<float> r_vec_MID;
- std::vector<float> z_vec_MID;
-
- float phi_MID;
-
for(int sample=CaloCell_ID_FCS::FirstSample;sample<CaloCell_ID_FCS::MaxSample;++sample)
{
ATH_MSG_DEBUG("sample "<<sample);
diff --git a/Trigger/TriggerCommon/TriggerMenu/CMakeLists.txt b/Trigger/TriggerCommon/TriggerMenu/CMakeLists.txt
index 9134646a8bf3..0b37b2de683c 100644
--- a/Trigger/TriggerCommon/TriggerMenu/CMakeLists.txt
+++ b/Trigger/TriggerCommon/TriggerMenu/CMakeLists.txt
@@ -20,11 +20,6 @@ atlas_add_test( generateMenu SCRIPT scripts/testMenu.sh
POST_EXEC_SCRIPT "check_log.pl --config checklogTriggerTest.conf generateMenu.log"
)
-atlas_add_test ( pyflakesMenu
- SCRIPT scripts/pyflakesMenu.sh
- ENVIRONMENT "PYPATH=${CMAKE_CURRENT_SOURCE_DIR}/python ${CMAKE_CURRENT_SOURCE_DIR}/share ${CMAKE_CURRENT_SOURCE_DIR}/scripts"
-)
-
atlas_add_test ( checkL1Menu SCRIPT scripts/checkL1Menu.sh
POST_EXEC_SCRIPT "check_log.pl --config checklogTriggerTest.conf checkL1Menu.log"
)
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDefRun1.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDefRun1.py
index 4b4a70c7e0dc..111df4ac9fe7 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDefRun1.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDefRun1.py
@@ -629,9 +629,7 @@ class ItemDef:
LVL1MenuItem('L1_ZDC_A_BGRP7' ).setLogic(ZDC_A.x(1)&bgrp7cond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_ZDC_C_BGRP7' ).setLogic(ZDC_C.x(1)&bgrp7cond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_ZDC_MBTS_1' ).setLogic((ZDC_A.x(1)|ZDC_C.x(1))&( MBTS_A.x(1)| MBTS_C.x(1)) & physcond).setTriggerType(TT.minb) # noqa: F821
- LVL1MenuItem('L1_ZDC_MBTS_2' ).setLogic((ZDC_A.x(1)|ZDC_C.x(1))&\ # noqa: F821
- ( MBTS_A.x(2)| MBTS_C.x(2)| MBTS_A.x(1))\ # noqa: F821
- &( MBTS_A.x(2)| MBTS_C.x(2)| MBTS_C.x(1)) & physcond).setTriggerType(TT.minb) # noqa: F821
+ LVL1MenuItem('L1_ZDC_MBTS_2' ).setLogic((ZDC_A.x(1)|ZDC_C.x(1))&( MBTS_A.x(2)| MBTS_C.x(2)| MBTS_A.x(1))&( MBTS_A.x(2)| MBTS_C.x(2)| MBTS_C.x(1)) & physcond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_ZDC_MBTS_1_1' ).setLogic((ZDC_A.x(1)|ZDC_C.x(1))&( MBTS_A.x(1)& MBTS_C.x(1)) & physcond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_ZDC_MBTS_2_2' ).setLogic((ZDC_A.x(1)|ZDC_C.x(1))&( MBTS_A.x(2)& MBTS_C.x(2)) & physcond).setTriggerType(TT.minb) # noqa: F821
--
GitLab