From df8b43a262411c4760af44cc549a367d2c97c3de Mon Sep 17 00:00:00 2001
From: Christian Nass <christian.nass@cern.ch>
Date: Tue, 16 Jun 2020 14:15:04 +0200
Subject: [PATCH] conf2toConfigurable option + debug
---
.../test/exec_TrigUpgradeTest_art_athenaMT.sh | 1 +
.../HLTMenuConfig/Bjet/BjetSequenceSetup.py | 40 +++++++++----------
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_athenaMT.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_athenaMT.sh
index 77ec8f579678..9c0f0c315ca8 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 24ef23210dce..a78a03f0558c 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)
--
GitLab