Commit 737ef228 authored by Tim Martin's avatar Tim Martin Committed by Walter Lampl
Browse files

Complete migration of all Navigation collections to start with HLTNav_ by...

Complete migration of all Navigation collections to start with HLTNav_ by renaming HLTSummary to HLTNav_Summary
parent 1f3ea6fd
......@@ -129,7 +129,7 @@ streamExampleDataScoutingPEB = ['ExampleDataScoutingPEB', 'physics', "True", "Fa
# Tool adding stream tags to HLT result
stmaker = StreamTagMakerTool()
stmaker.ChainDecisions = "HLTSummary"
stmaker.ChainDecisions = "HLTNav_Summary"
stmaker.PEBDecisionKeys = [hypo.HypoOutputDecisions]
stmaker.ChainToStream = {}
stmaker.ChainToStream["HLT_MTCalibPeb1"] = streamExamplePEB
......@@ -138,7 +138,7 @@ stmaker.ChainToStream["HLT_MTCalibPeb3"] = streamExampleDataScoutingPEB
# Tool adding HLT bits to HLT result
bitsmaker = TriggerBitsMakerTool()
bitsmaker.ChainDecisions = "HLTSummary"
bitsmaker.ChainDecisions = "HLTNav_Summary"
bitsmaker.ChainToBit = {}
bitsmaker.ChainToBit["HLT_MTCalibPeb1"] = 3
bitsmaker.ChainToBit["HLT_MTCalibPeb2"] = 50
......
......@@ -125,7 +125,7 @@ namespace TrigDec {
Gaudi::Property<std::string> m_lvl1ToolLocation{this, "Lvl1ToolLocation", "HLT::Lvl1ResultAccessTool/Lvl1ResultAccessTool", "L1 tool to fetch"};
// Input keys configuration
SG::ReadHandleKey<TrigCompositeUtils::DecisionContainer> m_HLTSummaryKeyIn {this, "HLTSummary", "HLTSummary", "HLT summary container Key"};
SG::ReadHandleKey<TrigCompositeUtils::DecisionContainer> m_HLTSummaryKeyIn {this, "HLTSummary", "HLTNav_Summary", "HLT summary container Key"};
SG::ReadHandleKey<LVL1CTP::Lvl1Result> m_L1ResultKeyIn {this, "Lvl1Result", "Lvl1Result", "Lvl1 Result Object Key"};
SG::ReadHandleKey<ROIB::RoIBResult> m_ROIBResultKeyIn {this, "RoIBResult", "RoIBResult", "RoIB Result Object Key"};
SG::ReadHandleKey<xAOD::EventInfo> m_EventInfoKeyIn {this, "EventInfo", "EventInfo", "Event Info Object Key"};
......
......@@ -21,7 +21,7 @@ std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> > Trig::ChainGroup::feature
// TODO when we decide what happens to CacheGlobalMemory - this needs to be updated to use a ReadHandle
const TrigCompositeUtils::DecisionContainer* navigationSummaryContainer = nullptr;
if (eventStore->retrieve(navigationSummaryContainer, "HLTSummary").isFailure() || navigationSummaryContainer == nullptr) {
if (eventStore->retrieve(navigationSummaryContainer, "HLTNav_Summary").isFailure() || navigationSummaryContainer == nullptr) {
ATH_MSG_ERROR("Unable to read Run 3 trigger navigation. Cannot retrieve features.");
errState = true;
}
......@@ -36,7 +36,7 @@ std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> > Trig::ChainGroup::feature
}
}
if (terminusNode == nullptr) {
ATH_MSG_ERROR("Unable to locate HLTPassRaw element of HLTSummary");
ATH_MSG_ERROR("Unable to locate HLTPassRaw element of HLTNav_Summary");
errState = true;
}
}
......
......@@ -135,7 +135,7 @@ namespace Trig {
/// @{
Gaudi::Property<std::string> m_navigationFormat{this, "NavigationFormat", "TriggerElement", "Allowed tokens are 'TriggerElement' or 'TrigComposite'"}; //!< Note: Temporary property
SG::ReadHandleKey<TrigCompositeUtils::DecisionContainer> m_HLTSummaryKeyIn {this, "HLTSummary", "HLTSummary", "HLT summary container Key"};
SG::ReadHandleKey<TrigCompositeUtils::DecisionContainer> m_HLTSummaryKeyIn {this, "HLTSummary", "HLTNav_Summary", "HLT summary container Key"};
/// @}
TrigDecisionTool& operator= (const TrigDecisionTool&);
......
......@@ -37,7 +37,7 @@ class TrigSignatureMoniMT : public ::AthReentrantAlgorithm
private:
SG::ReadHandleKey<TrigCompositeUtils::DecisionContainer> m_l1DecisionsKey{ this, "L1Decisions", "L1DecoderSummary", "Chains activated after the L1" };
SG::ReadHandleKey<TrigCompositeUtils::DecisionContainer> m_finalDecisionKey{ this, "FinalDecisionKey", "HLTSummary", "Final stage of all decisions" };
SG::ReadHandleKey<TrigCompositeUtils::DecisionContainer> m_finalDecisionKey{ this, "FinalDecisionKey", "HLTNav_Summary", "Final stage of all decisions" };
Gaudi::Property<std::vector<std::string> > m_allChains{ this, "ChainsList", {}, "List of all configured chains" };
......
......@@ -221,7 +221,7 @@ namespace TrigCompositeUtils {
/**
* @brief Search back in time from "start" and locate all linear paths back through Decision objects for a given chain.
* @param[in] start The Decision object to start the search from. Typically this will be one of the terminus objects from the HLTSummary (regular or rerun).
* @param[in] start The Decision object to start the search from. Typically this will be one of the terminus objects from the HLTNav_Summary (regular or rerun).
* @param[out] linkVector Each entry in the outer vector represents a path through the graph. For each path, a vector of ElementLinks describing the path is returned.
* @param[in] id Optional DecisionID of a Chain to trace through the navigation. If omitted, no chain requirement will be applied.
* @param[in] enforceDecisionOnStartNode If the check of DecisionID should be carried out on the start node.
......
......@@ -26,7 +26,7 @@ public:
virtual StatusCode finalize() override;
private:
SG::ReadHandleKey<TrigCompositeUtils::DecisionContainer> m_finalChainDecisions { this, "ChainDecisions", "HLTSummary", "Container with final chain decisions" };
SG::ReadHandleKey<TrigCompositeUtils::DecisionContainer> m_finalChainDecisions { this, "ChainDecisions", "HLTNav_Summary", "Container with final chain decisions" };
Gaudi::Property<std::map<std::string, int>> m_chainToStreamProperty { this, "ChainToBit", {}, "Mapping from the chain name to bit position in trigger bits array"};
......
......@@ -14,7 +14,7 @@
* @class DecisionsSummaryMakerAlg
* @brief Executes after both the first-pass and secon-pass (rerun) chains have finished.
* Makes decision objects containing decision IDs per passing chain, prescaled chain and rerun chain.
* Sends end-of-HLT processing trigger to cost monitoring. Writes HLTSummary container.
* Sends end-of-HLT processing trigger to cost monitoring. Writes HLTNav_Summary container.
**/
class DecisionSummaryMakerAlg : public AthReentrantAlgorithm {
public:
......@@ -26,7 +26,7 @@ public:
virtual StatusCode finalize() override;
private:
SG::WriteHandleKey<TrigCompositeUtils::DecisionContainer> m_summaryKey{ this, "DecisionsSummaryKey", "HLTSummary",
SG::WriteHandleKey<TrigCompositeUtils::DecisionContainer> m_summaryKey{ this, "DecisionsSummaryKey", "HLTNav_Summary",
"location of final decision" };
SG::ReadHandleKeyArray<TrigCompositeUtils::DecisionContainer> m_finalDecisionKeys{ this, "FinalDecisionKeys", {},
......
......@@ -53,7 +53,7 @@ StatusCode StreamTagMakerTool::fill( HLT::HLTResultMT& resultToFill ) const {
using namespace TrigCompositeUtils;
auto chainsHandle = SG::makeHandle( m_finalChainDecisions );
if (!chainsHandle.isValid()) {
ATH_MSG_ERROR("Unable to read in the HLTSummary from the DecisionSummaryMakerAlg");
ATH_MSG_ERROR("Unable to read in the HLTNav_Summary from the DecisionSummaryMakerAlg");
return StatusCode::FAILURE;
}
......@@ -71,7 +71,7 @@ StatusCode StreamTagMakerTool::fill( HLT::HLTResultMT& resultToFill ) const {
}
if (passRawChains == nullptr || rerunChains == nullptr) {
ATH_MSG_ERROR("Unable to read in the HLTSummary from the DecisionSummaryMakerAlg");
ATH_MSG_ERROR("Unable to read in the HLTNav_Summary from the DecisionSummaryMakerAlg");
return StatusCode::FAILURE;
}
......
......@@ -39,7 +39,7 @@ public:
typedef std::tuple<std::string, std::string, bool, bool> StreamTagInfo;
private:
SG::ReadHandleKey<TrigCompositeUtils::DecisionContainer> m_finalChainDecisions { this, "ChainDecisions", "HLTSummary",
SG::ReadHandleKey<TrigCompositeUtils::DecisionContainer> m_finalChainDecisions { this, "ChainDecisions", "HLTNav_Summary",
"Container with final chain decisions" };
SG::ReadHandleKeyArray<TrigCompositeUtils::DecisionContainer> m_pebDecisionKeys{ this, "PEBDecisionKeys", {},
......
......@@ -26,7 +26,7 @@ StatusCode TriggerBitsMakerTool::initialize() {
StatusCode TriggerBitsMakerTool::fill( HLT::HLTResultMT& resultToFill ) const {
auto chainsHandle = SG::makeHandle( m_finalChainDecisions );
if (!chainsHandle.isValid()) {
ATH_MSG_ERROR("Unable to read in the HLTSummary from the DecisionSummaryMakerAlg");
ATH_MSG_ERROR("Unable to read in the HLTNav_Summary from the DecisionSummaryMakerAlg");
return StatusCode::FAILURE;
}
......@@ -39,7 +39,7 @@ StatusCode TriggerBitsMakerTool::fill( HLT::HLTResultMT& resultToFill ) const {
}
if (passRawChains == nullptr) {
ATH_MSG_ERROR("Unable to read in the HLTSummary from the DecisionSummaryMakerAlg");
ATH_MSG_ERROR("Unable to read in the HLTNav_Summary from the DecisionSummaryMakerAlg");
return StatusCode::FAILURE;
}
......
......@@ -93,7 +93,7 @@ streamPhysicsMain = ['Main', 'physics', "True", "True"]
# Tool adding stream tags to HLT result
stmaker = StreamTagMakerTool()
stmaker.ChainDecisions = "HLTSummary"
stmaker.ChainDecisions = "HLTNav_Summary"
stmaker.PEBDecisionKeys = [hypo.HypoOutputDecisions]
stmaker.ChainToStream = {}
stmaker.ChainToStream["HLT_MTCalibPeb1"] = streamPhysicsMain
......@@ -101,7 +101,7 @@ stmaker.ChainToStream["HLT_MTCalibPeb2"] = streamPhysicsMain
# Tool adding HLT bits to HLT result
bitsmaker = TriggerBitsMakerTool()
bitsmaker.ChainDecisions = "HLTSummary"
bitsmaker.ChainDecisions = "HLTNav_Summary"
bitsmaker.ChainToBit = {}
bitsmaker.ChainToBit["HLT_MTCalibPeb1"] = 4
bitsmaker.ChainToBit["HLT_MTCalibPeb2"] = 32
......
......@@ -160,7 +160,7 @@ streamDSPEBElectron = ['DSElectronWithPEB', 'physics', "True", "False"]
stmaker = StreamTagMakerTool()
stmaker.OutputLevel = DEBUG
stmaker.ChainDecisions = "HLTSummary"
stmaker.ChainDecisions = "HLTNav_Summary"
stmaker.PEBDecisionKeys = pebDecisionKeys
stmaker.ChainToStream = dict( [(c.name, streamPhysicsMain) for c in testChains ] )
stmaker.ChainToStream["HLT_e3_etcut_dataScoutingElectronTest_pebtestthree_L1EM3"] = streamDSPEBElectron
......@@ -175,7 +175,7 @@ stmaker.ChainToStream["HLT_e7_etcut_pebtestone_L1EM3"] = streamPhysicsPebtestone
##### Result maker part 3 - HLT bits #####
bitsmaker = TriggerBitsMakerTool()
bitsmaker.ChainDecisions = "HLTSummary"
bitsmaker.ChainDecisions = "HLTNav_Summary"
bitsmaker.ChainToBit = dict( [ (chain.name, 10*num) for num,chain in enumerate(testChains) ] )
bitsmaker.OutputLevel = DEBUG
......
......@@ -274,7 +274,7 @@ def addTC(name):
for tc in decisionsNotPointingtoViews + ["EgammaCaloDecisions", "ElectronL2Decisions"]:
addTC( tc )
addTC("HLTSummary")
addTC("HLTNav_Summary")
StreamESD.ItemList += [ "xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex",
"xAOD::TrackParticleContainer#HLT_xAOD_TrackParticleContainer_L2ElectronTracks",
......@@ -323,11 +323,11 @@ streamPhysicsMain = ['Main', 'physics', "True", "True"]
streamPhotonPerf = ['PhotonPerf', 'calibration', "True", "True"] # just made up the name
stmaker = StreamTagMakerTool()
stmaker.ChainDecisions = "HLTSummary"
stmaker.ChainDecisions = "HLTNav_Summary"
stmaker.ChainToStream = dict( [(c, streamPhysicsMain) for c in testChains ] )
stmaker.ChainToStream["HLT_e5_etcut"] = streamPhotonPerf
bitsmaker = TriggerBitsMakerTool()
bitsmaker.ChainDecisions = "HLTSummary"
bitsmaker.ChainDecisions = "HLTNav_Summary"
bitsmaker.ChainToBit = dict( [ (chain, 10*num) for num,chain in enumerate(testChains) ] )
hltResultMakerTool = HLTResultMTMaker("MKTool")
......
......@@ -164,7 +164,7 @@ streamPhysicsPebtestfive = ['pebtestfive', 'physics', "True", "False"]
stmaker = StreamTagMakerTool()
stmaker.OutputLevel = DEBUG
stmaker.ChainDecisions = "HLTSummary"
stmaker.ChainDecisions = "HLTNav_Summary"
stmaker.PEBDecisionKeys = pebDecisionKeys
stmaker.ChainToStream = dict( [(c.name, streamPhysicsMain) for c in testChains ] )
stmaker.ChainToStream["HLT_e3_etcut_pebtestone_L1EM3"] = streamPhysicsPebtestone
......@@ -176,7 +176,7 @@ stmaker.ChainToStream["HLT_mu6_pebtestfive_L1MU6"] = streamPhysicsPebtestfive
##### Result maker part 3 - HLT bits #####
bitsmaker = TriggerBitsMakerTool()
bitsmaker.ChainDecisions = "HLTSummary"
bitsmaker.ChainDecisions = "HLTNav_Summary"
bitsmaker.ChainToBit = dict( [ (chain.name, 10*num) for num,chain in enumerate(testChains) ] )
bitsmaker.OutputLevel = DEBUG
......
......@@ -142,7 +142,7 @@ def addTC(name):
for tc in edmCreator.TrigCompositeContainer:
addTC( tc )
addTC("HLTSummary")
addTC("HLTNav_Summary")
StreamESD.ItemList += [ "xAOD::TrigPhotonContainer#HLT_photons"]
......
......@@ -31,7 +31,7 @@ def recordable( name ):
If the names are correct the outputKey is assigned with SomeKey, if there is a missmatch an exception is thrown.
"""
if name in ["HLTSummary", "L1DecoderSummary"] or "L1" in name or "RoI" in name:
if name in ["HLTNav_Summary", "L1DecoderSummary"] or "L1" in name or "RoI" in name:
pass
else: #negative filtering
if not name.startswith( "HLT_" ):
......@@ -50,8 +50,8 @@ def recordable( name ):
TriggerHLTListRun3 = [
#framework/steering
('xAOD::TrigCompositeContainer#HLTSummary', 'BS ESD AODFULL AODSLIM', 'Steer'),
('xAOD::TrigCompositeAuxContainer#HLTSummaryAux.', 'BS ESD AODFULL AODSLIM', 'Steer'),
('xAOD::TrigCompositeContainer#HLTNav_Summary', 'BS ESD AODFULL AODSLIM', 'Steer'),
('xAOD::TrigCompositeAuxContainer#HLTNav_SummaryAux.', 'BS ESD AODFULL AODSLIM', 'Steer'),
('xAOD::TrigCompositeContainer#L1DecoderSummary', 'BS ESD AODFULL AODSLIM', 'Steer'),
('xAOD::TrigCompositeAuxContainer#L1DecoderSummaryAux.', 'BS ESD AODFULL AODSLIM', 'Steer'),
......
......@@ -45,7 +45,7 @@ def EDMDecodingVersion():
log.info("Decoding version set to 1, because HLTResult_EF found in pool file")
elif cfgKeyStore.isInInputFile( "HLTResult", "HLTResult_HLT"):
TriggerFlags.EDMDecodingVersion = 2
elif cfgKeyStore.isInInputFile( "xAOD::TrigCompositeContainer", "HLTSummary"):
elif cfgKeyStore.isInInputFile( "xAOD::TrigCompositeContainer", "HLTNav_Summary"):
TriggerFlags.EDMDecodingVersion = 3
else:
log.warning("Cannot recognise HLT EDM format, TriggerFlags.EDMDecodingVersion=%d", TriggerFlags.EDMDecodingVersion())
......
......@@ -145,7 +145,7 @@ def triggerSummaryCfg(flags, hypos):
__log.info("Final decision of chain " + c + " will be red from " + cont )
decisionSummaryAlg.FinalDecisionKeys = list(set(allChains.values()))
decisionSummaryAlg.FinalStepDecisions = allChains
decisionSummaryAlg.DecisionsSummaryKey = "HLTSummary" # Output
decisionSummaryAlg.DecisionsSummaryKey = "HLTNav_Summary" # Output
return acc, decisionSummaryAlg
......@@ -158,7 +158,7 @@ def triggerMonitoringCfg(flags, hypos, filters, l1Decoder):
from TrigSteerMonitor.TrigSteerMonitorConf import TrigSignatureMoniMT, DecisionCollectorTool
mon = TrigSignatureMoniMT()
mon.L1Decisions = "L1DecoderSummary"
mon.FinalDecisionKey = "HLTSummary" # Input
mon.FinalDecisionKey = "HLTNav_Summary" # Input
if len(hypos) == 0:
__log.warning("Menu is not configured")
return acc, mon
......@@ -199,7 +199,7 @@ def triggerOutputStreamCfg( flags, decObj, outputType ):
return [ "xAOD::TrigCompositeContainer#%s" % name, "xAOD::TrigCompositeAuxContainer#%sAux." % name]
[ itemsToRecord.extend( __TCKeys(d) ) for d in decObj ]
# the rest of triger EDM
itemsToRecord.extend( __TCKeys( "HLTSummary" ) )
itemsToRecord.extend( __TCKeys( "HLTNav_Summary" ) )
from TrigEDMConfig.TriggerEDMRun3 import TriggerHLTListRun3
EDMCollectionsToRecord=filter( lambda x: outputType in x[1] and "TrigCompositeContainer" not in x[0], TriggerHLTListRun3 )
......@@ -209,7 +209,7 @@ def triggerOutputStreamCfg( flags, decObj, outputType ):
__log.info( outputType + " trigger content "+str( itemsToRecord ) )
acc = OutputStreamCfg( flags, outputType, ItemList=itemsToRecord )
streamAlg = acc.getEventAlgo("OutputStream"+outputType)
streamAlg.ExtraInputs = [("xAOD::TrigCompositeContainer", "HLTSummary")] # OutputStream has a data dependency on HLTSummary
streamAlg.ExtraInputs = [("xAOD::TrigCompositeContainer", "HLTNav_Summary")] # OutputStream has a data dependency on HLTNav_Summary
return acc
......
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