From e9f4f49e82a6db3a8f1f08201a5106880ae1e6c9 Mon Sep 17 00:00:00 2001
From: Tomasz Bold <tomasz.bold@gmail.com>
Date: Thu, 13 Dec 2018 20:41:37 +0000
Subject: [PATCH] cleaned New JO main file a bit
---
.../python/ComponentAccumulator.py | 9 ++--
.../TrigUpgradeTest/share/newJOtest.py | 45 ++-----------------
2 files changed, 10 insertions(+), 44 deletions(-)
diff --git a/Control/AthenaConfiguration/python/ComponentAccumulator.py b/Control/AthenaConfiguration/python/ComponentAccumulator.py
index d100edbfac6..4f67c0f2542 100644
--- a/Control/AthenaConfiguration/python/ComponentAccumulator.py
+++ b/Control/AthenaConfiguration/python/ComponentAccumulator.py
@@ -548,7 +548,7 @@ class ComponentAccumulator(object):
# if local bootstrap is missing, use one from the release
bsfilename=find_datafile("bootstrap.pkl")
else:
- bsfilename = localbs[0]
+ bsfilename = "./"+localbs[0]
bsfile=open(bsfilename)
self._jocat=pickle.load(bsfile)
@@ -565,8 +565,11 @@ class ComponentAccumulator(object):
evtalgseq.append( alg.getFullName() )
- for seqName, algoList in flatSequencers( self._sequence ).iteritems():
- self._jocat[seqName]["Members"]=str( [alg.getFullName() for alg in algoList] )
+ for seqName, algoList in flatSequencers( self._sequence ).iteritems():
+ # part of the sequence may come from the bootstrap, we need to retain the content, that is done here
+ mergedSequence = ast.literal_eval(self._jocat[seqName]["Members"]) + [alg.getFullName() for alg in algoList]
+ self._jocat[seqName]["Members"] = str( mergedSequence )
+
#Conditions Algorithms:
condalgseq=[]
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py
index 2ab9062bdee..7de8533cd38 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py
@@ -3,7 +3,7 @@
#
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-from AthenaConfiguration.AllConfigFlags import ConfigFlags
+from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
from AthenaCommon.CFElements import parOR, seqOR, seqAND, stepSeq
from AthenaCommon.AlgSequence import dumpMasterSequence
from AthenaCommon.AppMgr import theApp
@@ -14,7 +14,7 @@ from AthenaCommon.Configurable import Configurable
Configurable.configurableRun3Behavior=1
-flags = ConfigFlags
+
setupMenu(flags)
@@ -30,33 +30,9 @@ flags.lock()
from AthenaCommon.Constants import INFO,DEBUG
acc = ComponentAccumulator()
-# make sure we run the right scheduler
-# need to move elsewhere
-
-nThreads=1
-
-from StoreGate.StoreGateConf import SG__HiveMgrSvc
-eventDataSvc = SG__HiveMgrSvc("EventDataSvc")
-eventDataSvc.NSlots = nThreads
-eventDataSvc.OutputLevel = DEBUG
-acc.addService( eventDataSvc )
-
-from SGComps.SGCompsConf import SGInputLoader
-inputLoader = SGInputLoader(DetStore = 'StoreGateSvc/DetectorStore',
- EvtStore = 'StoreGateSvc',
- ExtraInputs = [],
- ExtraOutputs = [],
- FailIfNoProxy = False,
- Load = [],
- NeededResources = [])
-
-acc.addEventAlgo( inputLoader)
-
from ByteStreamCnvSvc.ByteStreamConfig import TrigBSReadCfg
acc.merge(TrigBSReadCfg(flags ))
-#from AtlasGeoModel.GeoModelConfig import GeoModelCfg
-#acc.merge(GeoModelCfg(flags ))
from TrigUpgradeTest.TriggerHistSvcConfig import TriggerHistSvcConfig
acc.merge(TriggerHistSvcConfig(flags ))
@@ -66,22 +42,9 @@ from TriggerMenuMT.HLTMenuConfig.Menu.GenerateMenuMT_newJO import generateMenu
from TriggerJobOpts.TriggerConfig import triggerRunCfg
acc.merge( triggerRunCfg( flags, generateMenu ) )
-
-
-from EventInfoMgt.EventInfoMgtConf import TagInfoMgr
-tagInfoMgr = TagInfoMgr()
-tagInfoMgr.ExtraTagValuePairs = ['AtlasRelease', 'Athena-22.0.1'] # this has to come from somewhere else
-acc.addService( tagInfoMgr )
-
-acc.getService("EventPersistencySvc").CnvServices += [ tagInfoMgr.getName() ]
-acc.getService("ProxyProviderSvc").ProviderNames += [ tagInfoMgr.getName() ]
-acc.getService("IOVDbSvc").Folders += ['/TagInfo<metaOnly/>']
-
-
-
-# setup algorithm sequences here, need few additional components
+# TODO take care of merging RegSel, and remove it from here
from RegionSelector.RegSelConfig import RegSelConfig
-rsc, regSel = RegSelConfig( ConfigFlags )
+rsc, regSel = RegSelConfig( flags )
regSel.enableCalo=True
regSel.enableID=False
regSel.enablePixel = False
--
GitLab