diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.h
index 2cbbc5843159afeadbf814f110e0d4bf6087961e..3ed2bf9e1f969af1f6e4ac1720da11cde8d34c95 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 9ba991e2dd324bd34abb54415d0b73302e4c78a0..284e77b36b46cc6678c31a4bce9daf033e174619 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 b71ac237cb0e7be642f4150388c80a6221f0d548..654eed5e537d85c55e95c5022303df07afe65b0f 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 14fd8ec4921a12436bfc865b95919141483321ac..b6ff476637911f810127b0eb7e5288045334b11a 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 996408cedb7bd47832ab54e90ea764bc1cbdfe04..e4695122bd502d19d4455d614d5d336bb8fa9bf2 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 38d9efadd640ce0180eba0ff430328b785771f44..e11fbd76238825800413eefaf5d375a09f608616 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 91737b3621e06b630c3c828fdd265df1d7cbcddc..1c7951f52f6ff59cd08a11553283b13d48333d7b 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 a83ea22d8195ad04af2e52a7a52dfc3caab0c23c..5dc918b49764887a6c23a8838488ba8f82d6a41e 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 49ac48849808929db0d349b6731d81a33ca079d9..f16ca794dc7095f4e010e61ce23d51c31ac47fe8 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 8d98a000472f5b791b47c9958640601f09159863..40ae340ef95ccd46bc11b5295013b72c79340893 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 5066a207770510637fb799aa18ab1ee07b309439..7a4a26cff7508a05150485e22a4e71e838ee2e75 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 bba5d192b8563b6fe474d19faeeab7e9094686d8..93a650c093a3e4b3fa35f516f684222597807b32 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 12b13cf25742597d7a79369c010219d1d061f08b..e5cd87fa05efcbc52a6340eada5c7a1b4dd1c070 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 4366d30c083ab597f8c948e2cecda41fe3e7143a..92a725085053b78b536650546d2b576e7c86a6b4 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 d22ca5656213eb5eb701544189df4445669c85e0..e1f51a6b65cd49833fd1c8d4cfc3083358a5a573 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 f454db34235a9ab3b7a841d2dd6aa8320ce16475..30b96d83c88be30302b60b4c7026d101519386a6 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 5f6bb9b753e2c207daacd53013258adac65dcc33..e5579fa46b287d7fa9a83f3f7c77681ecaf342e2 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 5fd5080ad5fb7808bebb7420f8a418f064920326..b700fcd1f1b30df5af3a56d441a8c55c17312dac 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 3a49b66617a5b493713b21f5d045a699cff50ca1..2805e82f4ca1ac6655e7324f83d5d4bf18db7a1a 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 d5900ebb343c2e65bec3ad98fbd7397f735dbe11..f93b78d797fb6ca34ddd387df667833b64a23aa0 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 4583741d54ba1f78c77c7333894bea0162b6fbaa..6a38edff82171c728b0af357351f293537277d04 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 681279bbdc151b482bcd35f6f3915aa3f4e82597..8949eb0b5b37713643de33cfe374c803c536986e 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 838f600d60ad6fe18761964f5fe7c55556af3884..2f1744d6485d908856996295777dbe89269d451b 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 fcc1d6ce7b6f44b4bc7bb99651898d16bbfe1e72..2856d2790451016a8d9483dd9bc33bdf950b0a02 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 544d658c08e5fdb5713096359652a777afe94a5b..ebb3bac39268c7fd1ade3dab149e3ef7a6286e1b 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 f7759254fff1d9d244984065c7f01c9cbff45439..08e8f10733f5284ca765832619dafb6bfdeeefc5 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 0811eecc03817d8b86cc9eb50503196344ad0621..a80c790ad003c931c18e00664c78a3bbcd710deb 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 617041eb1f8479b263aba7ef111ecc9b877a2fdc..53e2eeae6ae125eaa1bea2f99bf4341268f0e4ca 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 df976804587eeb71f9d9d99b2490d868e47f5ce6..82ebc2b76015867273c846590dc3e5bce64a667e 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 c5ef9d4221b1070d799505e908f031a9cd8ff640..31679da343227a834702b059dc322fb6cf134c0b 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 312efe6141ce78c0bb7a59c91bedacf6a86bae94..e6d58884dc8a3522f391d0b114ba0a7ab7a2088d 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 e5340e5a1f3e96624fc1c3315840a88f90483ba8..0a3f49075974bc9d15214f58922fc5e3ee4f6355 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 c056897e459f4fe75bc588b53f1fcb1079dba619..b7bb34beb8bc64d9b51eb7a773be83eeaf73f2c2 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 5301f343e8feaa5ada00ae14f21d076fec063496..f6cd46e43a029621c6db3d9c8cd95573b9a1209d 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 a4e612ec32342a51c654470251ab0c6360f81764..15a67f0c75cf8da71cbec31ac327f549d40d9b5f 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: