From d4221185d185b4bca2f3c0b398d7e7c2575bcd7f Mon Sep 17 00:00:00 2001
From: Tamara Vazquez Schroeder <tvazquez@cern.ch>
Date: Thu, 19 Apr 2018 13:36:17 +0200
Subject: [PATCH] add stage name and remove inputBS for qtests in ART

Former-commit-id: 08f91386dbf3a075700a4b69b8c6a2db73be1c56
---
 .../test/test_Run00330470_Muons_Collisions.sh             | 4 ++--
 .../test/test_expressstream_1_run276689_collisions.sh     | 6 +++---
 .../test/test_expressstream_2_run276689_collisions.sh     | 6 +++---
 .../test/test_expressstream_3_run276689_collisions.sh     | 4 ++--
 .../test/test_expressstream_4_run276689_collisions.sh     | 4 ++--
 .../test_expressstream_4_run276689_collisions_rawtoall.sh | 4 ++--
 Tools/Tier0ChainTests/test/test_q220.sh                   | 6 +++---
 Tools/Tier0ChainTests/test/test_q220_mp.sh                | 2 +-
 Tools/Tier0ChainTests/test/test_q221.sh                   | 8 ++++----
 Tools/Tier0ChainTests/test/test_q221_mp.sh                | 2 +-
 Tools/Tier0ChainTests/test/test_q223.sh                   | 6 +++---
 Tools/Tier0ChainTests/test/test_q223_mp.sh                | 2 +-
 Tools/Tier0ChainTests/test/test_q431.sh                   | 6 +++---
 Tools/Tier0ChainTests/test/test_q431_mp.sh                | 2 +-
 .../test/test_run00184169_egamma_collisions.sh            | 4 ++--
 15 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/Tools/Tier0ChainTests/test/test_Run00330470_Muons_Collisions.sh b/Tools/Tier0ChainTests/test/test_Run00330470_Muons_Collisions.sh
index 1a1d065cd7d..657149bc71a 100755
--- a/Tools/Tier0ChainTests/test/test_Run00330470_Muons_Collisions.sh
+++ b/Tools/Tier0ChainTests/test/test_Run00330470_Muons_Collisions.sh
@@ -4,9 +4,9 @@
 # art-type: grid
 
 Reco_tf.py  --outputHISTFile=myMergedMonitoring_Muons_0.root --maxEvents=500 --outputESDFile=myESD_Muons_0.pool.root --outputAODFile=myAOD_Muons_0.AOD.pool.root --outputTAGFile=myTAG_Muons_0.root --ignoreErrors=False --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data17_13TeV.00330470.physics_Main.merge.DRAW_ZMUMU.f843_m1831._0245.1 --preExec='rec.doTrigger=False;' --imf False --conditionsTag=CONDBR2-BLKPA-2018-03 --geometryVersion=ATLAS-R2-2016-01-00-01
-echo "art-result: $?"
+echo "art-result: $? Reco"
 
 ArtPackage=$1
 ArtJobName=$2
 art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
-echo "art-result: $?"
+echo "art-result: $? Diff"
diff --git a/Tools/Tier0ChainTests/test/test_expressstream_1_run276689_collisions.sh b/Tools/Tier0ChainTests/test/test_expressstream_1_run276689_collisions.sh
index 93b5fce382d..3524017730e 100755
--- a/Tools/Tier0ChainTests/test/test_expressstream_1_run276689_collisions.sh
+++ b/Tools/Tier0ChainTests/test/test_expressstream_1_run276689_collisions.sh
@@ -4,12 +4,12 @@
 # art-type: grid
 
 Reco_tf.py  --outputHISTFile=myMergedMonitoring_express_0.root --AMI=f628 --maxEvents=25 --outputESDFile=myESD_express_0.pool.root --outputAODFile=myAOD_express_0.AOD.pool.root --outputTAGFile=myTAG_express_0.root --ignoreErrors=False --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data15_13TeV.00276689.express_express.merge.RAW._lb0220._SFO-ALL._0001.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data15_13TeV.00276689.express_express.merge.RAW._lb0221._SFO-ALL._0001.1 --imf False
-echo "art-result: $?"
+echo "art-result: $? Reco"
 
 Reco_tf.py --inputAODFile myAOD_express_0.AOD.pool.root --outputTAGFile myTAG_express_0.root
-echo "art-result: $?"
+echo "art-result: $? AODtoTAG"
 
 ArtPackage=$1
 ArtJobName=$2
 art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
-echo "art-result: $?"
+echo "art-result: $? Diff"
diff --git a/Tools/Tier0ChainTests/test/test_expressstream_2_run276689_collisions.sh b/Tools/Tier0ChainTests/test/test_expressstream_2_run276689_collisions.sh
index 54bcf8d21b9..a73dd42c819 100755
--- a/Tools/Tier0ChainTests/test/test_expressstream_2_run276689_collisions.sh
+++ b/Tools/Tier0ChainTests/test/test_expressstream_2_run276689_collisions.sh
@@ -4,13 +4,13 @@
 # art-type: grid
 
 Reco_tf.py  --outputHISTFile=myMergedMonitoring_express_1.root --AMI=f628 --maxEvents=25 --outputESDFile=myESD_express_1.pool.root --outputAODFile=myAOD_express_1.AOD.pool.root --outputTAGFile=myTAG_express_1.root --ignoreErrors=False --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data15_13TeV.00276689.express_express.merge.RAW._lb0222._SFO-ALL._0001.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data15_13TeV.00276689.express_express.merge.RAW._lb0223._SFO-ALL._0001.1 --imf False
-echo "art-result: $?"
+echo "art-result: $? Reco"
 
 Reco_tf.py --inputAODFile myAOD_express_1.AOD.pool.root --outputTAGFile myTAG_express_1.root
-echo "art-result: $?"
+echo "art-result: $? AODtoTAG"
 
 ArtPackage=$1
 ArtJobName=$2
 art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
-echo "art-result: $?"
+echo "art-result: $? Diff"
 
diff --git a/Tools/Tier0ChainTests/test/test_expressstream_3_run276689_collisions.sh b/Tools/Tier0ChainTests/test/test_expressstream_3_run276689_collisions.sh
index 2e27f19f64e..29de5820fd0 100755
--- a/Tools/Tier0ChainTests/test/test_expressstream_3_run276689_collisions.sh
+++ b/Tools/Tier0ChainTests/test/test_expressstream_3_run276689_collisions.sh
@@ -4,9 +4,9 @@
 # art-type: grid
 
 Reco_tf.py  --outputHISTFile=myMergedMonitoring_express_2.root --AMI=f628 --maxEvents=300 --outputESDFile=myESD_express_2.pool.root --outputAODFile=myAOD_express_2.AOD.pool.root --outputTAGFile=myTAG_express_2.root --ignoreErrors=False --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data15_13TeV.00276689.express_express.merge.RAW._lb0224._SFO-ALL._0001.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data15_13TeV.00276689.express_express.merge.RAW._lb0225._SFO-ALL._0001.1 --imf False
-echo "art-result: $?"
+echo "art-result: $? Reco"
 
 ArtPackage=$1
 ArtJobName=$2
 art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
-echo "art-result: $?"
+echo "art-result: $? Diff"
diff --git a/Tools/Tier0ChainTests/test/test_expressstream_4_run276689_collisions.sh b/Tools/Tier0ChainTests/test/test_expressstream_4_run276689_collisions.sh
index 19d239f380d..9234a6ebd1d 100755
--- a/Tools/Tier0ChainTests/test/test_expressstream_4_run276689_collisions.sh
+++ b/Tools/Tier0ChainTests/test/test_expressstream_4_run276689_collisions.sh
@@ -4,9 +4,9 @@
 # art-type: grid
 
 Reco_tf.py  --outputHISTFile=myMergedMonitoring_express_3.root --AMI=f628 --maxEvents=30 --outputESDFile=myESD_express_3.pool.root --outputAODFile=myAOD_express_3.AOD.pool.root --outputTAGFile=myTAG_express_3.root --ignoreErrors=False --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data15_13TeV.00276689.express_express.merge.RAW._lb0226._SFO-ALL._0001.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data15_13TeV.00276689.express_express.merge.RAW._lb0227._SFO-ALL._0001.1 --imf False
-echo "art-result: $?"
+echo "art-result: $? Reco"
 
 ArtPackage=$1
 ArtJobName=$2
 art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
-echo "art-result: $?"
+echo "art-result: $? Diff"
diff --git a/Tools/Tier0ChainTests/test/test_expressstream_4_run276689_collisions_rawtoall.sh b/Tools/Tier0ChainTests/test/test_expressstream_4_run276689_collisions_rawtoall.sh
index d7c5559c17a..b8bd6f78b59 100755
--- a/Tools/Tier0ChainTests/test/test_expressstream_4_run276689_collisions_rawtoall.sh
+++ b/Tools/Tier0ChainTests/test/test_expressstream_4_run276689_collisions_rawtoall.sh
@@ -4,10 +4,10 @@
 # art-type: grid
 
 Reco_tf.py  --outputHISTFile=myMergedMonitoring_express_3.root --AMI=f628 --maxEvents=30 --outputESDFile=myESD_express_3.pool.root --outputAODFile=myAOD_express_3.AOD.pool.root --outputTAGFile=myTAG_express_3.root --ignoreErrors=False --steering=doRAWtoALL --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data15_13TeV.00276689.express_express.merge.RAW._lb0226._SFO-ALL._0001.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data15_13TeV.00276689.express_express.merge.RAW._lb0227._SFO-ALL._0001.1 --imf False
-echo "art-result: $?"
+echo "art-result: $? Reco"
 
 ArtPackage=$1
 ArtJobName=$2
 art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
-echo "art-result: $?"
+echo "art-result: $? Diff"
 
diff --git a/Tools/Tier0ChainTests/test/test_q220.sh b/Tools/Tier0ChainTests/test/test_q220.sh
index 730eb844a4a..f35d8ec82ae 100755
--- a/Tools/Tier0ChainTests/test/test_q220.sh
+++ b/Tools/Tier0ChainTests/test/test_q220.sh
@@ -3,12 +3,12 @@
 # art-description: RecoTrf
 # art-type: grid
 
-Reco_tf.py --AMI=q220 --outputTAGFile=myTAG.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data15_cos.00251363.physics_IDCosmic.merge.RAW._lb0057._SFO-ALL._0001.1 --imf False
-echo "art-result: $?"
+Reco_tf.py --AMI=q220 --outputTAGFile=myTAG.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
+echo "art-result: $? Reco"
 
 ArtPackage=$1
 ArtJobName=$2
 art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
-echo "art-result: $?"
+echo "art-result: $? Diff"
 
 
diff --git a/Tools/Tier0ChainTests/test/test_q220_mp.sh b/Tools/Tier0ChainTests/test/test_q220_mp.sh
index ea6e2a0a9fe..64bc4db9060 100755
--- a/Tools/Tier0ChainTests/test/test_q220_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_q220_mp.sh
@@ -3,5 +3,5 @@
 # art-description: RecoTrf
 # art-type: grid
 
-Reco_tf.py --AMI=q220 --athenaopts='--nprocs=2' --maxEvents=100 --outputTAGFile=myTAG.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data15_cos.00251363.physics_IDCosmic.merge.RAW._lb0057._SFO-ALL._0001.1
+Reco_tf.py --AMI=q220 --athenaopts='--nprocs=2' --maxEvents=100 --outputTAGFile=myTAG.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root
 
diff --git a/Tools/Tier0ChainTests/test/test_q221.sh b/Tools/Tier0ChainTests/test/test_q221.sh
index d349b478531..cee5c89ce95 100755
--- a/Tools/Tier0ChainTests/test/test_q221.sh
+++ b/Tools/Tier0ChainTests/test/test_q221.sh
@@ -3,14 +3,14 @@
 # art-description: RecoTrf
 # art-type: grid
 
-Reco_tf.py --AMI=q221 --outputRDOFile=myRDO.pool.root --outputTAGFile=myTAG.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc15_13TeV.410500.PowhegPythia8EvtGen_A14_ttbar_hdamp172p5_nonallhad.simul.HITS.e4797_s2726.50events.pool.root --imf False
-echo "art-result: $?"
+Reco_tf.py --AMI=q221 --outputRDOFile=myRDO.pool.root --outputTAGFile=myTAG.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
+echo "art-result: $? Reco"
 
 Reco_tf.py --validationFlags 'doExample,doMET,doPFlow,doTau,doEgamma,doBtag,doZee,doJet,doTopoCluster,doMuon,doTrigMinBias,doTrigIDtrk,doTrigBphys,doTrigMET,doTrigJet,doTrigTau, doTrigEgamma,doTrigMuon,doTrigBjet,doTrigHLTResult' --inputAODFile=myAOD.pool.root  --outputNTUP_PHYSVALFile=myNTUP_PHYSVAL.root
-echo "art-result: $?"
+echo "art-result: $? PhysVal"
 
 ArtPackage=$1
 ArtJobName=$2
 art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
-echo "art-result: $?"
+echo "art-result: $? Diff"
 
diff --git a/Tools/Tier0ChainTests/test/test_q221_mp.sh b/Tools/Tier0ChainTests/test/test_q221_mp.sh
index 9a71a838704..6a3bb5edd21 100755
--- a/Tools/Tier0ChainTests/test/test_q221_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_q221_mp.sh
@@ -3,5 +3,5 @@
 # art-description: RecoTrf
 # art-type: grid
 
-Reco_tf.py --AMI=q221 --athenaopts='--nprocs=2' --maxEvents=100 --outputRDOFile=myRDO.pool.root --outputTAGFile=myTAG.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc15_13TeV.410500.PowhegPythia8EvtGen_A14_ttbar_hdamp172p5_nonallhad.simul.HITS.e4797_s2726.50events.pool.root
+Reco_tf.py --AMI=q221 --athenaopts='--nprocs=2' --maxEvents=100 --outputRDOFile=myRDO.pool.root --outputTAGFile=myTAG.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root
 
diff --git a/Tools/Tier0ChainTests/test/test_q223.sh b/Tools/Tier0ChainTests/test/test_q223.sh
index 5ffecbc4c45..dea40713cba 100755
--- a/Tools/Tier0ChainTests/test/test_q223.sh
+++ b/Tools/Tier0ChainTests/test/test_q223.sh
@@ -3,12 +3,12 @@
 # art-description: RecoTrf
 # art-type: grid
 
-Reco_tf.py --AMI=q223 --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data15_comm.00264034.physics_MinBias.daq.RAW._lb0644._SFO-6._0001.data --imf False
-echo "art-result: $?"
+Reco_tf.py --AMI=q223 --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
+echo "art-result: $? Reco"
 
 ArtPackage=$1
 ArtJobName=$2
 art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
-echo "art-result: $?"
+echo "art-result: $? Diff"
 
 
diff --git a/Tools/Tier0ChainTests/test/test_q223_mp.sh b/Tools/Tier0ChainTests/test/test_q223_mp.sh
index 790fca0c999..ff98739717d 100755
--- a/Tools/Tier0ChainTests/test/test_q223_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_q223_mp.sh
@@ -3,5 +3,5 @@
 # art-description: RecoTrf
 # art-type: grid
 
-Reco_tf.py --AMI=q223 --athenaopts='--nprocs=2' --maxEvents=100 --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data15_comm.00264034.physics_MinBias.daq.RAW._lb0644._SFO-6._0001.data
+Reco_tf.py --AMI=q223 --athenaopts='--nprocs=2' --maxEvents=100 --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root
 
diff --git a/Tools/Tier0ChainTests/test/test_q431.sh b/Tools/Tier0ChainTests/test/test_q431.sh
index f6d1391f6b7..f07bbc9a4a7 100755
--- a/Tools/Tier0ChainTests/test/test_q431.sh
+++ b/Tools/Tier0ChainTests/test/test_q431.sh
@@ -3,11 +3,11 @@
 # art-description: RecoTrf
 # art-type: grid
 
-Reco_tf.py --AMI=q431 --outputTAGFile=myTAG.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data16_13TeV.00297447.physics_Main.daq.RAW._lb0555._SFO-1._0001.data --imf False
-echo "art-result: $?"
+Reco_tf.py --AMI=q431 --outputTAGFile=myTAG.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --imf False
+echo "art-result: $? Reco"
 
 ArtPackage=$1
 ArtJobName=$2
 art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
-echo "art-result: $?"
+echo "art-result: $? Diff"
 
diff --git a/Tools/Tier0ChainTests/test/test_q431_mp.sh b/Tools/Tier0ChainTests/test/test_q431_mp.sh
index 00348f398e1..57e6851cd57 100755
--- a/Tools/Tier0ChainTests/test/test_q431_mp.sh
+++ b/Tools/Tier0ChainTests/test/test_q431_mp.sh
@@ -3,5 +3,5 @@
 # art-description: RecoTrf
 # art-type: grid
 
-Reco_tf.py --AMI=q431 --athenaopts='--nprocs=2' --maxEvents=100 --outputTAGFile=myTAG.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data16_13TeV.00297447.physics_Main.daq.RAW._lb0555._SFO-1._0001.data
+Reco_tf.py --AMI=q431 --athenaopts='--nprocs=2' --maxEvents=100 --outputTAGFile=myTAG.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root
 
diff --git a/Tools/Tier0ChainTests/test/test_run00184169_egamma_collisions.sh b/Tools/Tier0ChainTests/test/test_run00184169_egamma_collisions.sh
index 3cd0a1146cc..18a3ca15a37 100755
--- a/Tools/Tier0ChainTests/test/test_run00184169_egamma_collisions.sh
+++ b/Tools/Tier0ChainTests/test/test_run00184169_egamma_collisions.sh
@@ -4,10 +4,10 @@
 # art-type: grid
 
 Reco_tf.py  --outputHISTFile=myMergedMonitoring_Egamma_0.root --maxEvents=500 --outputESDFile=myESD_Egamma_0.pool.root --outputAODFile=myAOD_Egamma_0.AOD.pool.root --outputTAGFile=myTAG_Egamma_0.root --ignoreErrors=False --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data11_7TeV.00184169.physics_Egamma.merge.RAW._lb0900._SFO-10._0001.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data11_7TeV.00184169.physics_Egamma.merge.RAW._lb0900._SFO-11._0001.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data11_7TeV.00184169.physics_Egamma.merge.RAW._lb0900._SFO-12._0001.1 --preExec='rec.doTrigger=False;' --imf False
-echo "art-result: $?"
+echo "art-result: $? Reco"
 
 ArtPackage=$1
 ArtJobName=$2
 art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
-echo "art-result: $?"
+echo "art-result: $? Diff"
 
-- 
GitLab