Commit e3f74106 authored by scott snyder's avatar scott snyder
Browse files

AthenaPoolTest: python3 fixes

 - print function
 - Service()
 - relative imports
parent 09553919
......@@ -48,7 +48,6 @@ topSequence += AthenaPoolTestDataReader( "AthenaPoolTestDataReader" )
#--------------------------------------------------------------
# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
#--------------------------------------------------------------
svcMgr.MessageSvc = Service( "MessageSvc" )
svcMgr.MessageSvc.OutputLevel = WARNING
svcMgr.MessageSvc.debugLimit = 100000
#rds ClassIDSvc = Service( "ClassIDSvc" )
......@@ -57,7 +56,8 @@ AthenaPoolTestDataReader.OutputLevel = DEBUG
#svcMgr.StoreGateSvc = Service( "StoreGateSvc" )
#svcMgr.StoreGateSvc.Dump = TRUE
AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
from AthenaServices import AthenaServicesConf
AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr()
AthenaEventLoopMgr.OutputLevel = INFO
# Turn on the tree cache for the CollectionTree - tree cache only
......
......@@ -51,12 +51,12 @@ topSequence += AthenaPoolTestDataReader( "AthenaPoolTestDataReader" )
#--------------------------------------------------------------
# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
#--------------------------------------------------------------
svcMgr.MessageSvc = Service( "MessageSvc" )
svcMgr.MessageSvc.OutputLevel = WARNING
svcMgr.MessageSvc.debugLimit = 100000
AthenaPoolTestDataReader.OutputLevel = DEBUG
AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
from AthenaServices import AthenaServicesConf
AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr()
AthenaEventLoopMgr.OutputLevel = DEBUG
# Turn on the tree cache for the CollectionTree - tree cache only
......
......@@ -63,7 +63,7 @@ AthenaPoolTestDataWriter.ReadOtherHalf = TRUE
include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" )
include( "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPoolItemList_joboptions.py" )
print fullItemList
printfunc (fullItemList)
from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
Stream1 = AthenaPoolOutputStream( "Stream1", noTag=True )
......@@ -85,12 +85,11 @@ Stream1.ItemList += ["IAthenaPoolTestCollection#AthenaPoolTestCollection_2"]
Stream1.ItemList += ["IAthenaPoolTestCollection#AthenaPoolTestCollection_3"]
Stream1.ItemList += ["AthenaPoolTestMatrix#*"]
print Stream1.ItemList
printfunc (Stream1.ItemList)
#--------------------------------------------------------------
# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
#--------------------------------------------------------------
svcMgr.MessageSvc = Service( "MessageSvc" )
svcMgr.MessageSvc.OutputLevel = WARNING
svcMgr.MessageSvc.debugLimit = 100000
#rds ClassIDSvc = Service( "ClassIDSvc" )
......@@ -98,7 +97,8 @@ svcMgr.MessageSvc.debugLimit = 100000
svcMgr.AthenaSealSvc.OutputLevel = WARNING
AthenaPoolTestDataWriter.OutputLevel = DEBUG
AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
from AthenaServices import AthenaServicesConf
AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr()
AthenaEventLoopMgr.OutputLevel = INFO
# No stats printout
......
......@@ -65,7 +65,7 @@ AthenaPoolTestDataWriter.ReadOtherHalf = TRUE
include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" )
include( "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPoolItemList_joboptions.py" )
print fullItemList
printfunc (fullItemList)
from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
Stream3 = AthenaPoolOutputStream( "Stream3", noTag=True )
......@@ -86,23 +86,24 @@ Stream3.ItemList += ["IAthenaPoolTestCollection#AthenaPoolTestCollection_2"]
Stream3.ItemList += ["IAthenaPoolTestCollection#AthenaPoolTestCollection_3"]
Stream3.ItemList += ["AthenaPoolTestMatrix#*"]
print Stream3.ItemList
printfunc (Stream3.ItemList)
# Change output file catalog to avoid collisions.
PoolSvc = Service( 'PoolSvc' )
from PoolSvc import PoolSvcConf
PoolSvc = PoolSvcConf.PoolSvc()
PoolSvc.WriteCatalog = 'file:AthenaPoolTestStep2WriteDoubleSelector_catalog.xml'
#--------------------------------------------------------------
# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
#--------------------------------------------------------------
svcMgr.MessageSvc = Service( "MessageSvc" )
svcMgr.MessageSvc.OutputLevel = WARNING
svcMgr.MessageSvc.debugLimit = 100000
svcMgr.AthenaSealSvc.OutputLevel = WARNING
AthenaPoolTestDataWriter.OutputLevel = DEBUG
AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
from AthenaServices import AthenaServicesConf
AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr()
AthenaEventLoopMgr.OutputLevel = INFO
# No stats printout
......
......@@ -80,7 +80,7 @@ AthenaPoolTestDataWriter.OutputLevel = DEBUG
include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" )
include( "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPoolItemList_joboptions.py" )
print fullItemList
printfunc (fullItemList)
# Stream's output file
from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
......@@ -94,7 +94,7 @@ Stream1.ItemList += fullItemList
#Stream1.ItemList = [ o for o in Stream1.ItemList if not o in 'AthenaPoolTestMap#*' ]
#Stream1.ItemList = [ o for o in Stream1.ItemList if not o == 'PileUpEventInfo#*' ]
print Stream1.ItemList
printfunc (Stream1.ItemList)
#--------------------------------------------------------------
# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
......@@ -106,7 +106,8 @@ svcMgr.MessageSvc.debugLimit = 100000
#rds svcMgr.ClassIDSvc.OutputLevel = 3
svcMgr.AthenaSealSvc.OutputLevel = WARNING
AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
from AthenaServices import AthenaServicesConf
AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr()
AthenaEventLoopMgr.OutputLevel = INFO
#svcMgr.StoreGateSvc = Service( "StoreGateSvc" )
......
......@@ -95,8 +95,8 @@ Stream1.ItemList = [ o for o in Stream1.ItemList if not o in 'IAthenaPoolTestCol
Stream2.ItemList = [ o for o in Stream2.ItemList if not o in 'dummy_E#*' ]
Stream2.ItemList = [ o for o in Stream2.ItemList if not o in 'AthenaPoolTestMatrix#*' ]
print "Stream1.ItemList ",Stream1.ItemList
print "Stream2.ItemList ",Stream2.ItemList
printfunc ("Stream1.ItemList ",Stream1.ItemList)
printfunc ("Stream2.ItemList ",Stream2.ItemList)
#--------------------------------------------------------------
# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
......@@ -106,7 +106,8 @@ svcMgr.MessageSvc.debugLimit = 100000
svcMgr.AthenaSealSvc.OutputLevel = WARNING
AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
from AthenaServices import AthenaServicesConf
AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr()
AthenaEventLoopMgr.OutputLevel = INFO
# No stats printout
......
......@@ -77,10 +77,11 @@ topSequence += CfgGetter.getAlgorithm("CopyTimings")
#--------------------------------------------------------------
from AthenaCommon.ConcurrencyFlags import jobproperties as jp
nThreads = jp.ConcurrencyFlags.NumThreads()
from AthenaServices import AthenaServicesConf
if nThreads > 0:
EventLoop = Service("AthenaHiveEventLoopMgr")
EventLoop = AthenaServicesConf.AthenaHiveEventLoopMgr()
else:
EventLoop = Service("AthenaEventLoopMgr")
EventLoop = AthenaServicesConf.AthenaEventLoopMgr()
EventLoop.UseSecondaryEventNumber = True
EventLoop.OutputLevel = INFO
svcMgr += EventLoop
......@@ -110,7 +111,6 @@ Stream1.ItemList += ["RecoTimingObj#EVNTtoHITS_timings"]
#--------------------------------------------------------------
# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
#--------------------------------------------------------------
svcMgr.MessageSvc = Service( "MessageSvc" )
svcMgr.MessageSvc.debugLimit = 100000
# No stats printout
......
......@@ -87,7 +87,8 @@ topSequence += EventInfoReader( "EventInfoReader" )
svcMgr.MessageSvc.OutputLevel = INFO
svcMgr.MessageSvc.debugLimit = 100000
AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
from AthenaServices import AthenaServicesConf
AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr()
AthenaEventLoopMgr.OutputLevel = INFO
EventInfoReader.OutputLevel = DEBUG
......
......@@ -104,7 +104,7 @@ topSequence += EventInfoWriter( "EventInfoWriter" )
# ItemList:
include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" )
print fullItemList
printfunc (fullItemList)
# Stream's output file
from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
......@@ -120,7 +120,8 @@ svcMgr.MessageSvc.debugLimit = 100000
#rds svcMgr.ClassIDSvc = Service( "ClassIDSvc" )
#rds svcMgr.ClassIDSvc.OutputLevel = 3
AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
from AthenaServices import AthenaServicesConf
AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr()
AthenaEventLoopMgr.OutputLevel = INFO
svcMgr.TagInfoMgr.OutputLevel = DEBUG
......
......@@ -91,7 +91,7 @@ topSequence += EventInfoWriter( "EventInfoWriter" )
# ItemList:
include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" )
print fullItemList
printfunc (fullItemList)
# Stream's output file - Run OutputStream as an algorithm
......@@ -104,7 +104,6 @@ Stream1.ItemList += fullItemList
#--------------------------------------------------------------
# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
#--------------------------------------------------------------
svcMgr.MessageSvc = Service( "MessageSvc" )
svcMgr.MessageSvc.OutputLevel = INFO
svcMgr.MessageSvc.debugLimit = 100000
......@@ -112,7 +111,8 @@ EventInfoWriter.OutputLevel = DEBUG
#EventInfoWriter.CreateDummyTags = True
#EventInfoWriter.CreateDummyOverrideTags = True
AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
from AthenaServices import AthenaServicesConf
AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr()
AthenaEventLoopMgr.OutputLevel = INFO
# TagInfoMgr r/w TagInfo
......
......@@ -86,7 +86,7 @@ topSequence += EventInfoWriter( "EventInfoWriter" )
# ItemList:
include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" )
print fullItemList
printfunc (fullItemList)
# Run OutputStream as an algorithm
......@@ -99,11 +99,11 @@ Stream1.ItemList += fullItemList
#--------------------------------------------------------------
# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
#--------------------------------------------------------------
svcMgr.MessageSvc = Service( "MessageSvc" )
svcMgr.MessageSvc.OutputLevel = INFO
svcMgr.MessageSvc.debugLimit = 100000
AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
from AthenaServices import AthenaServicesConf
AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr()
AthenaEventLoopMgr.OutputLevel = INFO
EventInfoWriter.OutputLevel = DEBUG
......@@ -111,7 +111,6 @@ EventInfoWriter.CreateDummyTags = True
#EventInfoWriter.CreateDummyOverrideTags = True
# Must force GeoModel to ignore differences
svcMgr.GeoModelSvc = Service( "GeoModelSvc" )
svcMgr.GeoModelSvc.IgnoreTagDifference = True
# TagInfoMgr r/w TagInfo
......
......@@ -86,7 +86,7 @@ topSequence += EventInfoWriter( "EventInfoWriter" )
# ItemList:
include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" )
print fullItemList
printfunc (fullItemList)
# Run OutputStream as an algorithm
......@@ -99,11 +99,11 @@ Stream1.ItemList += fullItemList
#--------------------------------------------------------------
# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
#--------------------------------------------------------------
svcMgr.MessageSvc = Service( "MessageSvc" )
svcMgr.MessageSvc.OutputLevel = INFO
svcMgr.MessageSvc.debugLimit = 100000
AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
from AthenaServices import AthenaServicesConf
AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr()
AthenaEventLoopMgr.OutputLevel = INFO
EventInfoWriter.OutputLevel = DEBUG
......
......@@ -86,7 +86,7 @@ topSequence += EventInfoWriter( "EventInfoWriter" )
# ItemList:
include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" )
print fullItemList
printfunc (fullItemList)
# Run OutputStream as an algorithm
......@@ -99,11 +99,11 @@ Stream1.ItemList += fullItemList
#--------------------------------------------------------------
# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
#--------------------------------------------------------------
svcMgr.MessageSvc = Service( "MessageSvc" )
svcMgr.MessageSvc.OutputLevel = INFO
svcMgr.MessageSvc.debugLimit = 100000
AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
from AthenaServices import AthenaServicesConf
AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr()
AthenaEventLoopMgr.OutputLevel = INFO
EventInfoWriter.OutputLevel = DEBUG
......
......@@ -73,12 +73,12 @@ topSequence += InDetRawDataFakeReader( "InDetRawDataFakeReader" )
#--------------------------------------------------------------
# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
#--------------------------------------------------------------
svcMgr.MessageSvc = Service( "MessageSvc" )
svcMgr.MessageSvc.OutputLevel = WARNING
svcMgr.MessageSvc.debugLimit = 100000
InDetRawDataFakeReader.OutputLevel = DEBUG
AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
from AthenaServices import AthenaServicesConf
AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr()
AthenaEventLoopMgr.OutputLevel = INFO
# No stats printout
......
......@@ -101,7 +101,8 @@ svcMgr.MessageSvc.errorLimit = 100000
#ClassIDSvc.OutputLevel = INFO
InDetRawDataFakeWriter.OutputLevel = DEBUG
AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
from AthenaServices import AthenaServicesConf
AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr()
AthenaEventLoopMgr.OutputLevel = INFO
# No stats printout
......
......@@ -75,14 +75,14 @@ topSequence += LArCellContFakeReader( "LArCellContFakeReader" )
#--------------------------------------------------------------
# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
#--------------------------------------------------------------
svcMgr.MessageSvc = Service( "MessageSvc" )
svcMgr.MessageSvc.OutputLevel = WARNING
svcMgr.MessageSvc.debugLimit = 100000
LArCellContFakeReader.OutputLevel = DEBUG
#svcMgr.AthenaEventLoopMgr.OutputLevel = DEBUG
AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
from AthenaServices import AthenaServicesConf
AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr()
AthenaEventLoopMgr.OutputLevel = INFO
# No stats printout
......
......@@ -94,7 +94,8 @@ svcMgr.MessageSvc.errorLimit = 100000
#svcMgr.ClassIDSvc.OutputLevel = DEBUG
LArCellContFakeWriter.OutputLevel = DEBUG
AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
from AthenaServices import AthenaServicesConf
AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr()
AthenaEventLoopMgr.OutputLevel = INFO
# No stats printout
......
......@@ -78,11 +78,11 @@ LArCellContFakeReader.OutputLevel = DEBUG
#--------------------------------------------------------------
# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
#--------------------------------------------------------------
svcMgr.MessageSvc = Service( "MessageSvc" )
svcMgr.MessageSvc.OutputLevel = WARNING
svcMgr.MessageSvc.debugLimit = 100000
AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
from AthenaServices import AthenaServicesConf
AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr()
AthenaEventLoopMgr.OutputLevel = INFO
# No stats printout
......
......@@ -96,16 +96,17 @@ Stream1.ItemList += ["SCT_RDO_Container#*"]
Stream1.ItemList += ["TRT_RDO_Container#*"]
Stream1.ItemList += ["PixelRDOElemLinkVec#*"]
print Stream1.ItemList
printfunc (Stream1.ItemList)
#--------------------------------------------------------------
# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
#--------------------------------------------------------------
svcMgr.MessageSvc = Service( "MessageSvc" )
svcMgr.MessageSvc.OutputLevel = WARNING
svcMgr.MessageSvc.debugLimit = 100000
AthenaEventLoopMgr = Service( "AthenaEventLoopMgr" )
from AthenaServices import AthenaServicesConf
AthenaEventLoopMgr = AthenaServicesConf.AthenaEventLoopMgr()
AthenaEventLoopMgr.OutputLevel = INFO
# No stats printout
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment