Skip to content
Snippets Groups Projects
Commit ab3a710b authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'compare_test_split' into 'master' 

reorganize and split the unit tests in AnalysisAlgorithmsConfig

See merge request !60324
parents d3a44a9d 221eaf65
No related branches found
No related tags found
1 merge request!60324reorganize and split the unit tests in AnalysisAlgorithmsConfig
Hide whitespace changes
Inline Side-by-side
PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/CMakeLists.txt
+ 72
− 83
View file @ ab3a710b
...@@ -12,93 +12,82 @@ if( XAOD_STANDALONE ) ...@@ -12,93 +12,82 @@ if( XAOD_STANDALONE )
atlas_install_scripts( share/*_eljob.py ) atlas_install_scripts( share/*_eljob.py )
atlas_add_test( testJobData function( add_test_job NAME DATA_TYPE )
SCRIPT FullCPAlgorithmsTest_eljob.py --data-type data --unit-test --direct-driver
POST_EXEC_SCRIPT nopost.sh atlas_add_test( ${NAME}
PROPERTIES TIMEOUT 600 ) SCRIPT FullCPAlgorithmsTest_eljob.py --data-type ${DATA_TYPE} --direct-driver --submission-dir submitDir-${NAME} ${ARGN}
atlas_add_test( testJobFullSim POST_EXEC_SCRIPT nopost.sh
SCRIPT FullCPAlgorithmsTest_eljob.py --data-type mc --unit-test --direct-driver PROPERTIES TIMEOUT 900 )
POST_EXEC_SCRIPT nopost.sh
PROPERTIES TIMEOUT 600 ) endfunction()
atlas_add_test( testJobFastSim
SCRIPT FullCPAlgorithmsTest_eljob.py --data-type afii --unit-test --direct-driver function( add_test_compare NAME DATA_TYPE NAME1 NAME2 )
POST_EXEC_SCRIPT nopost.sh
PROPERTIES TIMEOUT 600 ) atlas_add_test( ${NAME}
SCRIPT compareFlatTrees analysis submitDir-${NAME1}/data-ANALYSIS/${DATA_TYPE}.root submitDir-${NAME2}/data-ANALYSIS/${DATA_TYPE}.root
atlas_add_test( testJobDataConfig POST_EXEC_SCRIPT nopost.sh
SCRIPT FullCPAlgorithmsTest_eljob.py --data-type data --unit-test --direct-driver --block-config PROPERTIES TIMEOUT 900
POST_EXEC_SCRIPT nopost.sh DEPENDS ${NAME1} ${NAME2})
PROPERTIES TIMEOUT 600 )
atlas_add_test( testJobFullSimConfig endfunction()
SCRIPT FullCPAlgorithmsTest_eljob.py --data-type mc --unit-test --direct-driver --block-config
POST_EXEC_SCRIPT nopost.sh
PROPERTIES TIMEOUT 600 )
atlas_add_test( testJobFastSimConfig
SCRIPT FullCPAlgorithmsTest_eljob.py --data-type afii --unit-test --direct-driver --block-config
POST_EXEC_SCRIPT nopost.sh
PROPERTIES TIMEOUT 600 )
atlas_add_test( testJobDataLite
SCRIPT FullCPAlgorithmsTest_eljob.py --data-type data --unit-test --direct-driver --physlite --no-physlite-broken
POST_EXEC_SCRIPT nopost.sh
PROPERTIES TIMEOUT 600 )
atlas_add_test( testJobFullSimLite
SCRIPT FullCPAlgorithmsTest_eljob.py --data-type mc --unit-test --direct-driver --physlite --no-physlite-broken
POST_EXEC_SCRIPT nopost.sh
PROPERTIES TIMEOUT 600 )
atlas_add_test( testJobFastSimLite
SCRIPT FullCPAlgorithmsTest_eljob.py --data-type afii --unit-test --direct-driver --physlite --no-physlite-broken
POST_EXEC_SCRIPT nopost.sh
PROPERTIES TIMEOUT 600 )
atlas_add_test( testJobDataConfigLite
SCRIPT FullCPAlgorithmsTest_eljob.py --data-type data --unit-test --direct-driver --block-config --physlite --no-physlite-broken
POST_EXEC_SCRIPT nopost.sh
PROPERTIES TIMEOUT 600 )
# FIX ME: this currently fails on the muons
# atlas_add_test( testJobFullSimConfigLite
# SCRIPT FullCPAlgorithmsTest_eljob.py --data-type mc --unit-test --direct-driver --block-config --physlite --no-physlite-broken
# POST_EXEC_SCRIPT nopost.sh
# PROPERTIES TIMEOUT 600 )
atlas_add_test( testJobFastSimConfigLite
SCRIPT FullCPAlgorithmsTest_eljob.py --data-type afii --unit-test --direct-driver --block-config --physlite --no-physlite-broken
POST_EXEC_SCRIPT nopost.sh
PROPERTIES TIMEOUT 600 )
else() else()
atlas_install_joboptions( share/*_jobOptions.py ) atlas_install_joboptions( share/*_jobOptions.py )
atlas_add_test( testJobDataCompare function( add_test_job NAME DATA_TYPE )
SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/share/BlockConfigurationAthenaTest.sh data
POST_EXEC_SCRIPT nopost.sh atlas_add_test( ${NAME}
PROPERTIES TIMEOUT 1800 ) SCRIPT athena.py AnalysisAlgorithmsConfig/FullCPAlgorithmsTest_jobOptions.py --evtMax=500 - --force-output TestJobOutput-${NAME}.hist.root --data-type ${DATA_TYPE} ${ARGN}
POST_EXEC_SCRIPT nopost.sh
atlas_add_test( testJobFullSimCompare PROPERTIES TIMEOUT 900 )
SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/share/BlockConfigurationAthenaTest.sh mc
POST_EXEC_SCRIPT nopost.sh endfunction()
PROPERTIES TIMEOUT 1800 )
function( add_test_compare NAME DATA_TYPE NAME1 NAME2 )
atlas_add_test( testJobFastSimCompare
SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/share/BlockConfigurationAthenaTest.sh afii atlas_add_test( ${NAME}
POST_EXEC_SCRIPT nopost.sh SCRIPT acmd.py diff-root --error-mode resilient -t analysis TestJobOutput-${NAME1}.hist.root TestJobOutput-${NAME2}.hist.root
PROPERTIES TIMEOUT 1800 ) POST_EXEC_SCRIPT nopost.sh
PROPERTIES TIMEOUT 900
# FIXME: there are currently no configuration blocks that work on DEPENDS ${NAME1} ${NAME2})
# PHYSLITE, reenable this when there are
# atlas_add_test( testJobDataCompareLite endfunction()
# SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/share/BlockConfigurationAthenaTest.sh data --physlite
# POST_EXEC_SCRIPT nopost.sh endif()
# PROPERTIES TIMEOUT 600 )
# atlas_add_test( testJobFullSimCompareLite
# SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/share/BlockConfigurationAthenaTest.sh mc --physlite add_test_job( TestJobDataSequence data --for-compare --no-systematics )
# POST_EXEC_SCRIPT nopost.sh add_test_job( TestJobDataConfig data --for-compare --block-config --no-systematics )
# PROPERTIES TIMEOUT 600 ) add_test_compare( TestJobDataCompare data TestJobDataSequence TestJobDataConfig )
# atlas_add_test( testJobFastSimCompareLite add_test_job( TestJobFullSimSequence mc --for-compare )
# SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/share/BlockConfigurationAthenaTest.sh afii --physlite add_test_job( TestJobFullSimConfig mc --for-compare --block-config )
# POST_EXEC_SCRIPT nopost.sh add_test_compare( TestJobFullSimCompare mc TestJobFullSimSequence TestJobFullSimConfig )
# PROPERTIES TIMEOUT 600 )
add_test_job( TestJobFastSimSequence afii --for-compare )
add_test_job( TestJobFastSimConfig afii --for-compare --block-config )
add_test_compare( TestJobFastSimCompare afii TestJobFastSimSequence TestJobFastSimConfig )
# FIX ME: There are some issues with the PHYSLITE tests that need to
# be investigated, but until that happens I run some tests only in
# AnalysisBase, and disable comparisons alltogether.
add_test_job( TestJobDataSequenceLite data --for-compare --physlite --no-physlite-broken --no-systematics )
add_test_job( TestJobDataConfigLite data --for-compare --block-config --physlite --no-physlite-broken --no-systematics )
#add_test_compare( TestJobDataCompareLite data TestJobDataSequenceLite TestJobDataConfigLite )
if( XAOD_STANDALONE )
add_test_job( TestJobFullSimSequenceLite mc --for-compare --physlite --no-physlite-broken )
add_test_job( TestJobFullSimConfigLite mc --for-compare --block-config --physlite --no-physlite-broken )
#add_test_compare( TestJobFullSimCompareLite mc TestJobFullSimSequenceLite TestJobFullSimConfigLite )
add_test_job( TestJobFastSimSequenceLite afii --for-compare --physlite --no-physlite-broken )
add_test_job( TestJobFastSimConfigLite afii --for-compare --block-config --physlite --no-physlite-broken )
#add_test_compare( TestJobFastSimCompareLite afii TestJobFastSimSequenceLite TestJobFastSimConfigLite )
endif() endif()
PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/FullCPAlgorithmsTest.py
+ 1
− 0
View file @ ab3a710b
...@@ -624,6 +624,7 @@ def makeSequenceBlocks (dataType, algSeq, forCompare, isPhyslite, noPhysliteBrok ...@@ -624,6 +624,7 @@ def makeSequenceBlocks (dataType, algSeq, forCompare, isPhyslite, noPhysliteBrok
configSeq.setOptionValue ('.saveCutBookkeepers', True) configSeq.setOptionValue ('.saveCutBookkeepers', True)
configSeq.setOptionValue ('.runNumber', 284500) configSeq.setOptionValue ('.runNumber', 284500)
configSeq.setOptionValue ('.cutBookkeepersSystematics', True) configSeq.setOptionValue ('.cutBookkeepersSystematics', True)
vars += [ 'EventInfo.generatorWeight_%SYS% -> generatorWeight_%SYS%', ]
# Include, and then set up the trigger analysis sequence: # Include, and then set up the trigger analysis sequence:
......
PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/share/FullCPAlgorithmsTest_jobOptions.py
+ 1
− 1
View file @ ab3a710b
...@@ -81,7 +81,7 @@ if not blockConfig : ...@@ -81,7 +81,7 @@ if not blockConfig :
else : else :
outputFile = "ANALYSIS DATAFILE='FullCPAlgorithmsConfigTest." + dataType + ".hist.root' OPT='RECREATE'" outputFile = "ANALYSIS DATAFILE='FullCPAlgorithmsConfigTest." + dataType + ".hist.root' OPT='RECREATE'"
if athArgs.force_output : if athArgs.force_output :
outputFile = athArgs.force_output outputFile = "ANALYSIS DATAFILE='" + athArgs.force_output + "' OPT='RECREATE'"
ServiceMgr.THistSvc.Output += [ outputFile ] ServiceMgr.THistSvc.Output += [ outputFile ]
# Reduce the printout from Athena: # Reduce the printout from Athena:
......
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