From 3609374244fba954a3679e5b7f1fff91dc236097 Mon Sep 17 00:00:00 2001
From: Julie Kirk <Julie.Kirk@cern.ch>
Date: Wed, 20 Feb 2019 15:49:58 +0100
Subject: [PATCH] Changes to TrigAnalysisTest ART tests - fix existing FTK test
- add new FTK tests - add NTUP_PHYSVAL test
Addresses ATR-19330
---
.../test/test_mc_NTUP_PHYSVAL_grid.sh | 46 -------------------
.../test/test_mc_pp_v7_ftk_rdotoaod_build.sh | 6 +--
.../test/test_mc_pp_v7_ftk_rdotoaod_grid.sh | 2 +-
.../test_mc_pp_v7_ftk_rdotoesdaod_build.sh | 4 +-
.../test_mc_pp_v7_ftk_rdotoesdaod_grid.sh | 4 +-
.../test/test_mc_pp_v7_rdotoaod_build.sh | 2 +-
6 files changed, 9 insertions(+), 55 deletions(-)
delete mode 100755 Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_NTUP_PHYSVAL_grid.sh
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_NTUP_PHYSVAL_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_NTUP_PHYSVAL_grid.sh
deleted file mode 100755
index 90a7e975110..00000000000
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_NTUP_PHYSVAL_grid.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# art-description: Trigger Event Data Model test on AOD
-# art-type: grid
-# art-include: 21.3/Athena
-# art-include: master/Athena
-# art-include: master/AthenaP1
-# art-output: *check*
-# art-output: *.log
-# art-output: log.*
-# art-output: *.root
-# art-output: *.pmon.gz
-# art-output: TotalEventsProcessed.txt
-# art-output: PHYSVAL_WEB
-
-export NAME="mc_NTUP_PHYSVAL_grid"
-export JOB_LOG="athena.log"
-export TEST="TrigAnalysisTest"
-export NEVT=10
-export DS='/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigAnalysisTest/AthenaTrigAOD_TrigEDMandTDTCheck_MC_pp_v7_chain/AOD.pool.root'
-
-Reco_tf.py --inputAODFile=${DS} --preExec "all:from InDetPhysValMonitoring.InDetPhysValJobProperties import InDetPhysValFlags; InDetPhysValFlags.doValidateTightPrimaryTracks.set_Value_and_Lock(True);" --skipEvents="0" --maxEvents=${NEVT} --valid="True" --jobNumber="1" --validationFlags doExample,doMET,doPFlow,doEgamma,doInDet,doTau,doJet,doBtag,doZee,doMuon,doTrigEgamma,doTrigBphys,doTrigMET,doTrigJet,doTrigMuon,doTrigHLTResult,doTrigCalo,doTrigMinBias,doTrigTau,doTrigIDtrk,doTrigBjet --outputNTUP_PHYSVALFile="NTUP_PHYSVAL.pool.root" > output.log
-
-echo "art-result: $? PhysVal"
-
-
-
-# We need to place a reference file on cvmfs
-#physval_make_web_display.py --ratio --reffile Ref:PHYSVAL_all.root --title Test PHYSVAL_all.root --outdir PHYSVAL_WEB
-mkdir PHYSVAL_WEB
-#domains="BTag Ele Gam IDTrk Jets Muons MET PFlow TopoClusters"
-###domains="BTag Electron IDPerformanceMon Jets MET Muons PFlow Photon Summary Tau TopoClusters"
-###doTrigEgamma,doTrigBphys,doTrigMET,doTrigJet,doTrigMuon,doTrigHLTResult,doTrigCalo,doTrigMinBias,doTrigTau,doTrigIDtrk,doTrigBjet
-#for slice in ${domains}
-#do
-# physval_make_web_display.py --ratio --reffile Ref:/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DerivationFrameworkPhysicsValidation/PHYSVAL_all_reference.root --title Test PHYSVAL_all.root --outdir PHYSVAL_WEB/${slice} --startpath ${slice}
- physval_make_web_display.py --ratio --drawopt HISTPE --refdrawopt HIST --reffile Ref:NTUP_PHYSVAL.pool.root --title Test --outdir PHYSVAL_WEB --startpath run_1/HLT NTUP_PHYSVAL.pool.root
-#done
-echo "art-result: $? web"
-
-
-
-#ArtPackage=$1
-#ArtJobName=$2
-#art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
-#echo "art-result: $? Diff"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoaod_build.sh
index b78705174c4..97fb21d4107 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoaod_build.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-# art-description: Trigger MC pp v7 RDO to AOD test
-# art-type: grid
+# art-description: Trigger MC pp v7 RDO to AOD test FTK
+# art-type: build
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.0-TrigMC/Athena
@@ -24,7 +24,7 @@
# art-output: AOD.pool.root.checkFiletrigSize.txt
# art-output: *.regtest.new
-export NAME="mc_pp_v7_rdotoaod_grid"
+export NAME="mc_pp_v7_ftk_rdotoaod_grid"
export INPUT="ftk"
export COST_MONITORING="False"
export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoaod_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoaod_grid.sh
index f39ad0ff94f..6f3d1c4d16d 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoaod_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoaod_grid.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# art-description: Trigger MC pp v7 RDO to AOD test
+# art-description: Trigger MC pp v7 RDO to AOD test with FTK
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.3/Athena
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoesdaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoesdaod_build.sh
index 70ba80399fd..0fdd410b925 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoesdaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoesdaod_build.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# art-description: Trigger MC pp v7 RDO to ESD and AOD test, plus extra tests using these files
+# art-description: Trigger MC pp v7 RDO to ESD and AOD test, plus extra tests using these files. With FTK
# art-type: build
# art-include: 21.0/Athena
# art-include: 21.3/Athena
@@ -22,7 +22,7 @@
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest.new
-export NAME="mc_pp_v7_rdotoesdaod_build"
+export NAME="mc_pp_v7_ftk_rdotoesdaod_build"
export INPUT="ftk"
export COST_MONITORING="False"
export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoesdaod_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoesdaod_grid.sh
index 4118c430589..c465e5f56b5 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoesdaod_grid.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoesdaod_grid.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# art-description: Trigger MC pp v7 RDO to ESD and AOD test, plus extra tests using these files
+# art-description: Trigger MC pp v7 RDO to ESD and AOD test, plus extra tests using these files. With FTK
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.3/Athena
@@ -25,7 +25,7 @@
# art-output: *.regtest.new
-export NAME="mc_pp_v7_rdotoesdaod_grid"
+export NAME="mc_pp_v7_ftk_rdotoesdaod_grid"
export INPUT="ftk"
export COST_MONITORING="False"
export TEST="TrigAnalysisTest"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaod_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaod_build.sh
index 01903957f28..3722f26b482 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaod_build.sh
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaod_build.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# art-description: Trigger MC pp v7 RDO to AOD test
-# art-type: grid
+# art-type: build
# art-include: 21.0/Athena
# art-include: 21.3/Athena
# art-include: 21.0-TrigMC/Athena
--
GitLab