diff --git a/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test_ART.conf b/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test_ART.conf index 0cc44e7b1e2447c1bd0bf9a87916d9cc4adfd35b..3f9a60409d1094c1b11312d0b563492183502515 100644 --- a/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test_ART.conf +++ b/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test_ART.conf @@ -59,19 +59,17 @@ test 2 test 13 - name HLT_physicsV7_rerunLVL1 - doc athenaHLT on data with Physics_pp_v7 menu currently from 2016 EB data + name HLT_physicsV8_rerunLVL1 + doc athenaHLT on data with Physics_pp_v8 menu currently from 2018 EB data filterlog filterREGTEST.py checklog --config checklogTrigP1Test.conf --showexcludestats - # TODO: fix reference - fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_rerunLVL1/trigp1test_HLT_physicsV7_rerunLVL1.reference - rootcomp /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_rerunLVL1/trigp1test_HLT_physicsV7_rerunLVL1.root - checkcount /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_rerunLVL1/trigp1test_HLT_physicsV7_rerunLVL1.root 1 HLT - athena_cmd athenaHLT.py -o HLT_physicsV7_rerunLVL1 -n 25 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -c 'testPhysicsV7=True;HLTOutputLevel=INFO;doValidation=True;rerunLVL1=True' TriggerRelease/runHLT_standalone.py -# post_command save_to_refdir.sh HLT_physicsV7_rerunLVL1._0001.data /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/online/references/ATN/latest + fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_rerunLVL1/trigp1test_HLT_physicsV8_rerunLVL1.reference + rootcomp /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_rerunLVL1/trigp1test_HLT_physicsV8_rerunLVL1.root + checkcount /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_rerunLVL1/trigp1test_HLT_physicsV8_rerunLVL1.root 1 HLT + athena_cmd athenaHLT.py -o HLT_physicsV8_rerunLVL1 -n 25 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -c 'testPhysicsV8=True;HLTOutputLevel=INFO;doValidation=True;rerunLVL1=True' TriggerRelease/runHLT_standalone.py +# post_command save_to_refdir.sh HLT_physicsV8_rerunLVL1._0001.data /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/online/references/ATN/latest post_command chainDump.py -n -S -# TODO: fix reference - post_test checkHist histSizes.py -t expert-monitoring.root ; cp post_test_checkHist.log checkHistathenaHLT.reference.new ; diff checkHistathenaHLT.reference.new /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_rerunLVL1/trigp1test_checkHistathenaHLT.reference + post_test checkHist histSizes.py -t expert-monitoring.root ; cp post_test_checkHist.log checkHistathenaHLT.reference.new ; diff checkHistathenaHLT.reference.new /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_rerunLVL1/trigp1test_checkHistathenaHLT.reference test 15 @@ -115,13 +113,13 @@ test 17 post_test checkHist histSizes.py -t expert-monitoring.root ; cp post_test_checkHist.log checkHistathenaHLT.reference.new ; diff checkHistathenaHLT.reference.new /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/trigp1test_checkHistathenaHLT.reference test 18 - name Reco_tf_physicsV7_savedBS - doc Reco_tf on saved output from HLT_physicsV7 - pre_condition if [[ $(find ../HLT_physicsV7/HLT_physicsV7._0001.data -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../HLT_physicsV7/HLT_physicsV7._0001.data ; else test -e non_existing_file ; fi - athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; Reco_tf.py --inputBSFile ../HLT_physicsV7/HLT_physicsV7._0001.data --maxEvents 2 --autoConfiguration='everything' --conditionsTag "CONDBR2-BLKPA-2017-11" --geometryVersion "ATLAS-R2-2016-01-00-01" --preExec 'r2e:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.useDynamicAlignFolders.set_Value_and_Lock(True)' --outputESDFile HLT_physicsV7.ESD.pool.root - post_command checkFile.py HLT_physicsV7.ESD.pool.root > ESD.txt + name Reco_tf_physicsV8_savedBS + doc Reco_tf on saved output from HLT_physicsV8 + pre_condition if [[ $(find ../HLT_physicsV8/HLT_physicsV8._0001.data -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../HLT_physicsV8/HLT_physicsV8._0001.data ; else test -e non_existing_file ; fi + athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; Reco_tf.py --inputBSFile ../HLT_physicsV8/HLT_physicsV8._0001.data --maxEvents 2 --autoConfiguration='everything' --conditionsTag "CONDBR2-BLKPA-2017-11" --geometryVersion "ATLAS-R2-2016-01-00-01" --preExec 'r2e:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.useDynamicAlignFolders.set_Value_and_Lock(True)' --outputESDFile HLT_physicsV8.ESD.pool.root + post_command checkFile.py HLT_physicsV8.ESD.pool.root > ESD.txt post_command perl -i.clean -pe 's/^[\d:]+ //' log.RAWtoESD - post_command cat log.RAWtoESD >> Reco_tf_physicsV7_savedBS_test.log + post_command cat log.RAWtoESD >> Reco_tf_physicsV8_savedBS_test.log checklog --config checklogTrigP1Test.conf --showexcludestats ################################################################################ @@ -179,21 +177,19 @@ test 21 name AthenaP1RDOtoBS doc Run RDO->BS using ttbar MC file checklog --config checklogTrigP1Test.conf --showexcludestats -# TODO: fix references fullregtest REGTEST /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/AthenaP1RDOtoBS/trigp1test_AthenaP1RDOtoBS.reference rootcomp /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/AthenaP1RDOtoBS/trigp1test_AthenaP1RDOtoBS.root - athena_cmd athena.py -c 'setMenu="MC_pp_v7";writeBS=True;rerunLVL1=True;jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10);PoolRDOInput=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1"];myBSRDOOutput="AppName=Athena, OutputDirectory=./, FileTag="+setMenu+", Run=110401"' TriggerRelease/Trigger_topOptions_writeBS.py + athena_cmd athena.py -c 'setMenu="MC_pp_v8";writeBS=True;rerunLVL1=True;jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10);PoolRDOInput=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1"];myBSRDOOutput="AppName=Athena, OutputDirectory=./, FileTag="+setMenu+", Run=110401"' TriggerRelease/Trigger_topOptions_writeBS.py post_command test -e data_test.00110401.Single_Stream.daq.RAW._lb0050._Athena._0001.data test 22 name AthenaP1BS_standalone doc Standalone HLT running in athena and compare to athenaHLT checklog --config checklogTrigP1Test.conf --showexcludestats - # TODO: fix ref fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/AthenaP1BS_standalone/trigp1test_AthenaP1BS_standalone.reference - rootcomp ../HLT_physicsV7/expert-monitoring.root expert-monitoring.root - checkcount ../HLT_physicsV7/expert-monitoring.root 0 BOTH - athena_cmd athena.py -c "BSRDOInput='/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1';testPhysicsV7=True;writeBS=True;rerunLVL1=True;doValidation=True;EvtMax=25" TriggerRelease/runHLT_standalone.py + rootcomp ../HLT_physicsV8/expert-monitoring.root expert-monitoring.root + checkcount ../HLT_physicsV8/expert-monitoring.root 0 BOTH + athena_cmd athena.py -c "BSRDOInput='/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1';testPhysicsV8=True;writeBS=True;rerunLVL1=True;doValidation=True;EvtMax=25" TriggerRelease/runHLT_standalone.py post_command chainDump.py -n -S --rootDirs=TrigSteer_HLT --rootHists=ChainAcceptance --rootHists=NumberOfActiveTEs @@ -228,35 +224,32 @@ test 30 # todo: get automatically what is currently running from ami # conditionsTag and geometryVersion need to be updated from time to time test 41 - name Trigreco_physicsV7_currentT0 - doc Trig_reco_tf with current T0 config + name Trigreco_physicsV8_currentT0 + doc Trig_reco_tf with current T0 config with physics v8 checklog --config checklogTrigP1Test.conf --showexcludestats # TODO: fix file, conditionsTag, geometryVersion #athena_cmd Trig_reco_tf.py --inputBS_RDOFile "root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/data15_13TeV.00272531.physics_Main.daq.RAW._lb0104._SFO-5._0001.data" --precommand "testPhysicsV7=True;HLTOutputLevel=INFO;doValidation=True" --maxEvents '15' --outputBSFile "tmp.BS" ; source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; Reco_tf.py --inputBSFile "tmp.BS" --athenaopts=" --perfmon " --outputHISTFile 'myHIST.root' --outputAODFile 'myAOD.pool.root' --outputESDFile 'myESD.pool.root' --outputNTUP_MUONCALIBFile 'myNTUP_MUONCALIB.root' --autoConfiguration='everything' --conditionsTag "CONDBR2-BLKPA-2017-11" --geometryVersion "ATLAS-R2-2016-01-00-01" --preExec 'r2e:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.useDynamicAlignFolders.set_Value_and_Lock(True)' --triggerConfig r2e=DATARECO:REPR - athena_cmd export AMIConfig=$(cat /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/T0Config.txt); echo $AMIConfig; Trig_reco_tf.py --inputBS_RDOFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1" --precommand "testPhysicsV7=True;HLTOutputLevel=INFO;doValidation=True" --maxEvents '15' --outputBSFile "tmp.BS"; Reco_tf.py --asetup "RAWtoALL:Athena,21.0,latest" --inputBSFile "tmp.BS" --athenaopts=" --perfmon " --outputHISTFile 'myHIST.root' --outputAODFile 'myAOD.pool.root' --outputESDFile 'myESD.pool.root' --AMIConfig "${AMIConfig}" - + athena_cmd export AMIConfig=$(cat /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/T0Config.txt); echo $AMIConfig; Trig_reco_tf.py --inputBS_RDOFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1" --precommand "testPhysicsV8=True;HLTOutputLevel=INFO;doValidation=True" --maxEvents '15' --outputBSFile "tmp.BS"; Reco_tf.py --asetup "RAWtoALL:Athena,21.0,latest" --inputBSFile "tmp.BS" --athenaopts=" --perfmon " --outputHISTFile 'myHIST.root' --outputAODFile 'myAOD.pool.root' --outputESDFile 'myESD.pool.root' --AMIConfig "${AMIConfig}" post_command checkFile.py myAOD.pool.root > AOD.txt test 42 - name TrigEDMCheck_physicsV7_currentT0_ESD - doc EDMCheck on TrigEDMCheck_physicsV7_currentT0 + name TrigEDMCheck_physicsV8_currentT0_ESD + doc EDMCheck on TrigEDMCheck_physicsV8_currentT0 joboptions testAthenaP1ESD_TrigEDMCheck_data.py checklog --config checklogTrigP1Test.conf --showexcludestats - # TODO: fix ref - fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/TrigEDMCheck_physicsV7_currentT0_ESD/trigp1test_TrigEDMCheck_physicsV7_currentT0.reference - pre_condition if [[ $(find ../Trigreco_physicsV7_currentT0/myESD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../Trigreco_physicsV7_currentT0/myESD.pool.root ; else test -e non_existing_file ; fi - athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; athena.py -c 'fileList=["../Trigreco_physicsV7_currentT0/myESD.pool.root"]' + fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/TrigEDMCheck_physicsV8_currentT0_ESD/trigp1test_TrigEDMCheck_physicsV8_currentT0.reference + pre_condition if [[ $(find ../Trigreco_physicsV8_currentT0/myESD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../Trigreco_physicsV8_currentT0/myESD.pool.root ; else test -e non_existing_file ; fi + athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; athena.py -c 'fileList=["../Trigreco_physicsV8_currentT0/myESD.pool.root"]' test 43 - name TrigEDMCheck_physicsV7_currentT0_AOD - doc EDMCheck on TrigEDMCheck_physicsV7_currentT0 + name TrigEDMCheck_physicsV8_currentT0_AOD + doc EDMCheck on TrigEDMCheck_physicsV8_currentT0 joboptions testAthenaP1ESD_TrigEDMCheck_data.py checklog --config checklogTrigP1Test.conf --showexcludestats - # TODO: fix ref - fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/TrigEDMCheck_physicsV7_currentT0_AOD/trigp1test_TrigEDMCheck_physicsV7_currentT0.reference - pre_condition if [[ $(find ../Trigreco_physicsV7_currentT0/myAOD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../Trigreco_physicsV7_currentT0/myAOD.pool.root ; else test -e non_existing_file ; fi - athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; athena.py -c 'fileList=["../Trigreco_physicsV7_currentT0/myAOD.pool.root"]' + fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/TrigEDMCheck_physicsV8_currentT0_AOD/trigp1test_TrigEDMCheck_physicsV8_currentT0.reference + pre_condition if [[ $(find ../Trigreco_physicsV8_currentT0/myAOD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../Trigreco_physicsV8_currentT0/myAOD.pool.root ; else test -e non_existing_file ; fi + athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; athena.py -c 'fileList=["../Trigreco_physicsV8_currentT0/myAOD.pool.root"]' ### this does not work due to conditions... @@ -393,11 +386,11 @@ test 54 test 61 - name HLT_physicsV7_menu + name HLT_physicsV8_menu doc Run athenaHLT on all events to create trigger configuration checklog --config checklogTrigP1Test.conf --showexcludestats - athena_cmd athenaHLT.py -M -n 75 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -o HLT_physicsV7_menu -c 'testPhysicsV7=True;trigBase="Default";doDBConfig=True;enableCostForCAF=True' TriggerRelease/runHLT_standalone.py - post_test checkHist histSizes.py -t r0000000000_part_athenaHLT_mon_HLT-Histogramming.root ; cp post_test_checkHist.log checkHistathenaHLT.reference.new ; diff checkHistathenaHLT.reference.new /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_menu/trigp1test_checkHistathenaHLT.reference + athena_cmd athenaHLT.py -M -n 75 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -o HLT_physicsV8_menu -c 'testPhysicsV8=True;trigBase="Default";doDBConfig=True;enableCostForCAF=True' TriggerRelease/runHLT_standalone.py + post_test checkHist histSizes.py -t r0000000000_part_athenaHLT_mon_HLT-Histogramming.root ; cp post_test_checkHist.log checkHistathenaHLT.reference.new ; diff checkHistathenaHLT.reference.new /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_menu/trigp1test_checkHistathenaHLT.reference test 60 name HLT_HIV5_menu @@ -409,11 +402,11 @@ test 60 test 62 name UploadMenuKeys - doc Generates and uploads SMKs created from the HLT first and compares after rerun jobs from DB. - pre_condition test -e ../HLT_physicsV7_menu/ef_Default_setup.txt - pre_condition test -e ../HLT_physicsV7_menu/ef_Default_setup_setup.txt - pre_condition test -e ../HLT_physicsV7_menu/outputHLT*xml - athena_cmd testUploadMenuKeys.sh --menu HLT_physicsV7 + doc Generates and uploads SMKs created with physicsV8 from the HLT first and compares after rerun jobs from DB. + pre_condition test -e ../HLT_physicsV8_menu/ef_Default_setup.txt + pre_condition test -e ../HLT_physicsV8_menu/ef_Default_setup_setup.txt + pre_condition test -e ../HLT_physicsV8_menu/outputHLT*xml + athena_cmd testUploadMenuKeys.sh --menu HLT_physicsV8 test 59 name UploadMenuKeys_HI @@ -425,17 +418,17 @@ test 59 test 70 name UploadMenuKeys_ART - doc Uploads SMKs created from the HLT with rerunL1 - pre_condition test -e ../HLT_physicsV7_menu/ef_Default_setup.txt - pre_condition test -e ../HLT_physicsV7_menu/ef_Default_setup_setup.txt - pre_condition test -e ../HLT_physicsV7_menu/outputHLT*xml - athena_cmd testUploadMenuKeys.sh --menu HLT_physicsV7 --uploadPrescale --art + doc Uploads SMKs created from the HLT with physics V8 and rerunL1 + pre_condition test -e ../HLT_physicsV8_menu/ef_Default_setup.txt + pre_condition test -e ../HLT_physicsV8_menu/ef_Default_setup_setup.txt + pre_condition test -e ../HLT_physicsV8_menu/outputHLT*xml + athena_cmd testUploadMenuKeys.sh --menu HLT_physicsV8 --uploadPrescale --art post_command cp prescaleKeys_17000.txt prescaleKeys_9000.txt /eos/atlas/atlascerngroupdisk/data-art/grid-input/TrigP1Test/. test 63 - name HLT_physicsV7_menu_checkkeys - doc Recreate trigger configuration and compare with configuration from HLT_physicsV7_menu - athena_cmd athenaHLT.py -M -n 75 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -o HLT_physicsV7_menu_checkkeys -c 'testPhysicsV7=True;trigBase="Default";doDBConfig=True;enableCostForCAF=True' TriggerRelease/runHLT_standalone.py + name HLT_physicsV8_menu_checkkeys + doc Recreate trigger configuration and compare with configuration from HLT_physicsV8_menu + athena_cmd athenaHLT.py -M -n 75 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -o HLT_physicsV8_menu_checkkeys -c 'testPhysicsV8=True;trigBase="Default";doDBConfig=True;enableCostForCAF=True' TriggerRelease/runHLT_standalone.py test 58 name HLT_HIV5_menu_checkkeys @@ -444,16 +437,16 @@ test 58 test 64 - name CheckKeysV7 - doc compare the SMK created from the HLT_physicsV7 first and rerun jobs - pre_condition test -e ../HLT_physicsV7_menu/ef_Default_setup.txt - pre_condition test -e ../HLT_physicsV7_menu/ef_Default_setup_setup.txt - pre_condition test -e ../HLT_physicsV7_menu/outputHLT*xml - pre_condition test -e ../HLT_physicsV7_menu_checkkeys/ef_Default_setup.txt - pre_condition test -e ../HLT_physicsV7_menu_checkkeys/ef_Default_setup_setup.txt - pre_condition test -e ../HLT_physicsV7_menu_checkkeys/outputHLT*xml + name CheckKeysV8 + doc compare the SMK created from the HLT_physicsV8 first and rerun jobs + pre_condition test -e ../HLT_physicsV8_menu/ef_Default_setup.txt + pre_condition test -e ../HLT_physicsV8_menu/ef_Default_setup_setup.txt + pre_condition test -e ../HLT_physicsV8_menu/outputHLT*xml + pre_condition test -e ../HLT_physicsV8_menu_checkkeys/ef_Default_setup.txt + pre_condition test -e ../HLT_physicsV8_menu_checkkeys/ef_Default_setup_setup.txt + pre_condition test -e ../HLT_physicsV8_menu_checkkeys/outputHLT*xml checklog --config checklogTrigP1Test.conf --showexcludestats | grep -v "checking for" - athena_cmd testCheckKeys.sh --menu HLT_physicsV7 + athena_cmd testCheckKeys.sh --menu HLT_physicsV8 test 57 name CheckKeysHIV5 @@ -469,13 +462,13 @@ test 57 test 65 - name HLT_physicsV7_menu_rerundb - doc athenaHLT from DB, use HLT_physicsV7 as reference + name HLT_physicsV8_menu_rerundb + doc athenaHLT from DB, use HLT_physicsV8 as reference checklog --config checklogTrigP1Test.conf --showexcludestats - rootcomp ../HLT_physicsV7_menu/r0000000000_part_athenaHLT_mon_HLT-Histogramming.root r0000000000_part_athenaHLT_mon_HLT-Histogramming.root + rootcomp ../HLT_physicsV8_menu/r0000000000_part_athenaHLT_mon_HLT-Histogramming.root r0000000000_part_athenaHLT_mon_HLT-Histogramming.root extra_failure_codes ROOTCOMP_MISMATCH pre_condition test -e ../UploadMenuKeys/exportMenuKeys.sh - athena_cmd unset FRONTIER_SERVER; source ../UploadMenuKeys/exportMenuKeys.sh; athenaHLT.py -M -n 75 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -o HLT_physicsV7_menu_rerundb -J TrigConf::HLTJobOptionsSvc --use-database --db-type "Coral" --db-server "TRIGGERDBATN" --db-smkey ${smk} --db-hltpskey ${hltpsk} --db-extra "{'lvl1key': ${l1psk}}" + athena_cmd unset FRONTIER_SERVER; source ../UploadMenuKeys/exportMenuKeys.sh; athenaHLT.py -M -n 75 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -o HLT_physicsV8_menu_rerundb -J TrigConf::HLTJobOptionsSvc --use-database --db-type "Coral" --db-server "TRIGGERDBATN" --db-smkey ${smk} --db-hltpskey ${hltpsk} --db-extra "{'lvl1key': ${l1psk}}" post_command chainDump.py -n -S post_test RunMsg check_msg_stat.py --showignored --config checkMsgStat_TrigP1Test.conf $logfile @@ -510,58 +503,58 @@ test 67 ## Compare JO vs DB also with rerunLvl1 to test the reprocessing on run1 data test 71 - name HLT_physicsV7_rerunLVL1_menu + name HLT_physicsV8_rerunLVL1_menu doc Run athenaHLT on all events to create trigger configuration checklog --config checklogTrigP1Test.conf --showexcludestats - athena_cmd athenaHLT.py -M -n 25 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -o HLT_physicsV7_rerunLVL1_menu -c 'doDBConfig=True;testPhysicsV7=True;rerunLVL1=True;trigBase="Default";enableCostForCAF=True' TriggerRelease/runHLT_standalone.py + athena_cmd athenaHLT.py -M -n 25 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -o HLT_physicsV8_rerunLVL1_menu -c 'doDBConfig=True;testPhysicsV8=True;rerunLVL1=True;trigBase="Default";enableCostForCAF=True' TriggerRelease/runHLT_standalone.py test 72 name UploadMenuKeys_rerunLVL1 - doc Generates and uploads SMKs created from the HLT first and compares after rerun jobs from DB. - pre_condition test -e ../HLT_physicsV7_rerunLVL1_menu/ef_Default_setup.txt - pre_condition test -e ../HLT_physicsV7_rerunLVL1_menu/ef_Default_setup_setup.txt - pre_condition test -e ../HLT_physicsV7_rerunLVL1_menu/outputHLT*xml - athena_cmd testUploadMenuKeys.sh --menu HLT_physicsV7_rerunLVL1 + doc Generates and uploads SMKs created from the HLT first with physicsV8 and compares after rerun jobs from DB. + pre_condition test -e ../HLT_physicsV8_rerunLVL1_menu/ef_Default_setup.txt + pre_condition test -e ../HLT_physicsV8_rerunLVL1_menu/ef_Default_setup_setup.txt + pre_condition test -e ../HLT_physicsV8_rerunLVL1_menu/outputHLT*xml + athena_cmd testUploadMenuKeys.sh --menu HLT_physicsV8_rerunLVL1 test 73 - name HLT_physicsV7_rerunLVL1_menu_rerundb - doc athenaHLT from DB, use HLT_physicsV7 as reference + name HLT_physicsV8_rerunLVL1_menu_rerundb + doc athenaHLT from DB, use HLT_physicsV8 as reference checklog --config checklogTrigP1Test.conf --showexcludestats - rootcomp ../HLT_physicsV7_rerunLVL1_menu/r0000000000_part_athenaHLT_mon_HLT-Histogramming.root r0000000000_part_athenaHLT_mon_HLT-Histogramming.root + rootcomp ../HLT_physicsV8_rerunLVL1_menu/r0000000000_part_athenaHLT_mon_HLT-Histogramming.root r0000000000_part_athenaHLT_mon_HLT-Histogramming.root extra_failure_codes ROOTCOMP_MISMATCH pre_condition test -e ../UploadMenuKeys_rerunLVL1/exportMenuKeys.sh - athena_cmd unset FRONTIER_SERVER; source ../UploadMenuKeys_rerunLVL1/exportMenuKeys.sh; athenaHLT.py -M -n 25 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -o HLT_physicsV7_rerunLVL1_menu_rerundb -J TrigConf::HLTJobOptionsSvc --use-database --db-type "Coral" --db-server "TRIGGERDBATN" --db-smkey ${smk} --db-hltpskey ${hltpsk} --db-extra "{'lvl1key': ${l1psk}}" + athena_cmd unset FRONTIER_SERVER; source ../UploadMenuKeys_rerunLVL1/exportMenuKeys.sh; athenaHLT.py -M -n 25 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -o HLT_physicsV8_rerunLVL1_menu_rerundb -J TrigConf::HLTJobOptionsSvc --use-database --db-type "Coral" --db-server "TRIGGERDBATN" --db-smkey ${smk} --db-hltpskey ${hltpsk} --db-extra "{'lvl1key': ${l1psk}}" post_command chainDump.py -n -S post_test RunMsg check_msg_stat.py --showignored --config checkMsgStat_TrigP1Test.conf $logfile test 74 - name HLT_mcV7_rerunLVL1_menu - doc Run athenaHLT on all events to create trigger configuration + name HLT_mcV8_rerunLVL1_menu + doc Run athenaHLT with mcV8 and rerun L1 on all events to create trigger configuration checklog --config checklogTrigP1Test.conf --showexcludestats - athena_cmd athenaHLT.py -M -n 1 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -o HLT_mcV7_rerunLVL1_menu -c 'doDBConfig=True;testMCV7=True;rerunLVL1=True;trigBase="Default";enableCostForCAF=True;doValidation=True' TriggerRelease/runHLT_standalone.py + athena_cmd athenaHLT.py -M -n 1 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -o HLT_mcV8_rerunLVL1_menu -c 'doDBConfig=True;testMCV8=True;rerunLVL1=True;trigBase="Default";enableCostForCAF=True;doValidation=True' TriggerRelease/runHLT_standalone.py test 75 name UploadMenuKeys_MC_rerunLVL1 - doc Generates and uploads SMKs created from the HLT first and compares after rerun jobs from DB. - pre_condition test -e ../HLT_mcV7_rerunLVL1_menu/ef_Default_setup.txt - pre_condition test -e ../HLT_mcV7_rerunLVL1_menu/ef_Default_setup_setup.txt - pre_condition test -e ../HLT_mcV7_rerunLVL1_menu/outputHLT*xml - athena_cmd testUploadMenuKeys.sh --menu HLT_mcV7_rerunLVL1 --notUploadMenu + doc Generates and uploads SMKs created from the HLT first with mcV8 and rerun L1 and compares after rerun jobs from DB. + pre_condition test -e ../HLT_mcV8_rerunLVL1_menu/ef_Default_setup.txt + pre_condition test -e ../HLT_mcV8_rerunLVL1_menu/ef_Default_setup_setup.txt + pre_condition test -e ../HLT_mcV8_rerunLVL1_menu/outputHLT*xml + athena_cmd testUploadMenuKeys.sh --menu HLT_mcV8_rerunLVL1 --notUploadMenu test 76 - name HLT_mcV7_menu - doc Run athenaHLT on all events to create trigger configuration + name HLT_mcV8_menu + doc Run athenaHLT with mcV8 on all events to create trigger configuration checklog --config checklogTrigP1Test.conf --showexcludestats - athena_cmd athenaHLT.py -M -n 1 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -o HLT_mcV7_menu -c 'testMCV7=True;trigBase="Default";doDBConfig=True;enableCostForCAF=True;doValidation=True' TriggerRelease/runHLT_standalone.py + athena_cmd athenaHLT.py -M -n 1 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -o HLT_mcV8_menu -c 'testMCV8=True;trigBase="Default";doDBConfig=True;enableCostForCAF=True;doValidation=True' TriggerRelease/runHLT_standalone.py test 77 name UploadMenuKeys_MC - doc Generates and uploads SMKs created from the HLT first and compares after rerun jobs from DB. - pre_condition test -e ../HLT_mcV7_menu/ef_Default_setup.txt - pre_condition test -e ../HLT_mcV7_menu/ef_Default_setup_setup.txt - pre_condition test -e ../HLT_mcV7_menu/outputHLT*xml - athena_cmd testUploadMenuKeys.sh --menu HLT_mcV7 --notUploadMenu + doc Generates and uploads SMKs created from the HLT first with mcV8 and compares after rerun jobs from DB. + pre_condition test -e ../HLT_mcV8_menu/ef_Default_setup.txt + pre_condition test -e ../HLT_mcV8_menu/ef_Default_setup_setup.txt + pre_condition test -e ../HLT_mcV8_menu/outputHLT*xml + athena_cmd testUploadMenuKeys.sh --menu HLT_mcV8 --notUploadMenu ############################################################################################# @@ -569,32 +562,30 @@ test 77 ## conditionsTag and geometryVersion need to be updated from time to time ############################################################################################# test 80 - name RAWtoESD_physicsV7 - doc RAWtoESD on output from HLT_physicsV7 + name RAWtoESD_physicsV8 + doc RAWtoESD on output from HLT_physicsV8 checklog --config checklogTrigP1Test.conf --showexcludestats - pre_condition test -e '../HLT_physicsV7/HLT_physicsV7._0001.data' - athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; Reco_tf.py --preExec 'from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.useDynamicAlignFolders.set_Value_and_Lock(True);' --autoConfiguration 'everything' --conditionsTag "CONDBR2-BLKPA-2017-11" --geometryVersion "ATLAS-R2-2016-01-00-01" --inputBSFile ../HLT_physicsV7/HLT_physicsV7._0001.data --maxEvents 5 --outputESDFile RAWtoESD.pool.root + pre_condition test -e '../HLT_physicsV8/HLT_physicsV8._0001.data' + athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; Reco_tf.py --preExec 'from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.useDynamicAlignFolders.set_Value_and_Lock(True);' --autoConfiguration 'everything' --conditionsTag "CONDBR2-BLKPA-2017-11" --geometryVersion "ATLAS-R2-2016-01-00-01" --inputBSFile ../HLT_physicsV8/HLT_physicsV8._0001.data --maxEvents 5 --outputESDFile RAWtoESD.pool.root post_command checkFile.py RAWtoESD.pool.root > ESD.txt test 81 - name TrigEDMCheck_physicsV7 - doc EDM checker on ESD from RAWtoESD_physicsV7 + name TrigEDMCheck_physicsV8 + doc EDM checker on ESD from RAWtoESD_physicsV8 joboptions testAthenaP1ESD_TrigEDMCheck_data.py checklog --config checklogTrigP1Test.conf --showexcludestats - # TODO: fix ref - fullregtest REGTEST /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/TrigEDMCheck_physicsV7/trigp1test_TrigEDMCheck_physicsV7.reference - pre_condition if [[ $(find ../RAWtoESD_physicsV7/RAWtoESD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../RAWtoESD_physicsV7/RAWtoESD.pool.root ; else test -e non_existing_file ; fi - pre_command ln -s ../RAWtoESD_physicsV7/RAWtoESD.pool.root ESD.pool.root + fullregtest REGTEST /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/TrigEDMCheck_physicsV8/trigp1test_TrigEDMCheck_physicsV8.reference + pre_condition if [[ $(find ../RAWtoESD_physicsV8/RAWtoESD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../RAWtoESD_physicsV8/RAWtoESD.pool.root ; else test -e non_existing_file ; fi + pre_command ln -s ../RAWtoESD_physicsV8/RAWtoESD.pool.root ESD.pool.root athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; athena.py -c 'fileList=["ESD.pool.root"]' test 82 - name TrigDecTool_physicsV7 - doc Check of TrigDec for events produced by RAWtoESD_physicsV7 + name TrigDecTool_physicsV8 + doc Check of TrigDec for events produced by RAWtoESD_physicsV8 checklog --config checklogTrigP1Test.conf --showexcludestats - # TODO: fix ref - fullregtest REGTEST /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/TrigDecTool_physicsV7/trigp1test_TrigDecTool_physicsV7.reference - pre_condition if [[ $(find ../RAWtoESD_physicsV7/RAWtoESD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../RAWtoESD_physicsV7/RAWtoESD.pool.root ; else test -e non_existing_file ; fi - pre_command ln -s ../RAWtoESD_physicsV7/RAWtoESD.pool.root ESD.pool.root + fullregtest REGTEST /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/TrigDecTool_physicsV8/trigp1test_TrigDecTool_physicsV8.reference + pre_condition if [[ $(find ../RAWtoESD_physicsV8/RAWtoESD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../RAWtoESD_physicsV8/RAWtoESD.pool.root ; else test -e non_existing_file ; fi + pre_command ln -s ../RAWtoESD_physicsV8/RAWtoESD.pool.root ESD.pool.root athena_cmd athena.py -c 'fileList=["ESD.pool.root"]' TrigP1Test/testAthenaP1ESD_TrigDecTool.py #test 83: Reco_tf_mcV7_savedBS got migrated to test 18: Reco_tf_physicsV7_savedBS @@ -610,15 +601,15 @@ test 83 ## Infrastructure tests on run/stop/run transitions ############################################################################################# test 100 - name HLT_physicsV7_run_stop_run - doc athenaHLT on data with physics_pp_V7 menu with stop/start transition + name HLT_physicsV8_run_stop_run + doc athenaHLT on data with physics_pp_V8 menu with stop/start transition stdinfile run-stop-run-saveHist.trans filterlog filterREGTEST.py checklog --config checklogTrigP1Test.conf --showexcludestats customregtest regtest_multirun.sh atn_test.log customrootcomp rootcomp_stopstart.sh r0000000000_part_athenaHLT_mon_HLT-Histogramming.root r0000000001_part_athenaHLT_mon_HLT-Histogramming.root extra_failure_codes ROOTCOMP_MISMATCH ATHENA_REGTEST_FAILED - athena_cmd athenaHLT.py -i -M --rewind -n 50 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -c 'testPhysicsV7=True;HLTOutputLevel=INFO;doValidation=True;fpeAuditor=True' TriggerRelease/runHLT_standalone.py + athena_cmd athenaHLT.py -i -M --rewind -n 50 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -c 'testPhysicsV8=True;HLTOutputLevel=INFO;doValidation=True;fpeAuditor=True' TriggerRelease/runHLT_standalone.py ############################################################################################# @@ -637,8 +628,8 @@ test 111 post_command cleanuplog.sh runHLT_standalone_test.log test 112 - name HLT_physicsV7_magField_on_off_on - doc athenaHLT on data with physicsV7 menu with On and Off magnetic field transition + name HLT_physicsV8_magField_on_off_on + doc athenaHLT on data with physicsV8 menu with On and Off magnetic field transition pre_command get_files -jo setMagFieldCurrents.py stdinfile magFieldOnOff.trans filterlog filterREGTEST.py @@ -646,45 +637,45 @@ test 112 customregtest regtest_multirun.sh atn_test.log 1 3 customrootcomp rootcomp_stopstart.sh r0000000000_part_athenaHLT_mon_HLT-Histogramming.root r0000000002_part_athenaHLT_mon_HLT-Histogramming.root extra_failure_codes ROOTCOMP_MISMATCH ATHENA_REGTEST_FAILED - athena_cmd athenaHLT.py -i -M --rewind -n 50 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -c 'testPhysicsV7=True;HLTOutputLevel=INFO;doValidation=True;fpeAuditor=True' TriggerRelease/runHLT_standalone.py + athena_cmd athenaHLT.py -i -M --rewind -n 50 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -c 'testPhysicsV8=True;HLTOutputLevel=INFO;doValidation=True;fpeAuditor=True' TriggerRelease/runHLT_standalone.py test 113 - name HLT_physicsV7_beamspot + name HLT_physicsV8_beamspot doc Test of beamspot udpate with athenaHLT filterlog filterREGTEST.py checklog --config checklogTrigP1Test.conf --showexcludestats # DO NOT change the number of events for this test - athena_cmd athenaHLT.py -Z TrigP1Test.BeamSpotUpdate -n 50 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -c 'testPhysicsV7=True;doValidation=True;BeamspotFromSqlite=True;fpeAuditor=True' TriggerRelease/runHLT_standalone.py + athena_cmd athenaHLT.py -Z TrigP1Test.BeamSpotUpdate -n 50 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -c 'testPhysicsV8=True;doValidation=True;BeamspotFromSqlite=True;fpeAuditor=True' TriggerRelease/runHLT_standalone.py test 109 - name HLT_physicsV7_ROSsim_17000 - doc athenaHLT on data with physicsV7 menu with ROS simulation. It uses PS keys generated with rerunL1 + name HLT_physicsV8_ROSsim_17000 + doc athenaHLT on data with physicsV8 menu with ROS simulation. It uses PS keys generated with rerunL1 pre_condition test -e ../UploadMenuKeys_ART/prescaleKeys_17000.txt pre_command cp /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ATLASros2rob2018.py . athena_cmd trigp1test_prescaleForROSsim.py --nevents 600 --file /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 --ros2rob ATLASros2rob2018 --keys ../UploadMenuKeys_ART/prescaleKeys_17000.txt filterlog filterREGTEST.py checklog --config checklogTrigP1Test.conf --showexcludestats - fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_ROSsim_17000/trigp1test_HLT_physicsV7_ROSsim_17000.reference - rootcomp /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_ROSsim_17000/trigp1test_HLT_physicsV7_ROSsim_17000.root - checkcount /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_ROSsim_17000/trigp1test_HLT_physicsV7_ROSsim_17000.root 0 HLT + fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_ROSsim_17000/trigp1test_HLT_physicsV8_ROSsim_17000.reference + rootcomp /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_ROSsim_17000/trigp1test_HLT_physicsV8_ROSsim_17000.root + checkcount /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_ROSsim_17000/trigp1test_HLT_physicsV8_ROSsim_17000.root 0 HLT post_command chainDump.py -n -S --rootDirs=TrigSteer_HLT --rootHists=ChainAcceptance --rootHists=NumberOfActiveTEs - post_test ROStest grep "ROS-" atn_test.log; cp post_test_ROStest.log ROStest.reference.new; diff ROStest.reference.new /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_ROSsim_17000/trigp1test_ROStest.reference + post_test ROStest grep "ROS-" atn_test.log; cp post_test_ROStest.log ROStest.reference.new; diff ROStest.reference.new /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_ROSsim_17000/trigp1test_ROStest.reference test 110 - name HLT_physicsV7_ROSsim_9000 - doc athenaHLT on data with physicsV7 menu with ROS simulation. It uses PS keys generated with rerunL1 + name HLT_physicsV8_ROSsim_9000 + doc athenaHLT on data with physicsV8 menu with ROS simulation. It uses PS keys generated with rerunL1 pre_condition test -e ../UploadMenuKeys_ART/prescaleKeys_9000.txt pre_command cp /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ATLASros2rob2018.py . athena_cmd trigp1test_prescaleForROSsim.py --nevents 600 --file /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 --ros2rob ATLASros2rob2018 --keys ../UploadMenuKeys_ART/prescaleKeys_9000.txt filterlog filterREGTEST.py checklog --config checklogTrigP1Test.conf --showexcludestats - fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_ROSsim_9000/trigp1test_HLT_physicsV7_ROSsim_9000.reference - rootcomp /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_ROSsim_9000/trigp1test_HLT_physicsV7_ROSsim_9000.root - checkcount /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_ROSsim_9000/trigp1test_HLT_physicsV7_ROSsim_9000.root 0 HLT + fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_ROSsim_9000/trigp1test_HLT_physicsV8_ROSsim_9000.reference + rootcomp /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_ROSsim_9000/trigp1test_HLT_physicsV8_ROSsim_9000.root + checkcount /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_ROSsim_9000/trigp1test_HLT_physicsV8_ROSsim_9000.root 0 HLT post_command chainDump.py -n -S --rootDirs=TrigSteer_HLT --rootHists=ChainAcceptance --rootHists=NumberOfActiveTEs - post_test ROStest grep "ROS-" atn_test.log; cp post_test_ROStest.log ROStest.reference.new; diff ROStest.reference.new /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_ROSsim_9000/trigp1test_ROStest.reference + post_test ROStest grep "ROS-" atn_test.log; cp post_test_ROStest.log ROStest.reference.new; diff ROStest.reference.new /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_ROSsim_9000/trigp1test_ROStest.reference test 114 name HLT_physicsV6_nocache @@ -860,7 +851,6 @@ test 161 doc stand-alone test of the steering with useErrorHandlingMenu joboptions pureSteering_jobOptions.py athena_args -c 'useErrorHandlingMenu=True' - # TODO: fix reference regtest TrigSteer_HLT.ResultBuilder REGTEST /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/pureSteering_ecodes/trigp1test_pureSteering_ecodes_TrigSteer_HLT.ResultBuilder.reference test 162 @@ -868,14 +858,12 @@ test 162 doc stand-alone test of the steering with the PrescaleMenu joboptions pureSteering_jobOptions.py athena_args -c 'repeat=100; usePrescaleMenu=True' - # TODO: fix reference regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/pureSteering_prescaling/trigp1test_pureSteering_prescaling_TrigSteer_HLT.ChainMoni.reference test 163 name pureSteering doc stand-alone test of the steering joboptions pureSteering_jobOptions.py - # TODO: fix reference regtest TrigSteer_HLT.ResultBuilder REGTEST /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/pureSteering/trigp1test_pureSteering_TrigSteer_HLT.ResultBuilder.reference @@ -886,10 +874,9 @@ test 164 name AthenaTrigBS_L2EFMerging doc testing trigger results w/wo merging L2/EF, based on AthenaTrigRDO with run_standalone.py joboptions testAthenaL2EFMerging.py - athena_args -c 'EvtMax=15; testPhysicsV7=True; BSRDOInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1"' + athena_args -c 'EvtMax=15; testPhysicsV8=True; BSRDOInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1"' #athena_args -c 'doHLT=True; useCONDBR2=False; setGlobalTag="COMCOND-HLTP-004-03-VAL-01"; setDetDescr="ATLAS-R1-2012-02-01-00"; EvtMax=15; testPhysicsV6=True; BSRDOInput="root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data12_8TeV.00212967.physics_eb_zee_zmumu_cc._0001.data"' checklog --config checklogTriggerTest.conf --showexcludestats - # TODO: fix reference checkmerge expert-monitoring.root /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/AthenaTrigBS_L2EFMerging/triggertest_AthenaTrigBS_L2EFMerging.root 0 post_command chainDump.py -n -S @@ -898,11 +885,11 @@ test 164 # Test of physicsV6 menu for DataSouting ################################################################################ test 170 - name HLT_physicsV7_DataScouting - doc athenaHLT on data with Physics_pp_v7 menu, test output of DataScouting containers + name HLT_physicsV8_DataScouting + doc athenaHLT on data with Physics_pp_v8 menu, test output of DataScouting containers filterlog filterREGTEST.py checklog --config checklogTrigP1Test.conf --showexcludestats - athena_cmd athenaHLT.py -n50 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -o ds_test_data_out -c 'testJet=True;testMuon=True;testPhysicsV7=True;rerunLVL1=True;HLTOutputLevel=INFO;doValidation=True;fpeAuditor=True' TriggerRelease/runHLT_standalone.py + athena_cmd athenaHLT.py -n50 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -o ds_test_data_out -c 'testJet=True;testMuon=True;testPhysicsV8=True;rerunLVL1=True;HLTOutputLevel=INFO;doValidation=True;fpeAuditor=True' TriggerRelease/runHLT_standalone.py post_command trigbs_dumpHltDsData.py -v1 ds_test_data_out._0001.data >> atn_test.log ################################################################################ @@ -914,38 +901,81 @@ test 180 doc AthenaHLT on data, with MC_pp_V7 menu loose prescale set filterlog filterREGTEST.py checklog --config checklogTrigP1Test.conf --showexcludestats - # TODO: fix references fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_mcV7/trigp1test_HLT_mcV7.reference checkcount /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_mcV7/trigp1test_HLT_mcV7.root 1 HLT rootcomp /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_mcV7/trigp1test_HLT_mcV7.root athena_cmd athenaHLT.py -o HLT_mcV7 -n 50 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -c 'testMCV7=True;rerunLVL1=True;HLTOutputLevel=INFO;doValidation=True;fpeAuditor=True' TriggerRelease/runHLT_standalone.py post_command chainDump.py -n -S +test 188 + name HLT_mcV8 + doc AthenaHLT on data, with MC_pp_V8 menu loose prescale set + filterlog filterREGTEST.py + checklog --config checklogTrigP1Test.conf --showexcludestats + fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_mcV8/trigp1test_HLT_mcV8.reference + checkcount /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_mcV8/trigp1test_HLT_mcV8.root 1 HLT + rootcomp /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_mcV8/trigp1test_HLT_mcV8.root + athena_cmd athenaHLT.py -o HLT_mcV8 -n 50 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -c 'testMCV8=True;rerunLVL1=True;HLTOutputLevel=INFO;doValidation=True;fpeAuditor=True' TriggerRelease/runHLT_standalone.py + post_command chainDump.py -n -S + test 181 name HLT_physicsV7 - doc athenaHLT on data with Physics_pp_v7 menu currently from 2016 EB data + doc athenaHLT on data with Physics_pp_v7 menu currently from 2018 EB data filterlog filterREGTEST.py checklog --config checklogTrigP1Test.conf --showexcludestats - # TODO: fix reference fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7/trigp1test_HLT_physicsV7.reference rootcomp /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7/trigp1test_HLT_physicsV7.root checkcount /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7/trigp1test_HLT_physicsV7.root 1 HLT athena_cmd athenaHLT.py -o HLT_physicsV7 -n 75 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -c 'testPhysicsV7=True;HLTOutputLevel=INFO;doValidation=True;fpeAuditor=True' TriggerRelease/runHLT_standalone.py -# post_command save_to_refdir.sh HLT_physicsV7._0001.data /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/online/references/ATN/latest post_command chainDump.py -n -S --rootDirs=TrigSteer_HLT --rootHists=ChainAcceptance --rootHists=NumberOfActiveTEs post_test checkHist histSizes.py -t expert-monitoring.root ; cp post_test_checkHist.log checkHistathenaHLT.reference.new ; diff checkHistathenaHLT.reference.new /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7/trigp1test_checkHistathenaHLT.reference extra_failure_codes ATHENA_ERROR_IN_LOG +test 187 + name HLT_physicsV8 + doc athenaHLT on data with Physics_pp_v8 menu currently from 2018 EB data + filterlog filterREGTEST.py + checklog --config checklogTrigP1Test.conf --showexcludestats + fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8/trigp1test_HLT_physicsV8.reference + rootcomp /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8/trigp1test_HLT_physicsV8.root + checkcount /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8/trigp1test_HLT_physicsV8.root 1 HLT + athena_cmd athenaHLT.py -o HLT_physicsV8 -n 75 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -c 'testPhysicsV8=True;HLTOutputLevel=INFO;doValidation=True;fpeAuditor=True' TriggerRelease/runHLT_standalone.py + post_command chainDump.py -n -S --rootDirs=TrigSteer_HLT --rootHists=ChainAcceptance --rootHists=NumberOfActiveTEs + post_test checkHist histSizes.py -t expert-monitoring.root ; cp post_test_checkHist.log checkHistathenaHLT.reference.new ; diff checkHistathenaHLT.reference.new /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8/trigp1test_checkHistathenaHLT.reference + extra_failure_codes ATHENA_ERROR_IN_LOG + test 182 - name HLT_physicsV7_FTK - doc athenaHLT on data with Physics_pp_v7 menu and doFTK currently from 2016 EB data with FTK added + name HLT_physicsV8_FTK + doc athenaHLT on data with FTK sim with Physics_pp_v8 menu and doFTK filterlog filterREGTEST.py checklog --config checklogTrigP1Test.conf --showexcludestats - # TODO: fix ref - fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_FTK/trigp1test_HLT_physicsV7_FTK.reference - rootcomp /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_FTK/trigp1test_HLT_physicsV7_FTK.root - checkcount /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_FTK/trigp1test_HLT_physicsV7_FTK.root 1 HLT - athena_cmd athenaHLT.py -o HLT_physicsV7_FTK -n 30 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/RAW_FTK.pool.root -c 'testPhysicsV7=True;HLTOutputLevel=INFO;doValidation=True;fpeAuditor=True;from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.doFTK=True' TriggerRelease/runHLT_standalone.py + fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_FTK/trigp1test_HLT_physicsV8_FTK.reference + rootcomp /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_FTK/trigp1test_HLT_physicsV8_FTK.root + checkcount /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_FTK/trigp1test_HLT_physicsV8_FTK.root 1 HLT + athena_cmd athenaHLT.py -o HLT_physicsV8_FTK -n 75 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/RAW_FTK.pool.root -c 'testPhysicsV8=True;HLTOutputLevel=INFO;doValidation=True;fpeAuditor=True;from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.doFTK=True' TriggerRelease/runHLT_standalone.py + post_command chainDump.py -n -S + +test 188 + name HLT_physicsV8_FTKdata + doc athenaHLT on data with FTK sim with Physics_pp_v8 menu but no doFTK + filterlog filterREGTEST.py + pre_condition test -e ../HLT_physicsV8/expert-monitoring.root + checklog --config checklogTrigP1Test.conf --showexcludestats + rootcomp ../HLT_physicsV8/expert-monitoring.root expert-monitoring.root + extra_failure_codes ROOTCOMP_MISMATCH + fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_FTKdata/trigp1test_HLT_physicsV8_FTKdata.reference + athena_cmd athenaHLT.py -o HLT_physicsV8_FTKdata -n 75 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/RAW_FTK.pool.root -c 'testPhysicsV8=True;HLTOutputLevel=INFO;doValidation=True;fpeAuditor=True;from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.doFTK=False' TriggerRelease/runHLT_standalone.py + post_command chainDump.py -n -S + +test 189 + name HLT_physicsV8_noFTKdata_withFTKmenu + doc athenaHLT on data without FTK sim but with Physics_pp_v8 menu and doFTK + filterlog filterREGTEST.py + checklog --config checklogTrigP1Test.conf --showexcludestats + fullregtest REGTEST|WARNING /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_noFTKdata_withFTKmenu/trigp1test_HLT_physicsV8_noFTKdata_withFTKmenu.reference + rootcomp /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_noFTKdata_withFTKmenu/trigp1test_HLT_physicsV8_noFTKdata_withFTKmenu.root + checkcount /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV8_noFTKdata_withFTKmenu/trigp1test_HLT_physicsV8_noFTKdata_withFTKmenu.root 1 HLT + athena_cmd athenaHLT.py -o HLT_physicsV8_noFTKdata_withFTKmenu -n 75 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00349335.physics_EnhancedBias.merge.RAW._lb0200._SFO-1._0001.1 -c 'testPhysicsV8=True;HLTOutputLevel=INFO;doValidation=True;fpeAuditor=True;from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.doFTK=True' TriggerRelease/runHLT_standalone.py post_command chainDump.py -n -S test 184 @@ -961,11 +991,11 @@ test 184 post_command chainDump.py -n -S test 183 - name athenaHLT_LatestRun_MCV7 - doc athenaHLT on latest available run + name athenaHLT_LatestRun_MCV8 + doc athenaHLT on latest available run with mcV8 filterlog filterREGTEST.py checklog --config checklogTrigP1Test.conf --showexcludestats - athena_cmd trigp1test_athenaHLT.py --nfiles=1 --nevents=100 --dir='/eos/atlas/atlastier0/rucio/data18_13TeV/physics_Main/' --modifiers="testMCV7=True;fpeAuditor=True;from PerfMonComps.PerfMonFlags import jobproperties as pmon_properties ; pmon_properties.PerfMonFlags.doSemiDetailedMonitoring=True" + athena_cmd trigp1test_athenaHLT.py --nfiles=1 --nevents=100 --dir='/eos/atlas/atlastier0/rucio/data18_13TeV/physics_Main/' --modifiers="testMCV8=True;fpeAuditor=True;from PerfMonComps.PerfMonFlags import jobproperties as pmon_properties ; pmon_properties.PerfMonFlags.doSemiDetailedMonitoring=True" post_command chainDump.py -n -S test 186 diff --git a/Trigger/TrigValidation/TrigP1Test/python/releaseFromSMK.py b/Trigger/TrigValidation/TrigP1Test/python/releaseFromSMK.py index 1e54d4e53e14a470ef4ad7a5fee624046c12f187..e8ce547bdecd53052d1444c34fc24020f6673547 100644 --- a/Trigger/TrigValidation/TrigP1Test/python/releaseFromSMK.py +++ b/Trigger/TrigValidation/TrigP1Test/python/releaseFromSMK.py @@ -16,13 +16,13 @@ else: print result array = result[0][3].split("'") - new_array = [s for s in array if "AthenaP1" in s] + new_array = [s for s in array if "Athena" in s] new_array = new_array[0] new_array = new_array.replace("\\","") if "T" in new_array: - release = new_array.replace("AthenaP1-","r") + release = new_array.replace("Athena-","r") else: - release = new_array.replace("AthenaP1-","") + release = new_array.replace("Athena-","") print "release found: ",release print "export release="+release diff --git a/Trigger/TrigValidation/TrigP1Test/share/testCheckKeys.sh b/Trigger/TrigValidation/TrigP1Test/share/testCheckKeys.sh index 6768799386e870d901351239b6042654612c22bf..d0332785459318e0949d928ecf08bfe2746431e5 100755 --- a/Trigger/TrigValidation/TrigP1Test/share/testCheckKeys.sh +++ b/Trigger/TrigValidation/TrigP1Test/share/testCheckKeys.sh @@ -42,6 +42,14 @@ elif [ "$type" == "HLT_physicsV7" ]; then stump="Physics_pp_v7" elif [ "$type" == "HLT_HIV5" ]; then stump="Physics_HI_v5" +elif [ "$type" == "HLT_physicsVi8" ]; then + stump="Physics_pp_v8" +elif [ "$type" == "HLT_physicsV8_rerunLVL1" ]; then + stump="Physics_pp_v8" +elif [ "$type" == "HLT_mcV8" ]; then + stump="MC_pp_v8" +elif [ "$type" == "HLT_mcV8_rerunLVL1" ]; then + stump="MC_pp_v8" else stump="" fi diff --git a/Trigger/TrigValidation/TrigP1Test/share/testUploadMenuKeys.sh b/Trigger/TrigValidation/TrigP1Test/share/testUploadMenuKeys.sh index c0b9da9dd5a89e1834cc646d1c8770f1c0fcdadb..2a2434c1921b5a6cca9b1b3f973bcd0b7be7845f 100755 --- a/Trigger/TrigValidation/TrigP1Test/share/testUploadMenuKeys.sh +++ b/Trigger/TrigValidation/TrigP1Test/share/testUploadMenuKeys.sh @@ -70,6 +70,14 @@ elif [ "$type" == "HLT_HIV5" ]; then stump="Physics_HI_v5" elif [ "$type" == "HLT_HIV5_rerunLVL1" ]; then stump="Physics_HI_v5" +elif [ "$type" == "HLT_physicsV8" ]; then + stump="Physics_pp_v8" +elif [ "$type" == "HLT_physicsV8_rerunLVL1" ]; then + stump="Physics_pp_v8" +elif [ "$type" == "HLT_mcV8" ]; then + stump="MC_pp_v8" +elif [ "$type" == "HLT_mcV8_rerunLVL1" ]; then + stump="MC_pp_v8" else stump="" fi diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_RAWtoESD_TrigEDMCheck_TrigDecTool_physicsV7_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_RAWtoESD_TrigEDMCheck_TrigDecTool_physics_build.sh similarity index 86% rename from Trigger/TrigValidation/TrigP1Test/test/test_HLT_RAWtoESD_TrigEDMCheck_TrigDecTool_physicsV7_build.sh rename to Trigger/TrigValidation/TrigP1Test/test/test_HLT_RAWtoESD_TrigEDMCheck_TrigDecTool_physics_build.sh index 0a9ef9474c6fd86a40fa9793eba5739d1a006d42..a4582c897eeeaa94e96cfbedb4c2b1a4e8b7be4c 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_RAWtoESD_TrigEDMCheck_TrigDecTool_physicsV7_build.sh +++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_RAWtoESD_TrigEDMCheck_TrigDecTool_physics_build.sh @@ -1,6 +1,6 @@ #!/bin/bash -# art-description: athenaHLT on EB data with Physics_pp_v7 menu, RAWtoESD on output, EDM checker on ESD, and Check of TrigDec +# art-description: athenaHLT on EB data with Physics_pp_v8 menu, RAWtoESD on output, EDM checker on ESD, and Check of TrigDec # art-type: build # art-include: 21.3/Athena # art-include: 21.1/AthenaP1 @@ -13,7 +13,7 @@ if [ -z ${TEST} ]; then export TEST="TrigP1Test" fi -export NAME=HLT_physicsV7 +export NAME=HLT_physicsV8 export JOB_LOG="${NAME}.log" timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} @@ -21,7 +21,7 @@ timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf T ATH_RETURN=${PIPESTATUS[0]} echo "art-result: ${ATH_RETURN} ${NAME}" -export NAME=RAWtoESD_physicsV7 +export NAME=RAWtoESD_physicsV8 export JOB_LOG="${NAME}.log" timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} @@ -29,7 +29,7 @@ timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf ATH_RETURN=${PIPESTATUS[0]} echo "art-result: ${ATH_RETURN} ${NAME}" -export NAME=TrigEDMCheck_physicsV7 +export NAME=TrigEDMCheck_physicsV8 export JOB_LOG="${NAME}.log" timeout 50m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} @@ -37,7 +37,7 @@ timeout 50m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf T ATH_RETURN=${PIPESTATUS[0]} echo "art-result: ${ATH_RETURN} ${NAME}" -export NAME=TrigDecTool_physicsV7 +export NAME=TrigDecTool_physicsV8 export JOB_LOG="${NAME}.log" timeout 50m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_mcV8_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_mcV8_build.sh new file mode 100755 index 0000000000000000000000000000000000000000..d158158fa779efaab90bbf2b0cebedfb3b20331f --- /dev/null +++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_mcV8_build.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +# art-description: AthenaHLT on data, with MC_pp_V8 menu loose prescale set +# art-type: build +# art-include: 21.3/Athena + +if [ -z ${TEST} ]; then + export TEST="TrigP1Test" +fi + +export NAME=HLT_mcV8 +export JOB_LOG="${NAME}.log" + +timeout 50m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} + +ATH_RETURN=${PIPESTATUS[0]} +echo "art-result: ${ATH_RETURN} ${NAME}" + + + diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_mcV7_menu_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_mc_menu_build.sh similarity index 95% rename from Trigger/TrigValidation/TrigP1Test/test/test_HLT_mcV7_menu_build.sh rename to Trigger/TrigValidation/TrigP1Test/test/test_HLT_mc_menu_build.sh index 4a971085329020ae237adcc34e2164948494a4fa..d4e482d81e6fdf2778789d0dcdbc2eee4defb5eb 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_mcV7_menu_build.sh +++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_mc_menu_build.sh @@ -14,7 +14,7 @@ if [ -z ${TEST} ]; then export TEST="TrigP1Test" fi -export NAME=HLT_mcV7_menu +export NAME=HLT_mcV8_menu export JOB_LOG="${NAME}.log" timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} @@ -30,7 +30,7 @@ timeout 120m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf T ATH_RETURN=${PIPESTATUS[0]} echo "art-result: ${ATH_RETURN} ${NAME}" -export NAME=HLT_mcV7_rerunLVL1_menu +export NAME=HLT_mcV8_rerunLVL1_menu export JOB_LOG="${NAME}.log" timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_FTK_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_FTK_build.sh deleted file mode 100755 index 9d27b2897203bb2430478ab3d233255d09cd2c3d..0000000000000000000000000000000000000000 --- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_FTK_build.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -# art-description: athenaHLT on data with Physics_pp_v7 menu and doFTK currently from 2016 EB data with FTK added -# art-type: build -# art-include: 21.3/Athena -# art-include: 21.1/AthenaP1 -# art-include: 21.1-dev/AthenaP1 -# art-include: 21.0/AthenaP1 -# art-include: 21.0-TrigMC/AthenaP1 -# art-include: master/AthenaP1 -# art-include: master/Athena - -if [ -z ${TEST} ]; then - export TEST="TrigP1Test" -fi - -export NAME=HLT_physicsV7_FTK -export JOB_LOG="${NAME}.log" - -timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} - -ATH_RETURN=${PIPESTATUS[0]} -echo "art-result: ${ATH_RETURN} ${NAME}" - - - diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_magField_on_off_on_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_magField_on_off_on_build.sh deleted file mode 100755 index c8b8e4d1a987c39e67c52acaba3f0b4714ad2668..0000000000000000000000000000000000000000 --- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_magField_on_off_on_build.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -# art-description: athenaHLT on data with physicsV7 menu with On and Off magnetic field transition -# art-type: build -# art-include: 21.3/Athena -# art-include: 21.1/AthenaP1 -# art-include: 21.1-dev/AthenaP1 -# art-include: 21.0/AthenaP1 -# art-include: 21.0-TrigMC/AthenaP1 -# art-include: master/AthenaP1 -# art-include: master/Athena - -if [ -z ${TEST} ]; then - export TEST="TrigP1Test" -fi - -export NAME=HLT_physicsV7_magField_on_off_on -export JOB_LOG="${NAME}.log" - -timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} - -ATH_RETURN=${PIPESTATUS[0]} -echo "art-result: ${ATH_RETURN} ${NAME}" - - - diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV8_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV8_build.sh new file mode 100755 index 0000000000000000000000000000000000000000..4c2bc4b6078e6c029c679c75484ef9eb5aa97e9f --- /dev/null +++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV8_build.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +# art-description: athenaHLT on data with Physics_pp_v8 menu currently from 2018 EB data +# art-type: build +# art-include: 21.3/Athena + +if [ -z ${TEST} ]; then + export TEST="TrigP1Test" +fi + +export NAME=HLT_physicsV8 +export JOB_LOG="${NAME}.log" + +timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} + +ATH_RETURN=${PIPESTATUS[0]} +echo "art-result: ${ATH_RETURN} ${NAME}" + + + diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_DataScouting_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_DataScouting_build.sh new file mode 100755 index 0000000000000000000000000000000000000000..8e577903b3b9d09db1bddfdefd2006fcb687af94 --- /dev/null +++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_DataScouting_build.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +# art-description: athenaHLT on data with Physics_pp menu, test output of DataScouting containers +# art-type: build +# art-include: 21.3/Athena +# art-include: 21.1/AthenaP1 +# art-include: 21.1-dev/AthenaP1 +# art-include: 21.0/AthenaP1 +# art-include: 21.0-TrigMC/AthenaP1 +# art-include: master/AthenaP1 +# art-include: master/Athena + +if [ -z ${TEST} ]; then + export TEST="TrigP1Test" +fi + +export NAME=HLT_physicsV8_DataScouting +export JOB_LOG="${NAME}.log" + +timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} + +ATH_RETURN=${PIPESTATUS[0]} +echo "art-result: ${ATH_RETURN} ${NAME}" + + + diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_rerunLVL1_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_FTK_build.sh similarity index 80% rename from Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_rerunLVL1_build.sh rename to Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_FTK_build.sh index f18fe678dca638b7381d9b47c450db90148f46b4..3b1aa8a5017bb2feb4f1040be8c29340fda93ab0 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_rerunLVL1_build.sh +++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_FTK_build.sh @@ -1,6 +1,6 @@ #!/bin/bash -# art-description: athenaHLT on data with Physics_pp_v7 menu currently from 2016 EB data +# art-description: athenaHLT on data with th FTKsim with Physics_pp_v8 menu and doFTK # art-type: build # art-include: 21.3/Athena # art-include: 21.1/AthenaP1 @@ -14,7 +14,7 @@ if [ -z ${TEST} ]; then export TEST="TrigP1Test" fi -export NAME=HLT_physicsV7_rerunLVL1 +export NAME=HLT_physicsV8_FTK export JOB_LOG="${NAME}.log" timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_FTKdata_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_FTKdata_build.sh new file mode 100755 index 0000000000000000000000000000000000000000..ba0ce976106947eb4e54252a79b5f87f71c2531d --- /dev/null +++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_FTKdata_build.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +# art-description: athenaHLT on th physics menu without FTK chains on data with and without FTK sim +# art-type: build +# art-include: 21.3/Athena + +if [ -z ${TEST} ]; then + export TEST="TrigP1Test" +fi + +export NAME=HLT_physicsV8 +export JOB_LOG="${NAME}.log" + +timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} + +ATH_RETURN=${PIPESTATUS[0]} +echo "art-result: ${ATH_RETURN} ${NAME}" + +export NAME=HLT_physicsV8_FTKdata +export JOB_LOG="${NAME}.log" + +timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} + +ATH_RETURN=${PIPESTATUS[0]} +echo "art-result: ${ATH_RETURN} ${NAME}" + diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_FTKmenu_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_FTKmenu_build.sh new file mode 100755 index 0000000000000000000000000000000000000000..1d73ad8ed538251c11be616bcacba3e3602b7dda --- /dev/null +++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_FTKmenu_build.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +# art-description: athenaHLT on data without FTK sim but with Physics_pp_v8 menu and FTK chains +# art-type: build +# art-include: 21.3/Athena + +if [ -z ${TEST} ]; then + export TEST="TrigP1Test" +fi + +export NAME=HLT_physicsV8_noFTKdata_withFTKmenu +export JOB_LOG="${NAME}.log" + +timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} + +ATH_RETURN=${PIPESTATUS[0]} +echo "art-result: ${ATH_RETURN} ${NAME}" + + + diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_beamspot_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_beamspot_build.sh similarity index 94% rename from Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_beamspot_build.sh rename to Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_beamspot_build.sh index ff22104346228a8a5baae0138d5c964fe271c6a7..cb83be0d4c8ebdb976f0b02403e60ba7e7cce15b 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_beamspot_build.sh +++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_beamspot_build.sh @@ -14,7 +14,7 @@ if [ -z ${TEST} ]; then export TEST="TrigP1Test" fi -export NAME=HLT_physicsV7_beamspot +export NAME=HLT_physicsV8_beamspot export JOB_LOG="${NAME}.log" timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_DataScouting_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_magField_on_off_on_build.sh similarity index 78% rename from Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_DataScouting_build.sh rename to Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_magField_on_off_on_build.sh index 2edf1ed4c1e50dfcaba8a26d86d346601f6e5bb5..33bbc50c08dbeb66efa4348a76eca3cc78adb018 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_DataScouting_build.sh +++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_magField_on_off_on_build.sh @@ -1,6 +1,6 @@ #!/bin/bash -# art-description: athenaHLT on data with Physics_pp_v7 menu, test output of DataScouting containers +# art-description: athenaHLT on data with physics menu with On and Off magnetic field transition # art-type: build # art-include: 21.3/Athena # art-include: 21.1/AthenaP1 @@ -14,7 +14,7 @@ if [ -z ${TEST} ]; then export TEST="TrigP1Test" fi -export NAME=HLT_physicsV7_DataScouting +export NAME=HLT_physicsV8_magField_on_off_on export JOB_LOG="${NAME}.log" timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_menu_ART_and_ROSsim_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_menu_ART_and_ROSsim_build.sh similarity index 92% rename from Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_menu_ART_and_ROSsim_build.sh rename to Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_menu_ART_and_ROSsim_build.sh index 69add429e01b5982ccde3254220fbee45cc12edb..dd03568740559cf902c7ba756b5293f9665833ba 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_menu_ART_and_ROSsim_build.sh +++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_menu_ART_and_ROSsim_build.sh @@ -8,7 +8,7 @@ if [ -z ${TEST} ]; then export TEST="TrigP1Test" fi -export NAME=HLT_physicsV7_menu +export NAME=HLT_physicsV8_menu export JOB_LOG="${NAME}.log" timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} @@ -24,7 +24,7 @@ timeout 120m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf T ATH_RETURN=${PIPESTATUS[0]} echo "art-result: ${ATH_RETURN} ${NAME}" -export NAME=HLT_physicsV7_ROSsim_17000 +export NAME=HLT_physicsV8_ROSsim_17000 export JOB_LOG="${NAME}.log" timeout 150m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} @@ -32,7 +32,7 @@ timeout 150m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf T ATH_RETURN=${PIPESTATUS[0]} echo "art-result: ${ATH_RETURN} ${NAME}" -export NAME=HLT_physicsV7_ROSsim_9000 +export NAME=HLT_physicsV8_ROSsim_9000 export JOB_LOG="${NAME}.log" timeout 150m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_menu_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_menu_build.sh similarity index 92% rename from Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_menu_build.sh rename to Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_menu_build.sh index 06a4c7f277e332bca452c9388526d4ee3fd5f7b4..0e03d1561ec9816ba8f3ce013242047cb9cc2899 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_menu_build.sh +++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_menu_build.sh @@ -1,6 +1,6 @@ #!/bin/bash -# art-description: Run athenaHLT on all events to create trigger configuration, generates and uploads SMKs created from the HLT first and compares after rerun jobs from DB, then compare the SMK created from the HLT_physicsV7 first and rerun jobs. Runs the same thing also for the physics HI v5 menu +# art-description: Run athenaHLT on all events to create trigger configuration, generates and uploads SMKs created from the HLT first and compares after rerun jobs from DB, then compare the SMK created from the HLT_physicsV8 first and rerun jobs. Runs the same thing also for the physics HI v5 menu # art-type: build # art-include: 21.3/Athena @@ -8,7 +8,7 @@ if [ -z ${TEST} ]; then export TEST="TrigP1Test" fi -export NAME=HLT_physicsV7_menu +export NAME=HLT_physicsV8_menu export JOB_LOG="${NAME}.log" timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} @@ -24,7 +24,7 @@ timeout 120m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf T ATH_RETURN=${PIPESTATUS[0]} echo "art-result: ${ATH_RETURN} ${NAME}" -export NAME=HLT_physicsV7_menu_rerundb +export NAME=HLT_physicsV8_menu_rerundb export JOB_LOG="${NAME}.log" timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} @@ -32,7 +32,7 @@ timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf T ATH_RETURN=${PIPESTATUS[0]} echo "art-result: ${ATH_RETURN} ${NAME}" -export NAME=HLT_physicsV7_menu_checkkeys +export NAME=HLT_physicsV8_menu_checkkeys export JOB_LOG="${NAME}.log" timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} @@ -40,7 +40,7 @@ timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf T ATH_RETURN=${PIPESTATUS[0]} echo "art-result: ${ATH_RETURN} ${NAME}" -export NAME=CheckKeysV7 +export NAME=CheckKeysV8 export JOB_LOG="${NAME}.log" timeout 180m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} @@ -48,7 +48,7 @@ timeout 180m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf T ATH_RETURN=${PIPESTATUS[0]} echo "art-result: ${ATH_RETURN} ${NAME}" -export NAME=HLT_physicsV7_rerunLVL1_menu +export NAME=HLT_physicsV8_rerunLVL1_menu export JOB_LOG="${NAME}.log" timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} @@ -64,7 +64,7 @@ timeout 120m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf T ATH_RETURN=${PIPESTATUS[0]} echo "art-result: ${ATH_RETURN} ${NAME}" -export NAME=HLT_physicsV7_rerunLVL1_menu_rerundb +export NAME=HLT_physicsV8_rerunLVL1_menu_rerundb export JOB_LOG="${NAME}.log" timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_run_stop_run_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_rerunLVL1_build.sh similarity index 80% rename from Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_run_stop_run_build.sh rename to Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_rerunLVL1_build.sh index 27fb910c1c92804a6dacf9a553cb0ad302ba07b6..d4be62660e746063a17f0f5cf5da4bd3604ffdd6 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physicsV7_run_stop_run_build.sh +++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_rerunLVL1_build.sh @@ -1,6 +1,6 @@ #!/bin/bash -# art-description: athenaHLT on data with physics_pp_V7 menu with stop/start transition +# art-description: athenaHLT on data with Physics_pp menu currently from 2016 EB data # art-type: build # art-include: 21.3/Athena # art-include: 21.1/AthenaP1 @@ -14,7 +14,7 @@ if [ -z ${TEST} ]; then export TEST="TrigP1Test" fi -export NAME=HLT_physicsV7_run_stop_run +export NAME=HLT_physicsV8_rerunLVL1 export JOB_LOG="${NAME}.log" timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_run_stop_run_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_run_stop_run_build.sh new file mode 100755 index 0000000000000000000000000000000000000000..330dbf6b3b471afff55d51c44522335b44f7841f --- /dev/null +++ b/Trigger/TrigValidation/TrigP1Test/test/test_HLT_physics_run_stop_run_build.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +# art-description: athenaHLT on data with physics_pp menu with stop/start transition +# art-type: build +# art-include: 21.3/Athena +# art-include: 21.1/AthenaP1 +# art-include: 21.1-dev/AthenaP1 +# art-include: 21.0/AthenaP1 +# art-include: 21.0-TrigMC/AthenaP1 +# art-include: master/AthenaP1 +# art-include: master/Athena + +if [ -z ${TEST} ]; then + export TEST="TrigP1Test" +fi + +export NAME=HLT_physicsV8_run_stop_run +export JOB_LOG="${NAME}.log" + +timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} + +ATH_RETURN=${PIPESTATUS[0]} +echo "art-result: ${ATH_RETURN} ${NAME}" + + + diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_Reco_tf_physicsV7_savedBS_AthenaP1BS_standalone_physicsV7_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_Reco_tf_physics_savedBS_AthenaP1BS_standalone_physics_build.sh similarity index 82% rename from Trigger/TrigValidation/TrigP1Test/test/test_Reco_tf_physicsV7_savedBS_AthenaP1BS_standalone_physicsV7_build.sh rename to Trigger/TrigValidation/TrigP1Test/test/test_Reco_tf_physics_savedBS_AthenaP1BS_standalone_physics_build.sh index 5227427f5aefde8dd4e1e5f49c68d7f31f558478..d5e5af6e850c648235225afdd91f39e57cc22e06 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_Reco_tf_physicsV7_savedBS_AthenaP1BS_standalone_physicsV7_build.sh +++ b/Trigger/TrigValidation/TrigP1Test/test/test_Reco_tf_physics_savedBS_AthenaP1BS_standalone_physics_build.sh @@ -1,6 +1,6 @@ #!/bin/bash -# art-description: athenaHLT on EB data with Physics_pp_v7 menu, Reco_tf on saved output, and Standalone HLT running in athena and compare to athenaHLT +# art-description: athenaHLT on EB data with Physics_pp menu, Reco_tf on saved output, and Standalone HLT running in athena and compare to athenaHLT # art-type: build # art-include: 21.3/Athena # art-include: 21.1/AthenaP1 @@ -14,7 +14,7 @@ if [ -z ${TEST} ]; then export TEST="TrigP1Test" fi -export NAME=HLT_physicsV7 +export NAME=HLT_physicsV8 export JOB_LOG="${NAME}.log" timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} @@ -22,7 +22,7 @@ timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf T ATH_RETURN=${PIPESTATUS[0]} echo "art-result: ${ATH_RETURN} ${NAME}" -export NAME=Reco_tf_physicsV7_savedBS +export NAME=Reco_tf_physicsV8_savedBS export JOB_LOG="${NAME}.log" timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_Trigreco_physicsV7_currentT0_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_Trigreco_physics_currentT0_build.sh similarity index 88% rename from Trigger/TrigValidation/TrigP1Test/test/test_Trigreco_physicsV7_currentT0_build.sh rename to Trigger/TrigValidation/TrigP1Test/test/test_Trigreco_physics_currentT0_build.sh index c2a32db7f972fb462be789b16f6773928bcf6668..f0bb61d7567f10b81c3a9e8314d54387e0906996 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_Trigreco_physicsV7_currentT0_build.sh +++ b/Trigger/TrigValidation/TrigP1Test/test/test_Trigreco_physics_currentT0_build.sh @@ -14,7 +14,7 @@ if [ -z ${TEST} ]; then export TEST="TrigP1Test" fi -export NAME=Trigreco_physicsV7_currentT0 +export NAME=Trigreco_physicsV8_currentT0 export JOB_LOG="${NAME}.log" timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} @@ -22,7 +22,7 @@ timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf ATH_RETURN=${PIPESTATUS[0]} echo "art-result: ${ATH_RETURN} ${NAME}" -export NAME=TrigEDMCheck_physicsV7_currentT0_ESD +export NAME=TrigEDMCheck_physicsV8_currentT0_ESD export JOB_LOG="${NAME}.log" timeout 50m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} @@ -30,7 +30,7 @@ timeout 50m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf T ATH_RETURN=${PIPESTATUS[0]} echo "art-result: ${ATH_RETURN} ${NAME}" -export NAME=TrigEDMCheck_physicsV7_currentT0_AOD +export NAME=TrigEDMCheck_physicsV8_currentT0_AOD export JOB_LOG="${NAME}.log" timeout 50m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_LatestRun_MCV7_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_LatestRun_MC_build.sh similarity index 93% rename from Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_LatestRun_MCV7_build.sh rename to Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_LatestRun_MC_build.sh index 1a472e30f2404aa17aec14f7dc2be633897ad203..6ec5ba224534fd42e2dcb7f2ec71c2f8592b6df4 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_LatestRun_MCV7_build.sh +++ b/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_LatestRun_MC_build.sh @@ -14,7 +14,7 @@ if [ -z ${TEST} ]; then export TEST="TrigP1Test" fi -export NAME="athenaHLT_LatestRun_MCV7" +export NAME="athenaHLT_LatestRun_MCV8" export JOB_LOG="${NAME}.log" timeout 100m trigtest_ART.pl --cleardir --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG} diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_physics_pp_v7_PSed_nightlyDayBefore_grid.sh b/Trigger/TrigValidation/TrigP1Test/test/test_physics_pp_v7_PSed_nightlyDayBefore_grid.sh index d5aec4a3a56b722c915a724c599416dc834912c1..46875a340836574c749c9d1fb8e33874fafe0136 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_physics_pp_v7_PSed_nightlyDayBefore_grid.sh +++ b/Trigger/TrigValidation/TrigP1Test/test/test_physics_pp_v7_PSed_nightlyDayBefore_grid.sh @@ -41,18 +41,21 @@ cat releaseFromSMK.log | tee -a ${JOB_LOG} eval "$( grep 'export release=' releaseFromSMK.log)" if [ -z ${release} ]; then echo "Release not found" | tee -a ${JOB_LOG} -fi - -l1psk="'lvl1key': ${l1psk}" -subshellcmd='source $AtlasSetup/scripts/asetup.sh Athena,21.3,'${release}' | tee -a '${JOB_LOG}'; athenaHLT.py -n 5000 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00339070.physics_EnhancedBias.merge.RAW._lb0101._SFO-1._0001.1 -o HLT_physicsV7_prescaled -J TrigConf::HLTJobOptionsSvc --use-database --db-type "Coral" --db-server "TRIGGERDBART" --db-smkey '${smk}' --db-hltpskey '${hltpsk}' --db-extra "{'${l1psk}'}" | tee -a '${JOB_LOG}' ; Trig_reco_tf.py --inputBSFile=HLT_physicsV7_prescaled._0001.data --outputNTUP_TRIGCOST=trig_cost.root | tee -a '${JOB_LOG}'; RunTrigCostD3PD -f trig_cost.root --outputTagFromAthena --costMode --monitorRates --isCPUPrediction --useEBWeight --patternsMonitor HLT_costmonitor HLT_mistimemonj400 HLT_mistimemoncaltimenomu HLT_mistimemoncaltime HLT_l1topodebug HLT_l1calooverflow HLT_e5_lhvloose_nod0_bBeexM6000t HLT_2e5_lhvloose_nod0_bBeexM6000t HLT_cscmon_L1All HLT_j0_perf_ds1_L1J100 --patternsInvert --predictionLumi 1.50e34 | tee -a '${JOB_LOG}'; chainDump.py -n -S 2>&1 | tee -a '${JOB_LOG} + ATH_RETURN=111 + echo "art-result: ${ATH_RETURN} ${NAME}" +elif + l1psk="'lvl1key': ${l1psk}" + subshellcmd='source $AtlasSetup/scripts/asetup.sh Athena,21.3,'${release}' | tee -a '${JOB_LOG}'; athenaHLT.py -n 5000 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00339070.physics_EnhancedBias.merge.RAW._lb0101._SFO-1._0001.1 -o HLT_physicsV7_prescaled -J TrigConf::HLTJobOptionsSvc --use-database --db-type "Coral" --db-server "TRIGGERDBART" --db-smkey '${smk}' --db-hltpskey '${hltpsk}' --db-extra "{'${l1psk}'}" | tee -a '${JOB_LOG}' ; Trig_reco_tf.py --inputBSFile=HLT_physicsV7_prescaled._0001.data --outputNTUP_TRIGCOST=trig_cost.root | tee -a '${JOB_LOG}'; RunTrigCostD3PD -f trig_cost.root --outputTagFromAthena --costMode --monitorRates --isCPUPrediction --useEBWeight --patternsMonitor HLT_costmonitor HLT_mistimemonj400 HLT_mistimemoncaltimenomu HLT_mistimemoncaltime HLT_l1topodebug HLT_l1calooverflow HLT_e5_lhvloose_nod0_bBeexM6000t HLT_2e5_lhvloose_nod0_bBeexM6000t HLT_cscmon_L1All HLT_j0_perf_ds1_L1J100 --patternsInvert --predictionLumi 1.50e34 | tee -a '${JOB_LOG}'; chainDump.py -n -S 2>&1 | tee -a '${JOB_LOG} echo "running in subshell: $subshellcmd" (eval $subshellcmd) -grep -r "RATE_" costMonitoring_*/csv/Table_Rate_Group_HLT_All.csv | awk '{split($0,a,","); print a[1]"\t"a[4] }' >> HLTChain.txt -grep "TrigSteer_HLT.TrigChainMoni" ${JOB_LOG} | awk '{split($0,a,":|\t"); print a[4]" "a[10] }' | sed 's/\s*active\s*/_rerun\t/g' | sed 's/\s*HLT/HLT/g' >> HLTChain.txt + grep -r "RATE_" costMonitoring_*/csv/Table_Rate_Group_HLT_All.csv | awk '{split($0,a,","); print a[1]"\t"a[4] }' >> HLTChain.txt + grep "TrigSteer_HLT.TrigChainMoni" ${JOB_LOG} | awk '{split($0,a,":|\t"); print a[4]" "a[10] }' | sed 's/\s*active\s*/_rerun\t/g' | sed 's/\s*HLT/HLT/g' >> HLTChain.txt -ATH_RETURN=${PIPESTATUS[0]} -echo "art-result: ${ATH_RETURN} ${NAME}" + ATH_RETURN=${PIPESTATUS[0]} + echo "art-result: ${ATH_RETURN} ${NAME}" + +fi #exec_art_trigp1test_post.sh diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py index 45bf97b427af17b9b92ba45e71d906d0cf9388d8..768600bce62c0de756351eba2924314f676996ec 100644 --- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py +++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py @@ -1049,6 +1049,10 @@ class triggerMenuSetup(JobProperty): 'MC_pp_v7_BulkMCProd_mc_prescale', 'MC_pp_v7_CPSampleProd_mc_prescale','MC_pp_v7_TriggerValidation_mc_prescale', 'Physics_pp_v7_tight_physics_prescale','Physics_pp_v7_unprescaled_only_physics_prescale', + # ----------------------------------------------------------------- + # Run 3 + 'MC_pp_v8','Physics_pp_v8', 'Physics_pp_v8_lowmu.py', + # ----------------------------------------------------------------- # Upgrade 'MC_PhaseII', diff --git a/Trigger/TriggerRelease/share/runHLT_standalone.py b/Trigger/TriggerRelease/share/runHLT_standalone.py index 28ed829374dd1dd3913136c3d1e87f7cc82735bb..071c4a5e98c46155962cfa8fb9a18b89ab959748 100755 --- a/Trigger/TriggerRelease/share/runHLT_standalone.py +++ b/Trigger/TriggerRelease/share/runHLT_standalone.py @@ -70,6 +70,10 @@ log = logging.getLogger('runHLT_standalone.py') #predefined menu setups accessible using 'test[MC]=True' commandline menuMap={ + #2019 menus: menu name L1 xml file + 'PhysicsV8': ('Physics_pp_v8', 'TriggerMenuXML/LVL1config_Physics_pp_v8.xml'), + 'MCV8': ('MC_pp_v8', 'TriggerMenuXML/LVL1config_MC_pp_v8.xml'), + #2018 menus: menu name L1 xml file 'HIV5': ('Physics_HI_v5', 'TriggerMenuXML/LVL1config_Physics_HI_v5.xml'), 'MCHIV5': ('MC_HI_v5', 'TriggerMenuXML/LVL1config_Physics_HI_v5.xml'),