From 0483d37bc28eb2aae07186301c8272373803edac Mon Sep 17 00:00:00 2001
From: Christian Nass <christian.nass@cern.ch>
Date: Thu, 14 May 2020 15:42:11 +0200
Subject: [PATCH] Minor tests
---
.../JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py | 5 ++---
.../test/test_trigUpgr_full_menu_cf_build.sh | 6 +++---
.../python/HLTMenuConfig/Bjet/BjetSequenceSetup.py | 6 ++++--
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py
index 96bfecc8c26d..20f6ad04d682 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagRun3Config.py
@@ -245,7 +245,7 @@ def BTagCfg(inputFlags,**kwargs):
def RunHighLevelTaggersCfg(inputFlags, JetCollection, Associator, TrainingMaps, TimeStamp):
result = ComponentAccumulator()
- from AthenaCommon.AlgSequence import AthSequencer
+ AthSequencer=CompFactory.AthSequencer
BTagCollection = 'BTagging_'+JetCollection
sequenceName = BTagCollection + "_HLTaggers"
@@ -253,8 +253,7 @@ def RunHighLevelTaggersCfg(inputFlags, JetCollection, Associator, TrainingMaps,
BTagCollection += '_' + TimeStamp
sequenceName += '_' + TimeStamp
- HLBTagSeq = AthSequencer(sequenceName)
- HLBTagSeq.Sequential = True
+ HLBTagSeq = AthSequencer(sequenceName, Sequential = True)
result.addSequence(HLBTagSeq)
result.merge(BTagHighLevelAugmenterAlgCfg(inputFlags, sequenceName, BTagCollection = BTagCollection, Associator = Associator, **kwargs) )
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
index 8c90fa511a5b..cedf1b608981 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
@@ -5,13 +5,13 @@
# Skipping art-output which has no effect for build tests.
# If you create a grid version, check art-output in existing grid tests.
-export EVENTS=10
+export EVENTS=2000
export THREADS=1
export SLOTS=1
export JOBOPTION="TrigUpgradeTest/full_menu_cf.py"
export REGTESTEXP="TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*"
-#export EXTRA="doWriteBS=False;doWriteRDOTrigger=True;"
-export EXTRA="doWriteBS=False;doWriteRDOTrigger=True;forceEnableAllChains=True;"
+export EXTRA="doWriteBS=False;doWriteRDOTrigger=True;"
+#export EXTRA="doWriteBS=False;doWriteRDOTrigger=True;forceEnableAllChains=True;"
#ex.args = '-c "isOnline=True;doWriteBS=False;doWriteRDOTrigger=True;"'
#ex.args = '-c "doEmptyMenu=True;doBjetSlice=True;isOnline=True;doWriteBS=False;doWriteRDOTrigger=True;"'
#ex.args = '-c "doEmptyMenu=True;forceEnableAllChais=True;isOnline=True;doWriteBS=False;doWriteRDOTrigger=True;"'
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
index 9852003df489..06e9ffa2a666 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
@@ -6,7 +6,7 @@ from AthenaCommon.CFElements import seqAND
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, InViewReco
from TrigEDMConfig.TriggerEDMRun3 import recordable
from AthenaConfiguration.ComponentFactory import CompFactory
-#from AthenaConfiguration.ComponentAccumulator import conf2toConfigurable
+from AthenaConfiguration.ComponentAccumulator import conf2toConfigurable
#from AthenaCommon.Constants import DEBUG
@@ -100,12 +100,14 @@ def bJetStep2Sequence():
from AthenaCommon.Configurable import Configurable
Configurable.configurableRun3Behavior=1
-
+
# Flavour Tagging
from TriggerMenuMT.HLTMenuConfig.Bjet.BjetFlavourTaggingConfiguration import getFlavourTagging
acc_flavourTaggingAlgs = getFlavourTagging( inputJets=InputMakerAlg.InViewJets, inputVertex=prmVtxKey, inputTracks=PTTrackParticles[0] )
inViewReco = InViewReco("bJetBtagSequence", viewMaker= InputMakerAlg)
+ #inViewReco = InViewReco("bJetBtagSequence")
+ #inViewReco = InViewReco("bJetBtagSequence", viewMaker= conf2toConfigurable(InputMakerAlg))
inViewReco.addRecoAlg(secondStageAlgs)
inViewReco.mergeReco(acc_flavourTaggingAlgs)
acc_flavourTaggingAlgs.wasMerged()
--
GitLab