diff --git a/Trigger/TrigSteer/ViewAlgsTest/share/BasicMTTrackingTrigger.py b/Trigger/TrigSteer/ViewAlgsTest/share/BasicMTTrackingTrigger.py index 0d56fea97936f7e77e66832c1d34000e95e849ba..310dd2b10199a8e06c63394741e861845b8807c8 100644 --- a/Trigger/TrigSteer/ViewAlgsTest/share/BasicMTTrackingTrigger.py +++ b/Trigger/TrigSteer/ViewAlgsTest/share/BasicMTTrackingTrigger.py @@ -225,7 +225,7 @@ topSequence += InDetSiTrackerSpacePointFinder from TrigFastTrackFinder.TrigFastTrackFinderMT_Config import TrigFastTrackFinderMT_eGamma theFTFMT = TrigFastTrackFinderMT_eGamma() -topSequence += theFTFMT +#topSequence += theFTFMT log.info(theFTFMT) #probably initialized only in trigger=True? diff --git a/Trigger/TrigSteer/ViewAlgsTest/share/ID_RawDataMT_Trigger.py b/Trigger/TrigSteer/ViewAlgsTest/share/ID_RawDataMT_Trigger.py index 7df074a9b002d58f9aa58fbe562b0dcdecaf6603..0dc3b7d9894794d1d8d4defc9dc53b3725e56995 100644 --- a/Trigger/TrigSteer/ViewAlgsTest/share/ID_RawDataMT_Trigger.py +++ b/Trigger/TrigSteer/ViewAlgsTest/share/ID_RawDataMT_Trigger.py @@ -280,6 +280,6 @@ from TrigFastTrackFinder.TrigFastTrackFinderMT_Config import TrigFastTrackFinder theFTFMT = TrigFastTrackFinderMT_eGamma() theFTFMT.outputLevel=VERBOSE -topSequence += theFTFMT +#topSequence += theFTFMT diff --git a/Trigger/TrigSteer/ViewAlgsTest/share/caloRoIData.dat b/Trigger/TrigSteer/ViewAlgsTest/share/caloRoIData.dat index 611f10daa431d6d693e0e4658ad00469e0e25aaa..5ddb68f362b8796f38e4ee2d8e3d4c7550e94975 100644 --- a/Trigger/TrigSteer/ViewAlgsTest/share/caloRoIData.dat +++ b/Trigger/TrigSteer/ViewAlgsTest/share/caloRoIData.dat @@ -1 +1,2 @@ -1.3,2.9,2704088841,EM3,EM7; 1.2,3.1,2972524297,EM3,EM7,EM10 +1.3,2.9,2704088841,EM3,EM7 +1.2,3.1,2972524297,EM3,EM7,EM10 diff --git a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt index 05e50a655e5c00147e8ab7353d9a49965de79b5c..7f7716d92e7bc6e29c99525370251c2a7d7f37fb 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt +++ b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt @@ -6,7 +6,19 @@ atlas_subdir( TrigUpgradeTest ) # Declare the package's dependencies: -atlas_depends_on_subdirs( PUBLIC - TestPolicy - ) -atlas_install_runtime( test/TrigUpgradeTest_TestConfiguration.xml ) +#atlas_depends_on_subdirs( PUBLIC +# TestPolicy +# ) + +atlas_add_test( GraphView1 SCRIPT scripts/GraphView.sh + ENVIRONMENT THREADS=1 ) +atlas_add_test( GraphView2 SCRIPT scripts/GraphView.sh + ENVIRONMENT THREADS=2 ) +atlas_add_test( GraphView64 SCRIPT scripts/GraphView.sh + ENVIRONMENT THREADS=64 ) + +atlas_add_test( IDRunMC SCRIPT scripts/IDRunMC.sh + ) +atlas_add_test( IDRunData SCRIPT scripts/IDRunData.sh + ) + diff --git a/Trigger/TrigValidation/TrigUpgradeTest/scripts/GraphView.sh b/Trigger/TrigValidation/TrigUpgradeTest/scripts/GraphView.sh new file mode 100755 index 0000000000000000000000000000000000000000..94c8696f7c8bd7e06681de1f25164d542416f7f9 --- /dev/null +++ b/Trigger/TrigValidation/TrigUpgradeTest/scripts/GraphView.sh @@ -0,0 +1,2 @@ +get_files -data menuData.dat +athena.py --threads=$THREADS AthViews/GraphViews.py diff --git a/Trigger/TrigValidation/TrigUpgradeTest/scripts/IDRunData.sh b/Trigger/TrigValidation/TrigUpgradeTest/scripts/IDRunData.sh new file mode 100755 index 0000000000000000000000000000000000000000..7a0e6b41ed931d370e358b164741db52d7ec1b56 --- /dev/null +++ b/Trigger/TrigValidation/TrigUpgradeTest/scripts/IDRunData.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env sh +get_files -xmls LVL1config_Physics_pp_v7.xml +athena.py --threads=1 ViewAlgsTest/ID_RawDataMT_Trigger.py diff --git a/Trigger/TrigValidation/TrigUpgradeTest/scripts/IDRunMC.sh b/Trigger/TrigValidation/TrigUpgradeTest/scripts/IDRunMC.sh new file mode 100755 index 0000000000000000000000000000000000000000..5e6f116e3d321ebb12c5b52f049ecc8e01b14fdc --- /dev/null +++ b/Trigger/TrigValidation/TrigUpgradeTest/scripts/IDRunMC.sh @@ -0,0 +1,4 @@ +get_files -xmls LVL1config_Physics_pp_v7.xml +get_files -data caloRoIData.dat +source RecExCommon_links.sh +athena.py --threads=1 ViewAlgsTest/BasicMTTrackingTrigger.py diff --git a/Trigger/TrigValidation/TrigUpgradeTest/scripts/menuRun.sh b/Trigger/TrigValidation/TrigUpgradeTest/scripts/menuRun.sh new file mode 100755 index 0000000000000000000000000000000000000000..0ab1991d04bb9aafdbfa303754300656248337f5 --- /dev/null +++ b/Trigger/TrigValidation/TrigUpgradeTest/scripts/menuRun.sh @@ -0,0 +1,4 @@ +get_files -data menuData.dat +get_files -xmls LVL1config_Physics_pp_v7.xml +get_files -xmls HLTTestMenu.xml +athena.py ViewAlgsTest/menuRun.py diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/TrigUpgradeTest_TestConfiguration.xml b/Trigger/TrigValidation/TrigUpgradeTest/test/TrigUpgradeTest_TestConfiguration.xml deleted file mode 100644 index 1eb71661e37fcee198d6324fecde5c53b8a02710..0000000000000000000000000000000000000000 --- a/Trigger/TrigValidation/TrigUpgradeTest/test/TrigUpgradeTest_TestConfiguration.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE unifiedTestConfiguration SYSTEM "http://www.hep.ucl.ac.uk/atlas/AtlasTesting/DTD/unifiedTestConfiguration.dtd"> -<!-- - *************************************************************************** - * - * TrigP1Test_TestConfiguration.xml.autoconf - * - * This file is used as input to test-xml-autoconf.py during the build. - * It will create TrigP1Test_TestConfiguraton.xml on-the-fly, which is - * used by ATN and RTT tests. - * - * For detailed syntax see: TrigValTools/bin/test-xml-autoconf.py - * - *************************************************************************** - --> -<!-- NB validate this file here before commiting to svn: - /afs/cern.ch/user/r/rtt/public/xmlvalidate.py TrigP1Test_TestConfiguration.xml - --> - -<unifiedTestConfiguration> - - <atn> - <TEST name="menuRun" type="script" suite="TUT"> - <options_atn>get_files -xmls LVL1config_Physics_pp_v7.xml; get_files -xmls HLTTestMenu.xml; athena.py ViewAlgsTest/menuRun.py</options_atn> - <timelimit>5</timelimit> - <expectations> - <returnValue>0</returnValue> - </expectations> - </TEST> - <TEST name="IDRunMC" type="script" suite="TUT"> - <options_atn>get_files -xmls LVL1config_Physics_pp_v7.xml; get_files -data caloRoIData.dat; athena.py --threads=1 ViewAlgsTest/BasicMTTrackingTrigger.py</options_atn> - <timelimit>20</timelimit> - <expectations> - <returnValue>0</returnValue> - </expectations> - </TEST> - <TEST name="IDRunData" type="script" suite="TUT"> - <options_atn>get_files -xmls LVL1config_Physics_pp_v7.xml; athena.py --threads=1 ViewAlgsTest/ID_RawDataMT_Trigger.py</options_atn> - <timelimit>20</timelimit> - <expectations> - <returnValue>0</returnValue> - </expectations> - </TEST> - <TEST name="GraphView1" type="script" suite="TUT"> - <options_atn>athena.py --threads=1 AthViews/GraphViews.py </options_atn> - <timelimit>5</timelimit> - <expectations> - <returnValue>0</returnValue> - </expectations> - </TEST> - <TEST name="GraphView2" type="script" suite="TUT"> - <options_atn>athena.py --threads=2 AthViews/GraphViews.py </options_atn> - <timelimit>5</timelimit> - <expectations> - <returnValue>0</returnValue> - </expectations> - </TEST> - <TEST name="GraphView64" type="script" suite="TUT"> - <options_atn>athena.py --threads=64 AthViews/GraphViews.py </options_atn> - <timelimit>5</timelimit> - <expectations> - <returnValue>0</returnValue> - </expectations> - </TEST> - </atn> - -</unifiedTestConfiguration>