Merge branch 'master-art-test-names2' into 'master'

DQ ART updates: fix trigger test name again, make better log files

See merge request atlas/athena!32135

Control/AthenaMonitoring/test/test_run3dq_r21_aod.sh

@@ -3,13 +3,14 @@
 # art-type: grid
 # art-include: master/Athena
 # art-output: ExampleMonitorOutput.root
+# art-output: log*
 
-Run3DQTestingDriver.py 'Input.Files=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/data16_13TeV.00311321.physics_Main.recon.AOD.r9264/AOD.11038520._000001.pool.root.1"]' DQ.Steering.doHLTMon=False DQ.Environment=AOD
+Run3DQTestingDriver.py 'Input.Files=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/data16_13TeV.00311321.physics_Main.recon.AOD.r9264/AOD.11038520._000001.pool.root.1"]' DQ.Steering.doHLTMon=False DQ.Environment=AOD  > log.HIST_Creation 2>&1
 
 echo "art-result: $? HIST_Creation"
 
 ArtPackage=$1
 ArtJobName=$2
 art.py download ${ArtPackage} ${ArtJobName}
-hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i
+hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i > log.HIST_Diff 2>&1
 echo "art-result: $? HIST_Diff"

Control/AthenaMonitoring/test/test_run3dq_r21_aod_mt_t8.sh

@@ -3,18 +3,19 @@
 # art-type: grid
 # art-include: master/Athena
 # art-output: ExampleMonitorOutput.root
+# art-output: log*
 # art-athena-mt: 8
 
-Run3DQTestingDriver.py 'Input.Files=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/data16_13TeV.00311321.physics_Main.recon.AOD.r9264/AOD.11038520._000001.pool.root.1"]' DQ.Steering.doHLTMon=False Concurrency.NumThreads=8 Concurrency.NumConcurrentEvents=8 DQ.Environment=AOD
+Run3DQTestingDriver.py 'Input.Files=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/data16_13TeV.00311321.physics_Main.recon.AOD.r9264/AOD.11038520._000001.pool.root.1"]' DQ.Steering.doHLTMon=False Concurrency.NumThreads=8 Concurrency.NumConcurrentEvents=8 DQ.Environment=AOD  > log.HIST_Creation 2>&1
 
 echo "art-result: $? HIST_Creation"
 
 ArtPackage=$1
 ArtJobName=$2
 art.py download ${ArtPackage} ${ArtJobName}
-hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i -t
+hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i -t > log.HIST_Diff 2>&1
 echo "art-result: $? HIST_Diff"
 
 art.py download AthenaMonitoring test_run3dq_r21_aod.sh
-hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i -t
+hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i -t > log.HIST_Diff_Serial 2>&1
 echo "art-result: $? HIST_Diff_Serial"

Control/AthenaMonitoring/test/test_run3dq_r21_esd.sh

@@ -3,13 +3,14 @@
 # art-type: grid
 # art-include: master/Athena
 # art-output: ExampleMonitorOutput.root
+# art-output: log*
 
-Run3DQTestingDriver.py 'Input.Files=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q431/21.0/myESD.pool.root"]' DQ.Steering.doHLTMon=False --postExec 'cfg.getEventAlgo("LArCollisionTimeAlg").cutIteration=False'
+Run3DQTestingDriver.py 'Input.Files=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q431/21.0/myESD.pool.root"]' DQ.Steering.doHLTMon=False --postExec 'cfg.getEventAlgo("LArCollisionTimeAlg").cutIteration=False'  > log.HIST_Creation 2>&1
 
 echo "art-result: $? HIST_Creation"
 
 ArtPackage=$1
 ArtJobName=$2
 art.py download ${ArtPackage} ${ArtJobName}
-hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i
+hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i > log.HIST_Diff 2>&1
 echo "art-result: $? HIST_Diff"

Control/AthenaMonitoring/test/test_run3dq_r21_esd_mc.sh

@@ -3,13 +3,14 @@
 # art-type: grid
 # art-include: master/Athena
 # art-output: ExampleMonitorOutput.root
+# art-output: log*
 
-Run3DQTestingDriver.py 'Input.Files=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q221/21.0/myESD.pool.root"]' DQ.Steering.doHLTMon=False --postExec 'cfg.getEventAlgo("LArCollisionTimeAlg").cutIteration=False'
+Run3DQTestingDriver.py 'Input.Files=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q221/21.0/myESD.pool.root"]' DQ.Steering.doHLTMon=False --postExec 'cfg.getEventAlgo("LArCollisionTimeAlg").cutIteration=False'  > log.HIST_Creation 2>&1
 
 echo "art-result: $? HIST_Creation"
 
 ArtPackage=$1
 ArtJobName=$2
 art.py download ${ArtPackage} ${ArtJobName}
-hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i
+hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i > log.HIST_Diff 2>&1
 echo "art-result: $? HIST_Diff"

Control/AthenaMonitoring/test/test_run3dq_r21_esd_mt.sh

@@ -3,19 +3,20 @@
 # art-type: grid
 # art-include: master/Athena
 # art-output: ExampleMonitorOutput.root
+# art-output: log*
 
-Run3DQTestingDriver.py 'Input.Files=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q431/21.0/myESD.pool.root"]' DQ.Steering.doHLTMon=False Concurrency.NumThreads=1 Concurrency.NumConcurrentEvents=1 --postExec 'cfg.getEventAlgo("LArCollisionTimeAlg").cutIteration=False'
+Run3DQTestingDriver.py 'Input.Files=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q431/21.0/myESD.pool.root"]' DQ.Steering.doHLTMon=False Concurrency.NumThreads=1 Concurrency.NumConcurrentEvents=1 --postExec 'cfg.getEventAlgo("LArCollisionTimeAlg").cutIteration=False'  > log.HIST_Creation 2>&1
 
 echo "art-result: $? HIST_Creation"
 
 ArtPackage=$1
 ArtJobName=$2
 art.py download ${ArtPackage} ${ArtJobName}
-hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i
+hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i > log.HIST_Diff 2>&1
 echo "art-result: $? HIST_Diff"
 rm -rf ref-*
 
 art.py download AthenaMonitoring test_run3dq_r21_esd.sh
-hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i
+hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i > log.HIST_Diff_Serial 2>&1
 echo "art-result: $? HIST_Diff_Serial"
 

Control/AthenaMonitoring/test/test_run3dq_r22_aod.sh

@@ -3,10 +3,11 @@
 # art-type: grid
 # art-include: master/Athena
 # art-output: ExampleMonitorOutput.root
+# art-output: log*
 
 art.py download Tier0ChainTests test_q431.sh
 AODFILE=(./ref-*/myAOD.pool.root)
-Run3DQTestingDriver.py 'Input.Files=["'${AODFILE}'"]' DQ.Environment=AOD DQ.Steering.doHLTMon=False
+Run3DQTestingDriver.py 'Input.Files=["'${AODFILE}'"]' DQ.Environment=AOD DQ.Steering.doHLTMon=False > log.HIST_Creation 2>&1
 
 echo "art-result: $? HIST_Creation"
 rm -rf ref-*
@@ -14,5 +15,5 @@ rm -rf ref-*
 ArtPackage=$1
 ArtJobName=$2
 art.py download ${ArtPackage} ${ArtJobName}
-hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i
+hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i > log.HIST_Diff 2>&1
 echo "art-result: $? HIST_Diff"

Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger.sh

@@ -5,7 +5,7 @@
 # art-output: ExampleMonitorOutput.root
 # art-output: log*
 
-art.py download TrigAnalysisTest test_trigAna_q221_RDOtoAOD_mt1_grid.py
+art.py download TrigAnalysisTest test_trigAna_RDOtoAOD_mt1_grid.py
 AODFILE=(./ref-*/AOD.pool.root)
 Run3DQTestingDriver.py 'Input.Files=["'${AODFILE}'"]' DQ.Steering.doHLTMon=True DQ.Environment=AOD --dqOffByDefault > log.HIST_Creation 2>&1
 

Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_mt.sh

@@ -3,8 +3,9 @@
 # art-type: grid
 # art-include: master/Athena
 # art-output: ExampleMonitorOutput.root
+# art-output: log*
 
-art.py download TrigAnalysisTest test_trigAna_q221_RDOtoAOD_mt1_grid.py
+art.py download TrigAnalysisTest test_trigAna_RDOtoAOD_mt1_grid.py
 AODFILE=(./ref-*/AOD.pool.root)
 Run3DQTestingDriver.py 'Input.Files=["'${AODFILE}'"]' DQ.Steering.doHLTMon=True DQ.Environment=AOD Concurrency.NumThreads=1 Concurrency.NumConcurrentEvents=1 --dqOffByDefault > log.HIST_Creation 2>&1
 

Control/AthenaMonitoring/test/test_run3dq_r22_esd.sh

@@ -3,10 +3,11 @@
 # art-type: grid
 # art-include: master/Athena
 # art-output: ExampleMonitorOutput.root
+# art-output: log*
 
 art.py download Tier0ChainTests test_q431.sh
 ESDFILE=(./ref-*/myESD.pool.root)
-Run3DQTestingDriver.py 'Input.Files=["'${ESDFILE}'"]' DQ.Steering.doHLTMon=False
+Run3DQTestingDriver.py 'Input.Files=["'${ESDFILE}'"]' DQ.Steering.doHLTMon=False > log.HIST_Creation 2>&1
 
 echo "art-result: $? HIST_Creation"
 rm -rf ref-*
@@ -14,5 +15,5 @@ rm -rf ref-*
 ArtPackage=$1
 ArtJobName=$2
 art.py download ${ArtPackage} ${ArtJobName}
-hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i
+hist_diff.sh ExampleMonitorOutput.root ./ref-*/ExampleMonitorOutput.root -x TIME_execute -i > log.HIST_Diff 2>&1
 echo "art-result: $? HIST_Diff"