TrigP1Test: further fixes for migration to 21.3 (ATR-19204)

Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test_ART.conf

@@ -116,7 +116,7 @@ test 18
   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
+  athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.3 ; 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_physicsV8_savedBS_test.log 
@@ -229,9 +229,15 @@ test 41
   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 "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}"
+  athena_cmd export AMIConfig=$(cat /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/T0Config_21.3.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.3,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 194
+  name Trigreco_mcV8_currentT0
+  doc Trig_reco_tf with current T0 config with mcV8
+  checklog --config checklogTrigP1Test.conf --showexcludestats
+  athena_cmd export AMIConfig=$(cat /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/T0Config_21.3.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 "testMCV8=True;HLTOutputLevel=INFO;doValidation=True" --maxEvents '15' --outputBSFile "tmp.BS"; Reco_tf.py --asetup "RAWtoALL:Athena,21.3,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_physicsV8_currentT0_ESD
@@ -240,7 +246,16 @@ test 42
   checklog --config checklogTrigP1Test.conf --showexcludestats
   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"]' 
+  athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.3 ; athena.py -c 'fileList=["../Trigreco_physicsV8_currentT0/myESD.pool.root"]' 
+
+test 195
+  name  TrigEDMCheck_mcV8_currentT0_ESD
+  doc EDMCheck on TrigEDMCheck_mcV8_currentT0
+  joboptions testAthenaP1ESD_TrigEDMCheck_data.py
+  checklog --config checklogTrigP1Test.conf --showexcludestats
+  fullregtest REGTEST|WARNING  /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/TrigEDMCheck_mcV8_currentT0_ESD/trigp1test_TrigEDMCheck_mcV8_currentT0.reference
+  pre_condition if [[ $(find ../Trigreco_mcV8_currentT0/myESD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../Trigreco_mcV8_currentT0/myESD.pool.root ; else test -e non_existing_file ; fi
+  athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.3 ; athena.py -c 'fileList=["../Trigreco_mcV8_currentT0/myESD.pool.root"]'
 
 test 43
   name  TrigEDMCheck_physicsV8_currentT0_AOD
@@ -249,8 +264,16 @@ test 43
   checklog --config checklogTrigP1Test.conf --showexcludestats
   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"]' 
+  athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.3 ; athena.py -c 'fileList=["../Trigreco_physicsV8_currentT0/myAOD.pool.root"]' 
 
+test 196
+  name  TrigEDMCheck_mcV8_currentT0_AOD
+  doc EDMCheck on TrigEDMCheck_mcV8_currentT0
+  joboptions testAthenaP1ESD_TrigEDMCheck_data.py
+  checklog --config checklogTrigP1Test.conf --showexcludestats
+  fullregtest REGTEST|WARNING  /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/TrigEDMCheck_mcV8_currentT0_AOD/trigp1test_TrigEDMCheck_mcV8_currentT0.reference
+  pre_condition if [[ $(find ../Trigreco_mcV8_currentT0/myAOD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../Trigreco_mcV8_currentT0/myAOD.pool.root ; else test -e non_existing_file ; fi
+  athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.3 ; athena.py -c 'fileList=["../Trigreco_mcV8_currentT0/myAOD.pool.root"]'
 
 ### this does not work due to conditions...
 test 44
@@ -566,7 +589,15 @@ test 80
   doc RAWtoESD on output from HLT_physicsV8
   checklog --config checklogTrigP1Test.conf --showexcludestats
   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
+  athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.3 ; 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 191
+  name RAWtoESD_mcV8
+  doc RAWtoESD on output from HLT_mcV8
+  checklog --config checklogTrigP1Test.conf --showexcludestats
+  pre_condition test -e '../HLT_mcV8/HLT_mcV8._0001.data'
+  athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.3 ; 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_mcV8/HLT_mcV8._0001.data   --maxEvents 5 --outputESDFile RAWtoESD.pool.root
   post_command checkFile.py RAWtoESD.pool.root > ESD.txt
 
 test 81
@@ -577,7 +608,17 @@ test 81
   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"]' 
+  athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.3 ; athena.py -c 'fileList=["ESD.pool.root"]' 
+
+test 192
+  name TrigEDMCheck_mcV8
+  doc EDM checker on ESD from RAWtoESD_mcV8
+  joboptions testAthenaP1ESD_TrigEDMCheck_data.py
+  checklog --config checklogTrigP1Test.conf --showexcludestats
+  fullregtest    REGTEST  /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/TrigEDMCheck_mcV8/trigp1test_TrigEDMCheck_mcV8.reference
+  pre_condition if [[ $(find ../RAWtoESD_mcV8/RAWtoESD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../RAWtoESD_mcV8/RAWtoESD.pool.root ; else test -e non_existing_file ; fi
+  pre_command ln -s ../RAWtoESD_mcV8/RAWtoESD.pool.root ESD.pool.root
+  athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.3 ; athena.py -c 'fileList=["ESD.pool.root"]'
 
 test 82
   name TrigDecTool_physicsV8
@@ -588,6 +629,16 @@ test 82
   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 193
+  name TrigDecTool_mcV8
+  doc  Check of TrigDec for events produced by RAWtoESD_mcV8
+  checklog --config checklogTrigP1Test.conf --showexcludestats
+  fullregtest    REGTEST /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/TrigDecTool_mcV8/trigp1test_TrigDecTool_mcV8.reference
+  pre_condition if [[ $(find ../RAWtoESD_mcV8/RAWtoESD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../RAWtoESD_mcV8/RAWtoESD.pool.root ; else test -e non_existing_file ; fi
+  pre_command ln -s ../RAWtoESD_mcV8/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 
 test 83
   name Reco_tf_mcV7_savedBS

Trigger/TrigValidation/TrigP1Test/test/exec_art_trigp1test_post.sh

@@ -44,8 +44,11 @@ if [ -f ${REF_FOLDER}/athena.regtest ]; then
   echo "art-result: ${PIPESTATUS[0]} RegTest"
 else
   echo $(date "+%FT%H:%M %Z")"     No reference athena.regtest found in ${REF_FOLDER}"
+  echo "art-result: 999 RegTest"
 fi
 
+mv athena.regtest athena.regtest.new
+
 if [ -f ${REF_FOLDER}/expert-monitoring.root ]; then
   echo $(date "+%FT%H:%M %Z")"     Running rootcomp"
   timeout 10m rootcomp.py ${REF_FOLDER}/expert-monitoring.root | tee rootcompout.log
@@ -55,6 +58,8 @@ if [ -f ${REF_FOLDER}/expert-monitoring.root ]; then
   echo "art-result: ${PIPESTATUS[0]} CheckCounts"
 else
   echo $(date "+%FT%H:%M %Z")"     No reference expert-monitoring.root found in ${REF_FOLDER}"
+  echo "art-result:  999 RootComp"
+  echo "art-result:  999 CheckCounts"
 fi
 
 if [ -f trig_cost.root ]; then 

Trigger/TrigValidation/TrigP1Test/test/test_HLT_RAWtoESD_TrigEDMCheck_TrigDecTool_physics_build.sh

 #!/bin/bash
 
-# art-description: athenaHLT on EB data with Physics_pp_v8 menu, RAWtoESD on output, EDM checker on ESD, and Check of TrigDec 
+# art-description: athenaHLT on EB data with MC_pp_v8 menu (temporarily replaced from physics 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_physicsV8
+export NAME=HLT_mcV8
 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_physicsV8
+export NAME=RAWtoESD_mcV8
 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_physicsV8
+export NAME=TrigEDMCheck_mcV8
 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_physicsV8
+export NAME=TrigDecTool_mcV8
 export JOB_LOG="${NAME}.log"
 
 timeout 50m trigtest_ART.pl --cleardir  --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG}

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_physicsV8_currentT0
+export NAME=Trigreco_mcV8_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_physicsV8_currentT0_ESD
+export NAME=TrigEDMCheck_mcV8_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_physicsV8_currentT0_AOD
+export NAME=TrigEDMCheck_mcV8_currentT0_AOD
 export JOB_LOG="${NAME}.log"
 
 timeout 50m trigtest_ART.pl --cleardir  --test ${NAME} --rundir ${NAME} --conf TrigP1Test_ART.conf | tee ${JOB_LOG}

Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_CostMonitoring_PhysicsV7_grid.sh

@@ -20,7 +20,7 @@
 # art-output: *.root
 # art-output: ntuple.pmon.gz
 # art-output: *perfmon*
-# art-output: *.regtest
+# art-output: *.regtest.new
 # art-output: *stdout*
 
 export NAME="athenaHLT_CostMonitoring_PhysicsV7_grid"

Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_on_data_leakCheck_grid.sh

@@ -20,7 +20,7 @@
 # art-output: *.root
 # art-output: ntuple.pmon.gz
 # art-output: *perfmon*
-# art-output: *.regtest
+# art-output: *.regtest.new
 # art-output: LeakCheck.txt
 
 export NAME="athenaHLT_on_data_leakCheck_grid"

Trigger/TrigValidation/TrigP1Test/test/test_physics_pp_v7_PSed_nightlyDayBefore_grid.sh

@@ -14,7 +14,7 @@
 # art-output: *.root
 # art-output: ntuple.pmon.gz
 # art-output: *perfmon*
-# art-output: *.regtest
+# art-output: *.regtest.new
 # art-output: *stdout*
 
 export NAME="athenaHLT_prescaled_PhysicsV7"