diff --git a/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_baseline_bench.py b/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_baseline_bench.py index cc52650f6290bafcba14bf84248dff09577b2b1e..0f356c97b6296b9a8b9d722cc33164d855b14b98 100755 --- a/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_baseline_bench.py +++ b/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_baseline_bench.py @@ -62,7 +62,7 @@ topSequence += AthExThinning__CreateData( # Pool Persistency #--------------------------------------------------------------- from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream -outStream = AthenaPoolOutputStream("OutStream") +outStream = AthenaPoolOutputStream("OutStream", noTag=True) outStream.ItemList = [ "EventInfo#McEventInfo"] outStream.ItemList += [ "AthExParticles#Particles" ] outStream.ItemList += [ "AthExDecay#TwoBodyDecay" ] diff --git a/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_evtgen.py b/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_evtgen.py index 65b3885d0ebe599950d0f2e414bf7405f0c7563f..8622bdf1c62654b283bc0343256e1e956f328a2f 100755 --- a/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_evtgen.py +++ b/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_evtgen.py @@ -81,7 +81,7 @@ topSequence += McAodBuilder( # Pool Persistency #--------------------------------------------------------------- from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream -outStream = AthenaPoolOutputStream("OutStream") +outStream = AthenaPoolOutputStream("OutStream", noTag=True) outStream.ItemList = [ "EventInfo#McEventInfo"] outStream.ItemList += [ "McEventCollection#GEN_EVENT" ] outStream.ItemList += [ "McEventCollection#GEN_AOD" ] diff --git a/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_noopalg_write_datahdr.py b/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_noopalg_write_datahdr.py index aa0fb83a595f333fd5b76385c3c189941d1f23e4..6b279d453d7b523ef647a9e61830b42e879b1d1a 100755 --- a/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_noopalg_write_datahdr.py +++ b/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_noopalg_write_datahdr.py @@ -50,7 +50,7 @@ topSequence += PerfMonTest__NoopAlg( "NoopAlg" ) # Pool Persistency #--------------------------------------------------------------- from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream -outStream = AthenaPoolOutputStream("OutStream") +outStream = AthenaPoolOutputStream("OutStream", noTag=True) outStream.ItemList = [] if not 'OUTPUT' in dir(): diff --git a/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_noopalg_write_evtinfo.py b/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_noopalg_write_evtinfo.py index dae085ebfee43e9db6450d3985052c5baa1c25a5..ce315e3984c88b0c796ec60cb4ea5184cb234a15 100755 --- a/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_noopalg_write_evtinfo.py +++ b/Control/PerformanceMonitoring/PerfMonTests/share/test_perfMonSvc_noopalg_write_evtinfo.py @@ -53,7 +53,7 @@ topSequence += PerfMonTest__NoopAlg( "NoopAlg" ) # Pool Persistency #--------------------------------------------------------------- from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream -outStream = AthenaPoolOutputStream("OutStream") +outStream = AthenaPoolOutputStream("OutStream", noTag=True) outStream.ItemList = [ "EventInfo#McEventInfo"] if not 'OUTPUT' in dir(): diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.cxx index 3616b6884f409d040f07785ff313d0b130f74185..8357d5308649078e4779367957f7b2133c1b0966 100755 --- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.cxx +++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.cxx @@ -89,9 +89,6 @@ BasicAlg::~BasicAlg() //////////////////////////// StatusCode BasicAlg::initialize() { - // configure our MsgStream - msg().setLevel( outputLevel() ); - ATH_MSG_INFO ( "Initializing " << name() << "..." ) ; // Get pointer to StoreGateSvc and cache it : diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestCpuCruncherAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestCpuCruncherAlg.cxx index caf54a4475948a734e2c677fb92c66b556a68f06..8a6ff92b243699a70a3b6dd026a6167d1f4bf203 100644 --- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestCpuCruncherAlg.cxx +++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestCpuCruncherAlg.cxx @@ -62,9 +62,6 @@ CpuCruncherAlg::~CpuCruncherAlg() //////////////////////////// StatusCode CpuCruncherAlg::initialize() { - // configure our MsgStream - msg().setLevel( outputLevel() ); - ATH_MSG_INFO ( "Initializing " << name() << "..." ) ; // retrieve random number svc diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.cxx index 500564ff3427928144ea3b19361ec777717c765a..7c0a0e22495d205d9c11c94d234731eedf0d6517 100644 --- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.cxx +++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.cxx @@ -45,9 +45,6 @@ ErroneousAlg::~ErroneousAlg() //////////////////////////// StatusCode ErroneousAlg::initialize() { - // configure our MsgStream - msg().setLevel( outputLevel() ); - ATH_MSG_INFO ( "Initializing " << name() << "..." ) ; return StatusCode::SUCCESS; } diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.cxx index c0e11e998d728eafea76b31ea32899d2a37eebde..5c33146b40740daea11804a4f15eeb30e2cb6140 100755 --- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.cxx +++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.cxx @@ -61,9 +61,6 @@ LeakyAlg::~LeakyAlg() //////////////////////////// StatusCode LeakyAlg::initialize() { - // configure our MsgStream - msg().setLevel( outputLevel() ); - ATH_MSG_INFO ( "Initializing " << name() << "..." ) ; // Get pointer to StoreGateSvc and cache it : diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.cxx index f66fe6170da0f3263a1e08158b8c76a3a4b564e8..355a8ec75f1f6ed5ab0d9fc8bd021dc74296fbce 100644 --- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.cxx +++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.cxx @@ -61,9 +61,6 @@ MallocAlg::~MallocAlg() //////////////////////////// StatusCode MallocAlg::initialize() { - // configure our MsgStream - msg().setLevel( outputLevel() ); - ATH_MSG_INFO ( "Initializing " << name() << "..." ) ; return StatusCode::SUCCESS; diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.cxx index 148118cf713d1e65d0d4f74e2df6a89ea1416a93..c85af253a76f5571ab1e0e01a3d7a25e759460a3 100755 --- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.cxx +++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.cxx @@ -60,9 +60,6 @@ ManyLeaksAlg::~ManyLeaksAlg() //////////////////////////// StatusCode ManyLeaksAlg::initialize() { - // configure our MsgStream - msg().setLevel( outputLevel() ); - ATH_MSG_INFO ( "Initializing " << name() << "..." ) ; // in m_pointers, we'll store the pointers to the allocated space diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.cxx index 80b56b6f13bb3168f7e4d10d1bf96c642dacb4f8..bf53de8b2c228fedbb0cd2560be89c0086607450 100755 --- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.cxx +++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.cxx @@ -48,9 +48,6 @@ NoopAlg::~NoopAlg() //////////////////////////// StatusCode NoopAlg::initialize() { - // configure our MsgStream - msg().setLevel( outputLevel() ); - ATH_MSG_INFO ( "Initializing " << name() << "..." ) ; // Get pointer to StoreGateSvc and cache it : diff --git a/Control/PerformanceMonitoring/PerfMonTests/test/PerfMonTests.xml b/Control/PerformanceMonitoring/PerfMonTests/test/PerfMonTests.xml index 383a1263099e3745cda1b203695ee8703b875533..e68154f794fbd75edaa18f5afa6901a20e1d8e87 100755 --- a/Control/PerformanceMonitoring/PerfMonTests/test/PerfMonTests.xml +++ b/Control/PerformanceMonitoring/PerfMonTests/test/PerfMonTests.xml @@ -79,6 +79,7 @@ </expectations> </TEST> +<!-- Problem running pythia <TEST name="EvtGen" type="script" suite="PerfMon"> <package_atn>Control/PerformanceMonitoring/PerfMonTests</package_atn> <options_atn>chappy.py PerfMonTests/atn_test_perfMonSvc_evtgen.py</options_atn> @@ -91,18 +92,6 @@ <returnValue>0</returnValue> </expectations> </TEST> - - <TEST name="TruthJets" type="script" suite="PerfMon"> - <package_atn>Control/PerformanceMonitoring/PerfMonTests</package_atn> - <options_atn>chappy.py PerfMonTests/atn_test_perfMonSvc_truthjets.py</options_atn> - <timelimit>10</timelimit> - <author> Sebastien Binet </author> - <mailto> binet@cern.ch </mailto> - <expectations> - <successMessage>All tests SUCCESSFULLY completed</successMessage> - <errorMessage>ERROR</errorMessage> - <returnValue>0</returnValue> - </expectations> - </TEST> +--> </atn>