diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_athenaMT.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_athenaMT.sh index 77ec8f579678695a26d76092ba0a24feff92fe56..9c0f0c315ca81de1e593a1f55d88f14573e33e20 100755 --- a/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_athenaMT.sh +++ b/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_athenaMT.sh @@ -115,6 +115,7 @@ else --filesInput "${DS}" \ --evtMax ${EVENTS} \ --skipEvents ${SKIPEVENTS} \ + -l DEBUG \ -c "${EXTRA}" \ ${JOBOPTION} >${JOB_LOG} 2>&1 ) 2>&1 diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py index 24ef23210dcefb29151ba143863e58087ba5891e..a78a03f0558c3c61d62b5a3ab29dd9f2af28e22e 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py @@ -70,28 +70,28 @@ def bJetStep2Sequence(): acc_flavourTaggingAlgs,bTaggingContainerName = getFlavourTagging( inputJets=InputMakerAlg.InViewJets, inputVertex=prmVtxKey, inputTracks=PTTrackParticles[0] ) #======================This is running on Release 22.0.11, but not after Gaudi2 updates=================== - inViewReco = InViewReco("bJetBtagSequence", viewMaker=InputMakerAlg) - inViewReco.addRecoAlg(secondStageAlgs) - inViewReco.mergeReco(acc_flavourTaggingAlgs) - acc_flavourTaggingAlgs.wasMerged() - inViewReco.wasMerged() +# inViewReco = InViewReco("bJetBtagSequence", viewMaker=InputMakerAlg) +# inViewReco.addRecoAlg(secondStageAlgs) +# inViewReco.mergeReco(acc_flavourTaggingAlgs) +# acc_flavourTaggingAlgs.wasMerged() +# inViewReco.wasMerged() - Configurable.configurableRun3Behavior=0 +# Configurable.configurableRun3Behavior=0 #======================This is a new idea, since the function "conf2toConfigurable" was added recently, but is crashing when converting ATLASExtrapolator===== -# Configurable.configurableRun3Behavior=0 + Configurable.configurableRun3Behavior=0 -# from AthenaCommon.CFElements import findAllAlgorithms -# from AthenaConfiguration.ComponentAccumulator import conf2toConfigurable -# AllFlavourTaggingAlgs = [] -# for alg in findAllAlgorithms(acc_flavourTaggingAlgs.getSequence("AthAlgSeq")): -# AllFlavourTaggingAlgs.append(conf2toConfigurable(alg)) + from AthenaCommon.CFElements import findAllAlgorithms + from AthenaConfiguration.ComponentAccumulator import conf2toConfigurable + AllFlavourTaggingAlgs = [] + for alg in findAllAlgorithms(acc_flavourTaggingAlgs.getSequence("AthAlgSeq")): + AllFlavourTaggingAlgs.append(conf2toConfigurable(alg)) -# bJetBtagSequence = seqAND( "bJetBtagSequence", secondStageAlgs + AllFlavourTaggingAlgs ) -# InputMakerAlg.ViewNodeName = "bJetBtagSequence" + bJetBtagSequence = seqAND( "bJetBtagSequence", secondStageAlgs + AllFlavourTaggingAlgs ) + InputMakerAlg.ViewNodeName = "bJetBtagSequence" -# # Sequence -# BjetAthSequence = seqAND( "BjetAthSequence_step2",[InputMakerAlg,bJetBtagSequence] ) + # Sequence + BjetAthSequence = seqAND( "BjetAthSequence_step2",[InputMakerAlg,bJetBtagSequence] ) #============================================================================================================= from TrigBjetHypo.TrigBjetHypoConf import TrigBjetBtagHypoAlgMT @@ -109,10 +109,10 @@ def bJetStep2Sequence(): hypo.MonTool = TrigBjetOnlineMonitoring() from TrigBjetHypo.TrigBjetBtagHypoTool import TrigBjetBtagHypoToolFromDict - return MenuSequence( Sequence = inViewReco.sequence(), - Maker = inViewReco.inputMaker(), -# return MenuSequence( Sequence = BjetAthSequence, -# Maker = InputMakerAlg, +# return MenuSequence( Sequence = inViewReco.sequence(), +# Maker = inViewReco.inputMaker(), + return MenuSequence( Sequence = BjetAthSequence, + Maker = InputMakerAlg, Hypo = hypo, HypoToolGen = TrigBjetBtagHypoToolFromDict)