From 4c393605b936329f2082b6a0ede0ff92f884af98 Mon Sep 17 00:00:00 2001 From: Joerg Stelzer <joerg.stelzer@cern.ch> Date: Fri, 6 Dec 2019 10:28:17 +0000 Subject: [PATCH] L1Calo tools use LVL1ConfigSvc explicitly This is needed because we don't configure the TrigConfigSvc any longer --- .../TrigT1CaloTools/L1CPCMXTools.h | 6 +- .../TrigT1CaloTools/L1CPMTools.h | 4 +- .../TrigT1CaloTools/L1EmTauTools.h | 6 +- .../TrigT1CaloTools/L1EnergyCMXTools.h | 7 +- .../TrigT1CaloTools/L1EtTools.h | 6 +- .../TrigT1CaloTools/L1JEMJetTools.h | 6 +- .../TrigT1CaloTools/L1JEPEtSumsTools.h | 6 +- .../TrigT1CaloTools/L1JEPHitsTools.h | 6 +- .../TrigT1CaloTools/L1JetCMXTools.h | 7 +- .../TrigT1CaloTools/L1JetEtTools.h | 6 +- .../TrigT1CaloTools/L1JetTools.h | 6 +- .../TrigT1CaloTools/src/L1CPCMXTools.cxx | 7 +- .../TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx | 2 +- .../TrigT1CaloTools/src/L1EmTauTools.cxx | 4 +- .../TrigT1CaloTools/src/L1EnergyCMXTools.cxx | 7 +- .../TrigT1/TrigT1CaloTools/src/L1EtTools.cxx | 6 +- .../TrigT1CaloTools/src/L1JEMJetTools.cxx | 4 +- .../TrigT1CaloTools/src/L1JEPEtSumsTools.cxx | 4 +- .../TrigT1CaloTools/src/L1JEPHitsTools.cxx | 4 +- .../TrigT1CaloTools/src/L1JetCMXTools.cxx | 4 +- .../TrigT1CaloTools/src/L1JetEtTools.cxx | 4 +- .../TrigT1/TrigT1CaloTools/src/L1JetTools.cxx | 4 +- .../src/L1TriggerTowerTool.cxx | 2 +- .../TrigT1CaloUtils/CPAlgorithm.h | 8 +- .../TrigT1CaloUtils/CPMTobAlgorithm.h | 6 +- .../TrigT1CaloUtils/JEMJetAlgorithm.h | 8 +- .../TrigT1CaloUtils/JetAlgorithm.h | 8 +- .../TrigT1CaloUtils/SystemEnergy.h | 8 +- .../TrigT1CaloUtils/src/CPAlgorithm.cxx | 4 +- .../TrigT1CaloUtils/src/CPMTobAlgorithm.cxx | 4 +- .../TrigT1CaloUtils/src/JEMJetAlgorithm.cxx | 4 +- .../TrigT1CaloUtils/src/JetAlgorithm.cxx | 4 +- .../TrigT1CaloUtils/src/SystemEnergy.cxx | 4 +- .../share/q221_RDOtoRDOTrig_mt1_build.ref | 94 +++++++++---------- .../BStoESD_Tier0_HLTConfig_jobOptions.py | 8 ++ 35 files changed, 139 insertions(+), 139 deletions(-) diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.h index 2cbbc584315..3ed2bf9e1f9 100644 --- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.h +++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ @@ -17,7 +17,7 @@ #include "xAODTrigL1Calo/CMXCPHitsContainer.h" namespace TrigConf { -class ITrigConfigSvc; +class ILVL1ConfigSvc; } namespace LVL1 { @@ -115,7 +115,7 @@ private: uint8_t peak) const; /** Trigger configuration service */ - ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; + ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; /** Number of CP crates */ int m_crates; diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTools.h index 9ba991e2dd3..284e77b36b4 100644 --- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTools.h +++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTools.h @@ -18,7 +18,7 @@ #include "TrigT1CaloUtils/CPMTobAlgorithm.h" #include "TrigT1CaloEvent/CPMTobRoI.h" #include "TrigT1Interfaces/CPRoIDecoder.h" -#include "TrigConfInterfaces/ITrigConfigSvc.h" +#include "TrigConfInterfaces/ILVL1ConfigSvc.h" class AtlasDetectorID; class Identifier; @@ -104,7 +104,7 @@ namespace LVL1 private: /** pointer to LVL1ConfigSvc */ - ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; + ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; /** member variables for algorithm properties: */ diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EmTauTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EmTauTools.h index b71ac237cb0..654eed5e537 100755 --- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EmTauTools.h +++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EmTauTools.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// // L1EmTauTools.h, @@ -20,7 +20,7 @@ #include "TrigT1CaloUtils/TriggerTowerKey.h" #include "TrigT1CaloUtils/CPAlgorithm.h" #include "TrigT1Interfaces/CPRoIDecoder.h" -#include "TrigConfInterfaces/ITrigConfigSvc.h" +#include "TrigConfInterfaces/ILVL1ConfigSvc.h" class AtlasDetectorID; class Identifier; @@ -92,7 +92,7 @@ namespace LVL1 private: /** pointer to LVL1ConfigSvc */ - ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; + ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; /** member variables for algorithm properties: */ diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EnergyCMXTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EnergyCMXTools.h index 14fd8ec4921..b6ff4766379 100644 --- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EnergyCMXTools.h +++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EnergyCMXTools.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************** @@ -17,8 +17,7 @@ #include "GaudiKernel/ServiceHandle.h" #include "GaudiKernel/ToolHandle.h" #include "AthContainers/DataVector.h" -//#include "TrigConfigSvc/ITrigConfigSvc.h" -#include "TrigConfInterfaces/ITrigConfigSvc.h" +#include "TrigConfInterfaces/ILVL1ConfigSvc.h" #include "TrigT1CaloToolInterfaces/IL1EtTools.h" #include "TrigT1CaloToolInterfaces/IL1EnergyCMXTools.h" #include "TrigT1CaloToolInterfaces/IL1JetElementTools.h" @@ -118,7 +117,7 @@ class L1EnergyCMXTools : virtual public IL1EnergyCMXTools, public AthAlgTool void dumpCrateEnergies(const std::string& msg, const MultiSliceCrateEnergy& crates) const; /** trigger configuration service */ - ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; + ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; /** Tool for JetElement map */ ToolHandle<LVL1::IL1JetElementTools> m_jeTool; /** Tool for energy sums */ diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EtTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EtTools.h index 996408cedb7..e4695122bd5 100755 --- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EtTools.h +++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EtTools.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// // L1EtTools.h, @@ -20,7 +20,7 @@ #include "TrigT1CaloUtils/CrateEnergy.h" #include "TrigT1CaloUtils/SystemEnergy.h" #include "TrigT1CaloEvent/EnergyCMXData.h" -#include "TrigConfInterfaces/ITrigConfigSvc.h" +#include "TrigConfInterfaces/ILVL1ConfigSvc.h" namespace LVL1 { @@ -106,7 +106,7 @@ namespace LVL1 std::map<int, int>* m_TEMasks; /** pointer to LVL1ConfigSvc */ - ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; + ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; }; } // end of namespace diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEMJetTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEMJetTools.h index 38d9efadd64..e11fbd76238 100644 --- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEMJetTools.h +++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEMJetTools.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// // L1JEMJetTools.h, @@ -19,7 +19,7 @@ #include "TrigT1CaloUtils/JetInputKey.h" #include "TrigT1CaloUtils/JEMJetAlgorithm.h" #include "TrigT1Interfaces/JEPRoIDecoder.h" -#include "TrigConfInterfaces/ITrigConfigSvc.h" +#include "TrigConfInterfaces/ILVL1ConfigSvc.h" #include "xAODTrigL1Calo/JetElementContainer.h" @@ -91,7 +91,7 @@ namespace LVL1 private: /** pointer to LVL1ConfigSvc */ - ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; + ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; /** Utility for decoding RoI words */ JEPRoIDecoder m_conv; diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPEtSumsTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPEtSumsTools.h index 91737b3621e..1c7951f52f6 100644 --- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPEtSumsTools.h +++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPEtSumsTools.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// // L1JEPEtSumsTools.h, @@ -19,7 +19,7 @@ #include "AthenaBaseComps/AthAlgTool.h" #include "GaudiKernel/ToolHandle.h" #include "AthContainers/DataVector.h" -#include "TrigConfInterfaces/ITrigConfigSvc.h" +#include "TrigConfInterfaces/ILVL1ConfigSvc.h" #include "TrigT1CaloToolInterfaces/IL1EtTools.h" #include "TrigT1CaloToolInterfaces/IL1JEPEtSumsTools.h" #include "TrigT1CaloToolInterfaces/IL1JetElementTools.h" @@ -116,7 +116,7 @@ class L1JEPEtSumsTools : virtual public IL1JEPEtSumsTools, public AthAlgTool DataVector<CMMEtSums>* cmmEtSumsVec, int peak) const; /** trigger configuration service */ - ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; + ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; /** Tool for JetElement map */ ToolHandle<LVL1::IL1JetElementTools> m_jeTool; /** Tool for energy sums */ diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPHitsTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPHitsTools.h index a83ea22d819..5dc918b4976 100644 --- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPHitsTools.h +++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPHitsTools.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// // L1JEPHitsTools.h, @@ -18,7 +18,7 @@ #include "AthenaBaseComps/AthAlgTool.h" #include "AthContainers/DataVector.h" -#include "TrigConfInterfaces/ITrigConfigSvc.h" +#include "TrigConfInterfaces/ILVL1ConfigSvc.h" #include "TrigT1CaloToolInterfaces/IL1JEPHitsTools.h" @@ -117,7 +117,7 @@ class L1JEPHitsTools : virtual public IL1JEPHitsTools, public AthAlgTool int crate, int dataId, int peak) const; /** trigger configuration service */ - ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; + ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; bool m_debug; diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetCMXTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetCMXTools.h index 49ac4884980..f16ca794dc7 100644 --- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetCMXTools.h +++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetCMXTools.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ @@ -12,8 +12,7 @@ #include "AthenaBaseComps/AthAlgTool.h" #include "GaudiKernel/ServiceHandle.h" #include "AthContainers/DataVector.h" -//#include "TrigConfigSvc/ITrigConfigSvc.h" -#include "TrigConfInterfaces/ITrigConfigSvc.h" +#include "TrigConfInterfaces/ILVL1ConfigSvc.h" #include "TrigT1CaloToolInterfaces/IL1JetCMXTools.h" namespace LVL1 { @@ -102,7 +101,7 @@ class L1JetCMXTools : virtual public IL1JetCMXTools, public AthAlgTool { int crate, int source, int peak) const; /** Trigger configuration service */ - ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; + ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; /** Number of crates */ int m_crates; /** Number of JEM modules per crate */ diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetEtTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetEtTools.h index 8d98a000472..40ae340ef95 100644 --- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetEtTools.h +++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetEtTools.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// // L1JetEtTools.h, @@ -15,7 +15,7 @@ #include "AthenaBaseComps/AthAlgTool.h" #include "TrigT1CaloToolInterfaces/IL1JetEtTools.h" -#include "TrigConfInterfaces/ITrigConfigSvc.h" +#include "TrigConfInterfaces/ILVL1ConfigSvc.h" namespace LVL1 { @@ -63,7 +63,7 @@ namespace LVL1 private: /** pointer to LVL1ConfigSvc */ - ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; + ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; }; } // end of namespace diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetTools.h index 5066a207770..7a4a26cff75 100755 --- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetTools.h +++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetTools.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// // L1JetTools.h, @@ -18,7 +18,7 @@ #include "TrigT1CaloUtils/JetInputKey.h" #include "TrigT1CaloUtils/JetAlgorithm.h" #include "TrigT1Interfaces/JEPRoIDecoder.h" -#include "TrigConfInterfaces/ITrigConfigSvc.h" +#include "TrigConfInterfaces/ILVL1ConfigSvc.h" class AtlasDetectorID; class Identifier; @@ -79,7 +79,7 @@ namespace LVL1 private: /** pointer to LVL1ConfigSvc */ - ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; + ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; /** Utility for decoding RoI words */ JEPRoIDecoder m_conv; diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.cxx index bba5d192b85..93a650c093a 100644 --- a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.cxx +++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ #include <map> @@ -7,7 +7,6 @@ #include <numeric> #include <utility> // Temporary -#include "TrigConfInterfaces/ITrigConfigSvc.h" #include "TrigConfL1Data/CTPConfig.h" #include "TrigConfL1Data/ClusterThresholdValue.h" #include "TrigConfL1Data/L1DataDef.h" @@ -32,11 +31,11 @@ namespace LVL1 { L1CPCMXTools::L1CPCMXTools(const std::string &type, const std::string &name, const IInterface *parent) : AthAlgTool(type, name, parent), - m_configSvc("TrigConf::TrigConfigSvc/TrigConfigSvc", name), m_crates(4), + m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", name), m_crates(4), m_modules(14), m_maxTobs(5), m_sysCrate(3), m_debug(false) { declareInterface<IL1CPCMXTools>(this); - declareProperty("TrigConfigSvc", m_configSvc, "Trigger Config Service"); + declareProperty("LVL1ConfigSvc", m_configSvc, "Trigger Config Service"); } /** Destructor */ diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx index 12b13cf2574..e5cd87fa05e 100644 --- a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx +++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx @@ -22,7 +22,7 @@ L1CPMTools::L1CPMTools(const std::string& t, const IInterface* p ) : AthAlgTool(t,n,p), - m_configSvc("TrigConf::TrigConfigSvc/TrigConfigSvc", n), + m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", n), m_RoI(0) { declareInterface<IL1CPMTools>(this); diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx index 4366d30c083..92a72508505 100755 --- a/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx +++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// // L1EmTauTools.cxx, @@ -20,7 +20,7 @@ L1EmTauTools::L1EmTauTools(const std::string& t, const IInterface* p ) : AthAlgTool(t,n,p), - m_configSvc("TrigConf::TrigConfigSvc/TrigConfigSvc", n), + m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", n), m_RoI(0) { declareInterface<IL1EmTauTools>(this); diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx index d22ca565621..e1f51a6b65c 100644 --- a/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx +++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ #include <map> @@ -27,7 +27,7 @@ L1EnergyCMXTools::L1EnergyCMXTools(const std::string &type, const std::string &name, const IInterface *parent) : AthAlgTool(type, name, parent), - m_configSvc("TrigConf::TrigConfigSvc/TrigConfigSvc", name), + m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", name), m_jeTool("LVL1::L1JetElementTools/L1JetElementTools"), m_etTool("LVL1::L1EtTools/L1EtTools") { @@ -80,9 +80,6 @@ StatusCode L1EnergyCMXTools::initialize() return sc; } - findRestrictedEta(m_maskXE, m_maskTE); - ATH_MSG_DEBUG("Restricted eta masks: XE=" << MSG::hex << m_maskXE << ", TE=" << m_maskTE << MSG::dec); - ATH_MSG_DEBUG("Initialization completed"); return sc; diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx index f454db34235..30b96d83c88 100755 --- a/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx +++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// // L1EtTools.cxx, @@ -22,7 +22,7 @@ L1EtTools::L1EtTools(const std::string& t, : AthAlgTool(t,n,p), m_TEMasks(0), - m_configSvc("TrigConf::TrigConfigSvc/TrigConfigSvc", n) + m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", n) { declareInterface<IL1EtTools>(this); @@ -54,9 +54,7 @@ StatusCode L1EtTools::initialize() if ( sc.isFailure() ) { ATH_MSG_ERROR( "Couldn't connect to " << m_configSvc.typeAndName() ); } - /** Fill map of JE masked out of TE trigger */ - ATH_MSG_INFO( "Initialization completed" ); return sc; diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.cxx index 5f6bb9b753e..e5579fa46b2 100644 --- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.cxx +++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// // L1JEMJetTools.cxx, @@ -23,7 +23,7 @@ L1JEMJetTools::L1JEMJetTools(const std::string& t, const IInterface* p ) : AthAlgTool(t,n,p), - m_configSvc("TrigConf::TrigConfigSvc/TrigConfigSvc", n), + m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", n), m_RoI(0) { declareInterface<IL1JEMJetTools>(this); diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx index 5fd5080ad5f..b700fcd1f1b 100644 --- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx +++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// // L1JEPEtSumsTools.cxx, @@ -26,7 +26,7 @@ L1JEPEtSumsTools::L1JEPEtSumsTools(const std::string& type, const IInterface* parent) : AthAlgTool(type, name, parent), - m_configSvc("TrigConf::TrigConfigSvc/TrigConfigSvc", name), + m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", name), m_jeTool("LVL1::L1JetElementTools/L1JetElementTools"), m_etTool("LVL1::L1EtTools/L1EtTools") { diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPHitsTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPHitsTools.cxx index 3a49b66617a..2805e82f4ca 100644 --- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPHitsTools.cxx +++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPHitsTools.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// // L1JEPHitsTools.cxx, @@ -38,7 +38,7 @@ L1JEPHitsTools::L1JEPHitsTools(const std::string& type, const IInterface* parent) : AthAlgTool(type, name, parent), - m_configSvc("TrigConf::TrigConfigSvc/TrigConfigSvc", name) + m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", name) { declareInterface<IL1JEPHitsTools>(this); declareProperty( "LVL1ConfigSvc", m_configSvc, "LVL1 Config Service"); diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx index d5900ebb343..f93b78d797f 100644 --- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx +++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ #include <algorithm> #include <map> @@ -35,7 +35,7 @@ namespace LVL1 { L1JetCMXTools::L1JetCMXTools(const std::string &type, const std::string &name, const IInterface *parent) : AthAlgTool(type, name, parent), - m_configSvc("TrigConf::TrigConfigSvc/TrigConfigSvc", name), m_crates(2), + m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", name), m_crates(2), m_modules(16), m_maxTobs(4), m_sysCrate(1), m_debug(false) { declareInterface<IL1JetCMXTools>(this); declareProperty("LVL1ConfigSvc", m_configSvc, "LVL1 Config Service"); diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.cxx index 4583741d54b..6a38edff821 100644 --- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.cxx +++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// // L1JetEtTools.cxx, @@ -28,7 +28,7 @@ L1JetEtTools::L1JetEtTools(const std::string& t, const IInterface* p ) : AthAlgTool(t,n,p), - m_configSvc("TrigConf::TrigConfigSvc/TrigConfigSvc", n) + m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", n) { declareInterface<IL1JetEtTools>(this); diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx index 681279bbdc1..8949eb0b5b3 100755 --- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx +++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// // L1JetTools.cxx, @@ -20,7 +20,7 @@ L1JetTools::L1JetTools(const std::string& t, const IInterface* p ) : AthAlgTool(t,n,p), - m_configSvc("TrigConf::TrigConfigSvc/TrigConfigSvc", n), + m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", n), m_RoI(0) { declareInterface<IL1JetTools>(this); diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx index 838f600d60a..2f1744d6485 100644 --- a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx +++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx @@ -72,7 +72,7 @@ L1TriggerTowerTool::L1TriggerTowerTool(const std::string& t, m_ttSvc("CaloTriggerTowerService/CaloTriggerTowerService"), m_mappingTool("LVL1::PpmCoolOrBuiltinMappingTool/PpmCoolOrBuiltinMappingTool"), m_l1CondSvc("L1CaloCondSvc", n), - m_configSvc("TrigConf::TrigConfigSvc/TrigConfigSvc", n), + m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", n), m_dbFineTimeRefsTowers(0), m_correctFir(false) { diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPAlgorithm.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPAlgorithm.h index fcc1d6ce7b6..2856d279045 100755 --- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPAlgorithm.h +++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPAlgorithm.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************** CPAlgorithm.h - description @@ -17,7 +17,7 @@ #include <vector> #include "GaudiKernel/ServiceHandle.h" -#include "TrigConfInterfaces/ITrigConfigSvc.h" +#include "TrigConfInterfaces/ILVL1ConfigSvc.h" #include "TrigT1CaloEvent/CPMTower.h" #include "TrigT1CaloEvent/EmTauROI.h" @@ -45,7 +45,7 @@ The CPAlgorithm:<br> class CPAlgorithm { public: - CPAlgorithm( double eta, double phi, const CPMTowerMap_t* ttContainer, ServiceHandle<TrigConf::ITrigConfigSvc> config, int slice = -1); + CPAlgorithm( double eta, double phi, const CPMTowerMap_t* ttContainer, ServiceHandle<TrigConf::ILVL1ConfigSvc> config, int slice = -1); ~CPAlgorithm(); @@ -68,7 +68,7 @@ public: private: //atribs double m_refEta; double m_refPhi; - ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; + ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; /** Algorithm results */ double m_eta; diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h index 544d658c08e..ebb3bac3926 100644 --- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h +++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h @@ -16,7 +16,7 @@ #include <vector> #include "GaudiKernel/ServiceHandle.h" -#include "TrigConfInterfaces/ITrigConfigSvc.h" +#include "TrigConfInterfaces/ILVL1ConfigSvc.h" #include "xAODTrigL1Calo/CPMTower.h" #include "xAODTrigL1Calo/CPMTobRoI.h" @@ -45,7 +45,7 @@ The CPMTobAlgorithm:<br> class CPMTobAlgorithm { public: - CPMTobAlgorithm(double eta, double phi, const xAOD::CPMTowerMap_t* ttContainer, ServiceHandle<TrigConf::ITrigConfigSvc> config, int slice = -1); + CPMTobAlgorithm(double eta, double phi, const xAOD::CPMTowerMap_t* ttContainer, ServiceHandle<TrigConf::ILVL1ConfigSvc> config, int slice = -1); ~CPMTobAlgorithm(); @@ -84,7 +84,7 @@ public: private: //atribs double m_refEta; double m_refPhi; - ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; + ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; /** Algorithm results */ double m_eta; diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JEMJetAlgorithm.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JEMJetAlgorithm.h index f7759254fff..08e8f10733f 100755 --- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JEMJetAlgorithm.h +++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JEMJetAlgorithm.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************** JEMJetAlgorithm.h - description @@ -16,7 +16,7 @@ #include <vector> #include "GaudiKernel/ServiceHandle.h" -#include "TrigConfInterfaces/ITrigConfigSvc.h" +#include "TrigConfInterfaces/ILVL1ConfigSvc.h" #include "TrigT1CaloEvent/JetInput.h" #include "xAODTrigL1Calo/JEMTobRoI.h" @@ -39,7 +39,7 @@ The JEMJetAlgorithm:<br> class JEMJetAlgorithm { public: - JEMJetAlgorithm( double eta, double phi, const std::map<int, JetInput *>* jiContainer, ServiceHandle<TrigConf::ITrigConfigSvc> config); + JEMJetAlgorithm( double eta, double phi, const std::map<int, JetInput *>* jiContainer, ServiceHandle<TrigConf::ILVL1ConfigSvc> config); ~JEMJetAlgorithm(); @@ -63,7 +63,7 @@ public: private: //atribs double m_refEta; double m_refPhi; - ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; + ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; /** Algorithm results */ double m_eta; diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetAlgorithm.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetAlgorithm.h index 0811eecc038..a80c790ad00 100755 --- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetAlgorithm.h +++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetAlgorithm.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************** JetAlgorithm.h - description @@ -16,7 +16,7 @@ #include <vector> #include "GaudiKernel/ServiceHandle.h" -#include "TrigConfInterfaces/ITrigConfigSvc.h" +#include "TrigConfInterfaces/ILVL1ConfigSvc.h" #include "TrigT1CaloEvent/JetInput.h" #include "TrigT1CaloEvent/JetROI.h" @@ -45,7 +45,7 @@ The JetAlgorithm:<br> class JetAlgorithm { public: - JetAlgorithm( double eta, double phi, const std::map<int, JetInput *>* jiContainer, ServiceHandle<TrigConf::ITrigConfigSvc> config); + JetAlgorithm( double eta, double phi, const std::map<int, JetInput *>* jiContainer, ServiceHandle<TrigConf::ILVL1ConfigSvc> config); ~JetAlgorithm(); @@ -66,7 +66,7 @@ public: private: //atribs double m_refEta; double m_refPhi; - ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; + ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; /** Algorithm results */ double m_eta; diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h index 617041eb1f8..53e2eeae6ae 100755 --- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h +++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h @@ -17,7 +17,7 @@ // Include for the configuration service: #include "GaudiKernel/ServiceHandle.h" -#include "TrigConfInterfaces/ITrigConfigSvc.h" +#include "TrigConfInterfaces/ILVL1ConfigSvc.h" @@ -32,11 +32,11 @@ System CMM logic is done in EnergyTrigger*/ class SystemEnergy { public: - SystemEnergy(const DataVector<CrateEnergy>* crates, ServiceHandle<TrigConf::ITrigConfigSvc> config); + SystemEnergy(const DataVector<CrateEnergy>* crates, ServiceHandle<TrigConf::ILVL1ConfigSvc> config); SystemEnergy(unsigned int et, unsigned int exTC, unsigned int eyTC, unsigned int overflowT, unsigned int overflowX, unsigned int overflowY, unsigned int restricted, - ServiceHandle<TrigConf::ITrigConfigSvc> config); + ServiceHandle<TrigConf::ILVL1ConfigSvc> config); ~SystemEnergy(); public: @@ -61,7 +61,7 @@ public: unsigned int roiWord2(); private: - ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; + ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc; int m_systemEx; int m_systemEy; diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/CPAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/CPAlgorithm.cxx index df976804587..82ebc2b7601 100755 --- a/Trigger/TrigT1/TrigT1CaloUtils/src/CPAlgorithm.cxx +++ b/Trigger/TrigT1/TrigT1CaloUtils/src/CPAlgorithm.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************** CPAlgorithm.cxx - description @@ -33,7 +33,7 @@ const double CPAlgorithm::m_maxEta = 2.5; LVL1::CPAlgorithm::CPAlgorithm( double eta, double phi, const CPMTowerMap_t* ttContainer, - ServiceHandle<TrigConf::ITrigConfigSvc> config, int slice): + ServiceHandle<TrigConf::ILVL1ConfigSvc> config, int slice): m_configSvc(config), m_Core(0), m_EMClus(0), diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx index c5ef9d4221b..31679da3432 100644 --- a/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx +++ b/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************** CPMTobAlgorithm.cxx - description @@ -46,7 +46,7 @@ const unsigned int CPMTobAlgorithm::m_tauLUT_EMIsolNBits = 6; const unsigned int CPMTobAlgorithm::m_noIsol = 999; LVL1::CPMTobAlgorithm::CPMTobAlgorithm( double eta, double phi, const xAOD::CPMTowerMap_t* ttContainer, - ServiceHandle<TrigConf::ITrigConfigSvc> config, int slice ): + ServiceHandle<TrigConf::ILVL1ConfigSvc> config, int slice ): m_configSvc(config), m_Core(0), m_EMClus(0), diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx index 312efe6141c..e6d58884dc8 100755 --- a/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx +++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************** JEMJetAlgorithm.cxx - description @@ -26,7 +26,7 @@ using namespace TrigConf; const int JEMJetAlgorithm::m_satLarge = 0x3FF; const int JEMJetAlgorithm::m_satSmall = 0x1FF; -LVL1::JEMJetAlgorithm::JEMJetAlgorithm( double eta, double phi, const std::map<int, JetInput *>* jiContainer, ServiceHandle<TrigConf::ITrigConfigSvc> config): +LVL1::JEMJetAlgorithm::JEMJetAlgorithm( double eta, double phi, const std::map<int, JetInput *>* jiContainer, ServiceHandle<TrigConf::ILVL1ConfigSvc> config): m_configSvc(config), m_ET4x4(0), m_ET6x6(0), diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JetAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JetAlgorithm.cxx index e5340e5a1f3..0a3f4907597 100755 --- a/Trigger/TrigT1/TrigT1CaloUtils/src/JetAlgorithm.cxx +++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JetAlgorithm.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************** JetAlgorithm.cxx - description @@ -26,7 +26,7 @@ using namespace TrigConf; const int JetAlgorithm::m_sat = 0x3FF; -LVL1::JetAlgorithm::JetAlgorithm( double eta, double phi, const std::map<int, JetInput *>* jiContainer, ServiceHandle<TrigConf::ITrigConfigSvc> config): +LVL1::JetAlgorithm::JetAlgorithm( double eta, double phi, const std::map<int, JetInput *>* jiContainer, ServiceHandle<TrigConf::ILVL1ConfigSvc> config): m_configSvc(config), m_ET4x4(0), m_ET6x6(0), diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx index c056897e459..b7bb34beb8b 100755 --- a/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx +++ b/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx @@ -23,7 +23,7 @@ using namespace TrigConf; namespace LVL1 { -SystemEnergy::SystemEnergy(const DataVector<CrateEnergy> *crates, ServiceHandle<TrigConf::ITrigConfigSvc> config) : m_configSvc(config), +SystemEnergy::SystemEnergy(const DataVector<CrateEnergy> *crates, ServiceHandle<TrigConf::ILVL1ConfigSvc> config) : m_configSvc(config), m_systemEx(0), m_systemEy(0), m_systemEt(0), @@ -102,7 +102,7 @@ SystemEnergy::SystemEnergy(const DataVector<CrateEnergy> *crates, ServiceHandle< SystemEnergy::SystemEnergy(unsigned int et, unsigned int exTC, unsigned int eyTC, unsigned int overflowT, unsigned int overflowX, unsigned int overflowY, unsigned int restricted, - ServiceHandle<TrigConf::ITrigConfigSvc> config) : m_configSvc(config), + ServiceHandle<TrigConf::ILVL1ConfigSvc> config) : m_configSvc(config), m_systemEx(0), m_systemEy(0), m_systemEt(et), diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref index 5301f343e8f..f6cd46e43a0 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref @@ -1,14 +1,14 @@ -TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15VH 7 7 5 5 5 0 0 0 5 -TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15VH decisions 16 1635 18 0 0 0 +TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15VH 2 2 2 2 2 0 0 0 2 +TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15VH decisions 6 826 7 0 0 0 TrigSignatureMoniMT INFO HLT_2e3_etcut_L12EM3 20 20 20 20 20 0 0 0 20 TrigSignatureMoniMT INFO HLT_2e3_etcut_L12EM3 decisions 172 8889 387 0 0 0 -TrigSignatureMoniMT INFO HLT_2g20_tight_L12EM20VH 6 6 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_2g20_tight_L12EM20VH 2 2 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_2g20_tight_L12EM20VH decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_2g35_etcut_L12EM20VH 6 6 2 2 1 0 0 0 1 -TrigSignatureMoniMT INFO HLT_2g35_etcut_L12EM20VH decisions 5 5 2 0 0 0 -TrigSignatureMoniMT INFO HLT_2g35_medium_L12EM20VH 6 6 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_2g35_etcut_L12EM20VH 2 2 1 1 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_2g35_etcut_L12EM20VH decisions 2 2 0 0 0 0 +TrigSignatureMoniMT INFO HLT_2g35_medium_L12EM20VH 2 2 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_2g35_medium_L12EM20VH decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_jes_35smcINF_L1J1004 4 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_jes_35smcINF_L1J1003 3 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_jes_35smcINF_L1J100 decisions 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_2mu10_bJpsimumu_L12MU10 3 3 3 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_2mu10_bJpsimumu_L12MU10 decisions 18 0 0 0 0 0 @@ -26,7 +26,7 @@ TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 decisions 24 6 4 4 1 0 TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 4 4 4 1 1 1 0 0 1 TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 decisions 24 6 4 4 0 0 -TrigSignatureMoniMT INFO HLT_3j200_L1J100 4 4 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_3j200_L1J100 3 3 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_3j200_L1J100 decisions 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_3j200_L1J20 19 19 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_3j200_L1J20 decisions 0 0 0 0 0 0 @@ -36,23 +36,23 @@ TrigSignatureMoniMT INFO HLT_3mu6_msonly_L13MU6 TrigSignatureMoniMT INFO HLT_3mu6_msonly_L13MU6 decisions 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_4mu4_L14MU4 0 0 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_4mu4_L14MU4 decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_5j70_0eta240_L14J20 8 8 1 0 0 0 0 0 1 +TrigSignatureMoniMT INFO HLT_5j70_0eta240_L14J20 7 7 1 0 0 0 0 0 1 TrigSignatureMoniMT INFO HLT_5j70_0eta240_L14J20 decisions 5 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI 11 11 9 9 9 0 0 0 9 -TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI decisions 15 1666 13 0 0 0 -TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU109 9 9 0 0 0 0 0 9 -TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU10 decisions 44 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI 6 6 6 6 6 0 0 0 6 +TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI decisions 7 645 7 0 0 0 +TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU105 5 5 0 0 0 0 0 5 +TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU10 decisions 17 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 20 20 20 20 20 0 0 0 20 TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 decisions 172 8889 387 0 0 0 TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 20 20 20 20 20 0 0 0 20 TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 decisions 140 7892 185 0 0 0 TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 20 20 20 20 20 0 0 0 20 TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 decisions 89 5506 108 0 0 0 -TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM24VHI 11 11 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM24VHI 6 6 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM24VHI decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_g140_loose_L1EM24VHI 11 11 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_g140_loose_L1EM24VHI 6 6 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_g140_loose_L1EM24VHI decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_g20_etcut_LArPEB_L1EM15 15 15 14 14 11 11 0 0 11 +TrigSignatureMoniMT INFO HLT_g20_etcut_LArPEB_L1EM15 14 14 14 14 11 11 0 0 11 TrigSignatureMoniMT INFO HLT_g20_etcut_LArPEB_L1EM15 decisions 24 24 21 21 0 0 TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 20 20 20 20 20 0 0 0 20 TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 decisions 140 140 185 0 0 0 @@ -66,19 +66,19 @@ TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 decisions 45 45 84 9 0 0 TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J2019 19 15 0 0 0 0 0 15 TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 decisions 39 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_split_L1J1004 4 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_split_L1J1003 3 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_split_L1J100 decisions 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 19 19 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J75_31ETA493 3 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J75_31ETA492 2 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J75_31ETA49 decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_bmv2c1060_split_L1J1004 4 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_bmv2c1060_split_L1J1003 3 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_bmv2c1060_split_L1J100 decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_j300_ftf_subjesgscIS_bmv2c1070_split_L1J1004 4 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_j300_ftf_subjesgscIS_bmv2c1070_split_L1J1003 3 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j300_ftf_subjesgscIS_bmv2c1070_split_L1J100 decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_j360_ftf_subjesgscIS_bmv2c1077_split_L1J1004 4 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_j360_ftf_subjesgscIS_bmv2c1077_split_L1J1003 3 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j360_ftf_subjesgscIS_bmv2c1077_split_L1J100 decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_j420_L1J100 4 4 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_j420_L1J100 3 3 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j420_L1J100 decisions 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j420_L1J20 19 19 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j420_L1J20 decisions 0 0 0 0 0 0 @@ -96,17 +96,17 @@ TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_ TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20 decisions 18 49 49 49 0 0 TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J2019 19 18 18 18 18 0 0 18 TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20 decisions 18 49 49 49 0 0 -TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J1004 4 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J1003 3 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J100 decisions 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J20 19 19 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J20 decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_j460_a10r_L1J100 4 4 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_j460_a10r_L1J100 3 3 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j460_a10r_L1J100 decisions 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j460_a10r_L1J20 19 19 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j460_a10r_L1J20 decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_30smcINF_L1J1004 4 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_30smcINF_L1J1003 3 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_30smcINF_L1J100 decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_L1J100 4 4 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_L1J100 3 3 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_L1J100 decisions 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J2019 19 11 0 0 0 0 0 11 TrigSignatureMoniMT INFO HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J20 decisions 11 0 0 0 0 0 @@ -152,25 +152,25 @@ TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersE TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU20 decisions 10 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU12 18 18 18 18 0 0 0 0 18 TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU12 decisions 39 29 0 0 0 0 -TrigSignatureMoniMT INFO HLT_tau160_mediumRNN_tracktwoMVA_L1TAU1002 2 0 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_tau160_mediumRNN_tracktwoMVA_L1TAU1000 0 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100 decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM18 18 18 0 0 0 0 0 18 -TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM decisions 42 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM18 18 18 18 13 0 0 0 13 -TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM decisions 42 32 16 0 0 0 -TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM18 18 16 15 10 0 0 0 10 -TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM decisions 36 26 12 0 0 0 -TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM18 18 15 0 0 0 0 0 15 -TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM decisions 34 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 0 0 0 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_xe30_cell_xe30_tcpufit_L1XE100 0 0 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_xe30_cell_xe30_tcpufit_L1XE10 decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_xe30_mht_L1XE10 0 0 0 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_xe30_mht_L1XE10 decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 0 0 0 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_xe30_trkmht_L1XE10 0 0 0 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_xe30_trkmht_L1XE10 decisions 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 0 0 0 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 decisions 0 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM14 14 14 0 0 0 0 0 14 +TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM decisions 24 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM14 14 14 12 11 0 0 0 11 +TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM decisions 24 19 12 0 0 0 +TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM14 14 12 10 9 0 0 0 9 +TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM decisions 21 16 9 0 0 0 +TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM14 14 11 0 0 0 0 0 11 +TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM decisions 19 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 19 19 17 0 0 0 0 0 17 +TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 decisions 17 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_xe30_cell_xe30_tcpufit_L1XE1019 19 18 0 0 0 0 0 9 +TrigSignatureMoniMT INFO HLT_xe30_cell_xe30_tcpufit_L1XE10 decisions 36 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_xe30_mht_L1XE10 19 19 19 0 0 0 0 0 19 +TrigSignatureMoniMT INFO HLT_xe30_mht_L1XE10 decisions 19 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 19 19 10 0 0 0 0 0 10 +TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 decisions 10 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_xe30_trkmht_L1XE10 19 19 17 0 0 0 0 0 17 +TrigSignatureMoniMT INFO HLT_xe30_trkmht_L1XE10 decisions 17 0 0 0 0 0 +TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 10 10 7 0 0 0 0 0 7 +TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 decisions 7 0 0 0 0 0 diff --git a/Trigger/TriggerCommon/TrigTier0/share/BStoESD_Tier0_HLTConfig_jobOptions.py b/Trigger/TriggerCommon/TrigTier0/share/BStoESD_Tier0_HLTConfig_jobOptions.py index a4e612ec323..15a67f0c75c 100644 --- a/Trigger/TriggerCommon/TrigTier0/share/BStoESD_Tier0_HLTConfig_jobOptions.py +++ b/Trigger/TriggerCommon/TrigTier0/share/BStoESD_Tier0_HLTConfig_jobOptions.py @@ -117,6 +117,14 @@ if rec.doTrigger(): ToolSvc += LVL1__L1JEPHitsTools("L1JEPHitsTools") ToolSvc.L1JEPHitsTools.LVL1ConfigSvc="TrigConf::TrigConfigSvc/TrigConfigSvc" + import TrigT1CaloTools.TrigT1CaloToolsConf as calotools + + for toolName in ['L1JetCMXTools', 'L1EnergyCMXTools', 'L1TriggerTowerTool', 'L1CPMTools', + 'L1CPCMXTools', 'L1EmTauTools', 'L1JEMJetTools', 'L1JetEtTools', 'L1JetTools']: + if not hasattr(ToolSvc, toolName ): + ToolSvc += eval('calotools.LVL1__%s( toolName )' % toolName) + getattr(ToolSvc, toolName).LVL1ConfigSvc="TrigConf::TrigConfigSvc/TrigConfigSvc" + #--------------------------------------------------------------------------- if recAlgs.doTrigger(): try: -- GitLab