Commit f0f10eb3 authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge branch 'master-ATR20129' into 'master'

L1Calo tools use LVL1ConfigSvc explicitly

See merge request atlas/athena!28305
parents 57da8648 4c393605
/*
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;
......
......@@ -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: */
......
/*
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: */
......
/*
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 */
......
/*
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
......
/*
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;
......
/*
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 */
......
/*
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;
......
/*
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 */
......
/*
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
......
/*
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;
......
/*
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 */
......
......@@ -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);
......
/*
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);
......
/*
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;
......
/*
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;
......
/*
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);
......
/*
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")
{
......
/*
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");
......
/*
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");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment