diff --git a/Trigger/TrigSteer/L1Decoder/src/METRoIsUnpackingTool.cxx b/Trigger/TrigSteer/L1Decoder/src/METRoIsUnpackingTool.cxx index 774c055df2eb630f6d49cf95eab2fe04fe4b0c41..27152f7cf24e6c2026fc5a09af307ec4a3bd9b94 100644 --- a/Trigger/TrigSteer/L1Decoder/src/METRoIsUnpackingTool.cxx +++ b/Trigger/TrigSteer/L1Decoder/src/METRoIsUnpackingTool.cxx @@ -4,6 +4,7 @@ #include "TrigConfL1Data/ThresholdConfig.h" #include "TrigT1Result/JetEnergyResult.h" #include "TrigT1Result/RoIBResult.h" +#include "TrigConfL1Data/CTPConfig.h" #include "METRoIsUnpackingTool.h" METRoIsUnpackingTool::METRoIsUnpackingTool( const std::string& type, @@ -26,8 +27,14 @@ StatusCode METRoIsUnpackingTool::initialize() return StatusCode::SUCCESS; } -StatusCode METRoIsUnpackingTool::updateConfiguration( const IRoIsUnpackingTool::SeedingMap& ) { - using namespace TrigConf; +StatusCode METRoIsUnpackingTool::updateConfiguration( const IRoIsUnpackingTool::SeedingMap& seeding ) { + using namespace TrigConf; + ATH_CHECK( decodeMapping( [](const TriggerThreshold* th){ return L1DataDef::TE == th->ttype() or L1DataDef::XE == th->ttype() or L1DataDef::XS == th->ttype(); }, + m_configSvc->ctpConfig()->menu().itemVector(), + seeding ) ); + + + const ThresholdConfig* thresholdConfig = m_configSvc->thresholdConfig(); std::vector<const TriggerThreshold*> filtered; { diff --git a/Trigger/TrigSteer/L1Decoder/src/RoIsUnpackingToolBase.cxx b/Trigger/TrigSteer/L1Decoder/src/RoIsUnpackingToolBase.cxx index 41706f9b89ef67846ae5bdd6b97f4c2761dcdcda..befa8363890a6df70aa19e08881abe7c4852c308 100644 --- a/Trigger/TrigSteer/L1Decoder/src/RoIsUnpackingToolBase.cxx +++ b/Trigger/TrigSteer/L1Decoder/src/RoIsUnpackingToolBase.cxx @@ -30,13 +30,16 @@ StatusCode RoIsUnpackingToolBase::decodeMapping( std::function< bool(const TrigC auto itemsIterator = l1Items.get<TrigConf::tag_name_hash>().find(itemName); if ( itemsIterator != l1Items.get<TrigConf::tag_name_hash>().end() ) { + const TrigConf::TriggerItem* item = *itemsIterator; const TrigConf::TriggerItemNode* node = item->topNode(); std::vector<TrigConf::TriggerThreshold*> itemThresholds; node->getAllThresholds(itemThresholds); + ATH_MSG_DEBUG( "Item " << item->name() << " with thresholds " << itemThresholds.size() ); for ( const TrigConf::TriggerThreshold* th: itemThresholds ) { if ( filter(th) ) { m_thresholdToChainMapping[HLT::Identifier(th->name())].push_back( HLT::Identifier(chainName) ); + ATH_MSG_DEBUG( "Associating " << chainName << " with threshold " << th->name() ); } } } else {