diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaTLAPhotonHypoAlg.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaTLAPhotonHypoAlg.cxx
index a94bb640c68d6e8592c4dadde4d8ae74853ecf71..1fd7561d9d2ff80bcaef31b5d455177d2642b51f 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaTLAPhotonHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaTLAPhotonHypoAlg.cxx
@@ -71,7 +71,7 @@ for (const auto previousDecision : *previousDecisionHandle)
// get photons from the decision
const xAOD::Photon *photonPrev = nullptr;
auto prevPhotons = TrigCompositeUtils::findLinks<xAOD::PhotonContainer>(previousDecision, TrigCompositeUtils::featureString(), TrigDefs::lastFeatureOfType);
- ATH_MSG_WARNING("This decision has " << prevPhotons.size() << " photons");
+ ATH_MSG_DEBUG("This decision has " << prevPhotons.size() << " photons");
if (prevPhotons.size() != 1) {
@@ -95,7 +95,7 @@ for (const auto previousDecision : *previousDecisionHandle)
newDecision->setObjectLink(featureString(), ElementLink<xAOD::PhotonContainer>(*h_TLAPhotons, h_TLAPhotons->size() - 1, ctx));
- ATH_MSG_WARNING("Copied photon with pT: " << copiedPhoton->pt() << " from decision " << nDecision);
+ ATH_MSG_DEBUG("Copied photon with pT: " << copiedPhoton->pt() << " from decision " << nDecision);
}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetTLAHypoAlg.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetTLAHypoAlg.cxx
index 21996d52348601e15f8154858153385006c30964..ea692e943a5d08fb6f925ab569cbc441c4b2e897 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetTLAHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetTLAHypoAlg.cxx
@@ -58,7 +58,7 @@ StatusCode TrigJetTLAHypoAlg::execute( const EventContext& context ) const {
// get jets from the decision
const xAOD::Jet *jetPrev = nullptr;
auto prevJets = TrigCompositeUtils::findLinks<xAOD::JetContainer>(previousDecision, TrigCompositeUtils::featureString(), TrigDefs::lastFeatureOfType);
- ATH_MSG_WARNING("This decision has " << prevJets.size() << " jets");
+ ATH_MSG_DEBUG("This decision has " << prevJets.size() << " jets");
//copy all jets into the new TLA collection
int nSavedJets = 0;
@@ -75,7 +75,7 @@ StatusCode TrigJetTLAHypoAlg::execute( const EventContext& context ) const {
*copiedJet = *jetPrev;
nSavedJets++;
- ATH_MSG_WARNING("Copied jet with pT: " << copiedJet->pt() << " from decision " << nDecision);
+ ATH_MSG_DEBUG("Copied jet with pT: " << copiedJet->pt() << " from decision " << nDecision);
// now create new decision object
// now go on with the normal Hypo, linking new decision with previous one
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonTLAHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonTLAHypoAlg.cxx
index ec44da13ab5a87c31ce817a33da1aa5aa97a32c0..8cba253cd03017f2821ccf69fef6c033a6de7d16 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonTLAHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonTLAHypoAlg.cxx
@@ -57,11 +57,11 @@ StatusCode TrigMuonTLAHypoAlg::execute(const EventContext &ctx) const
// get muons from the decision
const xAOD::Muon *muonPrev = nullptr;
auto prevMuons = TrigCompositeUtils::findLinks<xAOD::MuonContainer>(previousDecision, TrigCompositeUtils::featureString(), TrigDefs::lastFeatureOfType);
- ATH_MSG_WARNING("This decision has " << prevMuons.size() << " decisions");
+ ATH_MSG_DEBUG("This decision has " << prevMuons.size() << " decisions");
// verify that only one object is found per decision
if (prevMuons.size() != 1) {
- ATH_MSG_WARNING("Did not locate exactly one muon for this Decision Object, found " << prevMuons.size());
+ ATH_MSG_DEBUG("Did not locate exactly one muon for this Decision Object, found " << prevMuons.size());
return StatusCode::FAILURE;
}
@@ -94,12 +94,6 @@ StatusCode TrigMuonTLAHypoAlg::execute(const EventContext &ctx) const
TrigCompositeUtils::insertDecisionIDs(hypoPair.second, hypoPair.first);
}
- /* for (const auto &tool : m_hypoTools)
- {
- ATH_MSG_DEBUG("Now computing decision for HypoTool: " << tool->name());
- ATH_CHECK(tool->decide(muonHypoInputs));
- }
- */
ATH_CHECK(hypoBaseOutputProcessing(outputHandle));
return StatusCode::SUCCESS;
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/TLABuildingSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/TLABuildingSequences.py
index adfbab33fe1dca9bc13dd991a3c7e37196862b4f..f7625357e75edc8710e3de59b91e205caaa850f9 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/TLABuildingSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/TLABuildingSequences.py
@@ -12,25 +12,14 @@ def addTLAStep(chain, chainDict):
Add one extra chain step for TLA Activities
'''
- signatures = chainDict['signatures'] # EG: ['Photon'] or ['Photon', 'Jet']
tlaSequencesList = []
log.debug("addTLAStep: processing chain: ", chainDict['chainName'])
- print("addTLAStep: processing chain: ", chainDict['chainName'])
- print(chainDict)
+
+
for cPart in chainDict['chainParts']:
- tlaSignature = cPart['signature']
- log.debug("addTLAStep: processing signature: ", tlaSignature)
+ log.debug("addTLAStep: processing signature: ", cPart['signature'])
# call the sequence from their respective signatures
-
- isPFlow = False
- if tlaSignature == 'Jet':
- if cPart['constitType'] == 'pf':
- print("Setting isPFLow = True")
- isPFlow = True
- # I would love to pass cPart to this, but apparently a list is an unhashable type and cannot be passed via RecoFragmentsPool
-
- #tlaSequencesList.append( RecoFragmentsPool.retrieve(getTLASignatureSequence, ConfigFlags, tlaSignature=tlaSignature, isPFlow=isPFlow) )
tlaSequencesList.append(getTLASignatureSequence(ConfigFlags, chainPart=cPart)),
log.debug("addTLAStep: About to add a step with: ", len(tlaSequencesList), "parallel sequences.")
@@ -47,33 +36,27 @@ def addTLAStep(chain, chainDict):
chain.steps.append(step)
-#def getTLASignatureSequence(ConfigFlags, tlaSignature, isPFlow=False):
+
def getTLASignatureSequence(ConfigFlags, chainPart):
- # Here we simply retrieve the TLA sequence from the existing signature code f
+ # Here we simply retrieve the TLA sequence from the existing signature code
- #if "Photon" in tlaSignature:
if chainPart['signature'] == 'Photon':
from ..Photon.PrecisionPhotonTLAMenuSequences import TLAPhotonMenuSequence
photonOutCollectionName = "HLT_egamma_Photons"
return RecoFragmentsPool.retrieve(TLAPhotonMenuSequence, ConfigFlags, photonsIn=photonOutCollectionName)
- #elif "Muon" in tlaSignature:
elif chainPart['signature'] == 'Muon':
from ..Muon.TLAMuonSequence import TLAMuonMenuSequence
muonOutCollectionName = "HLT_MuonsCB_RoI"
return RecoFragmentsPool.retrieve(TLAMuonMenuSequence, ConfigFlags, muonsIn=muonOutCollectionName)
- #return sequence
- #return TLAMuonMenuSequence(ConfigFlags), muonOutCollectionName
- #elif "Jet" in tlaSignature:
elif chainPart['signature'] == 'Jet':
from ..Jet.JetTLASequences import TLAJetMenuSequence
jetOutCollectionName = "HLT_AntiKt4EMTopoJets_subjesIS"
if chainPart['constitType'] == 'pf': jetOutCollectionName = "HLT_AntiKt4EMPFlowJets_subjesIS"
return RecoFragmentsPool.retrieve(TLAJetMenuSequence, ConfigFlags, jetsIn=jetOutCollectionName)
- #return sequence
- # return TLAJetMenuSequence(ConfigFlags, jetOutCollectionName)
+
def findTLAStep(chainConfig):
@@ -81,8 +64,6 @@ def findTLAStep(chainConfig):
if len(tlaSteps) == 0:
return None
elif len(tlaSteps) > 1:
- print("Found multiple step in chain: ", chainConfig.name, "steps: ")
- print(chainConfig.steps)
raise RuntimeError('Multiple TLA steps in one chain are not supported. ', len(tlaSteps), ' were found in chain ' + chainConfig.name)
return tlaSteps[0]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTLASequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTLASequences.py
index 629e06b2e203579688175ac7de025af7762f1792..744aec66b9d2f97100039bed251448a6e7d283ea 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTLASequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTLASequences.py
@@ -15,7 +15,6 @@ def TLAJetSequence (flags, jetsIn):
tlaJetInputMakerAlg.RoITool = CompFactory.ViewCreatorInitialROITool()
tlaJetInputMakerAlg.mergeUsingFeature = True
- print("MARCO: inside TLAJetSequence")
tlaJetAthSequence = seqAND( "TLAJetAthSequence_"+jetsIn, [tlaJetInputMakerAlg] )
sequenceOut = jetsIn+"_TLA"
return (tlaJetAthSequence, tlaJetInputMakerAlg, sequenceOut)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
index b6d5a06515e5213df2146a3d76302b6e3942fb18..b2926d900ba9037d79e90f9813618e4f8d76e67f 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
@@ -11,7 +11,6 @@ from .MenuPrescaleConfig import MenuPrescaleConfig, applyHLTPrescale
from .ChainMerging import mergeChainDefs
from .MenuAlignmentTools import MenuAlignment
from ..CommonSequences import EventBuildingSequences, TLABuildingSequences
-from AthenaConfiguration.AllConfigFlags import ConfigFlags
from .ComboHypoHandling import addTopoInfo, comboConfigurator, topoLegIndices
from AthenaCommon.Logging import logging