From 64f432450b1c90e94bd06c50e00b1a4a2e46d8b9 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <Stewart.Martin-Haugh@cern.ch>
Date: Fri, 8 Jul 2016 14:01:38 +0200
Subject: [PATCH] 'Remove hard-coded geometry and old AMI tags from 2011 tests
(ATLASRECTS-3334)' (Tier0ChainTests-00-03-19)
* Remove hard-coded geometry and old AMI tags from 2011 tests
(ATLASRECTS-3334)
* tag Tier0ChainTests-00-03-19
2016-06-30 Hass AbouZeid <hass.abouzeid@cern.ch>
* Updated xml to properly find logs for Reco_MC15_13TeV and q221_NTUP_PHYSVAL tests
* Updated search string for diff comparisons to remove errors from fileGrepper
Former-commit-id: baba885689af602f0e6bf64befa5752637770514
---
.../Tier0ChainTests_TestConfiguration.xml | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/Tools/Tier0ChainTests/test/Tier0ChainTests_TestConfiguration.xml b/Tools/Tier0ChainTests/test/Tier0ChainTests_TestConfiguration.xml
index 210053f3096..e3ecab740d3 100755
--- a/Tools/Tier0ChainTests/test/Tier0ChainTests_TestConfiguration.xml
+++ b/Tools/Tier0ChainTests/test/Tier0ChainTests_TestConfiguration.xml
@@ -132,7 +132,7 @@
<doc>RecoTrf</doc>
<jobTransformJobName>Run00183904_CosmicCalo_noField</jobTransformJobName>
<jobTransformCmd>
- tct_recotrf.py --jobnum=0 --nfiles=3 --maxEvents=500 --trigStream=CosmicCalo --runnum=00183904 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00183904/physics_CosmicCalo --AMI=q205 --lumiblock=6,8 --dropDESDs --dropDRAWs --dropNTUPs --preExec "'rec.doTrigger=False;'" --conditionsTag="COMCOND-BLKPA-RUN1-07"
+ tct_recotrf.py --jobnum=0 --nfiles=3 --maxEvents=500 --trigStream=CosmicCalo --runnum=00183904 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00183904/physics_CosmicCalo --lumiblock=6,8 --dropDESDs --dropDRAWs --dropNTUPs --preExec "'rec.doTrigger=False;'"
</jobTransformCmd>
<group>TCTTransform</group>
<queue>medium</queue>
@@ -167,7 +167,7 @@
<doc>RecoTrf</doc>
<jobTransformJobName>Run00184074_IDCosmic0</jobTransformJobName>
<jobTransformCmd>
- tct_recotrf.py --jobnum=0 --nfiles=3 --maxEvents=500 --trigStream=IDCosmic --runnum=00184074 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00184074/physics_IDCosmic --AMI=q205 --lumiblock=100,102 --dropDESDs --dropDRAWs --dropNTUPs --preExec "'rec.doTrigger=False;'" --conditionsTag="COMCOND-BLKPA-RUN1-07"
+ tct_recotrf.py --jobnum=0 --nfiles=3 --maxEvents=500 --trigStream=IDCosmic --runnum=00184074 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00184074/physics_IDCosmic --lumiblock=100,102 --dropDESDs --dropDRAWs --dropNTUPs --preExec "'rec.doTrigger=False;'"
</jobTransformCmd>
<group>TCTTransform</group>
<queue>medium</queue>
@@ -202,7 +202,7 @@
<doc>RecoTrf with beamType=collisions</doc>
<jobTransformJobName>Run00183021_MinBias0_Collisions</jobTransformJobName>
<jobTransformCmd>
- tct_recotrf.py --jobnum=0 --nfiles=3 --maxEvents=500 --trigStream=MinBias --runnum=00183021 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00183021/physics_MinBias --AMI=q205 --lumiblock=550,552 --dropDESDs --dropDRAWs --dropNTUPs --preExec "'rec.doTrigger=False;'" --conditionsTag="COMCOND-BLKPA-RUN1-07"
+ tct_recotrf.py --jobnum=0 --nfiles=3 --maxEvents=500 --trigStream=MinBias --runnum=00183021 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00183021/physics_MinBias --lumiblock=550,552 --dropDESDs --dropDRAWs --dropNTUPs --preExec "'rec.doTrigger=False;'"
</jobTransformCmd>
<group>TCTTransform</group>
<queue>medium</queue>
@@ -237,7 +237,7 @@
<doc>RecoTrf with beamType=collisions</doc>
<jobTransformJobName>Run00183021_JetTauEtmiss0_Collisions</jobTransformJobName>
<jobTransformCmd>
- tct_recotrf.py --jobnum=0 --nfiles=3 --maxEvents=500 --trigStream=JetTauEtmiss --runnum=00183021 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00183021/physics_JetTauEtmiss --AMI=q205 --lumiblock=550,552 --dropDESDs --dropDRAWs --dropNTUPs --preExec "'rec.doTrigger=False;'" --conditionsTag="COMCOND-BLKPA-RUN1-07"
+ tct_recotrf.py --jobnum=0 --nfiles=3 --maxEvents=500 --trigStream=JetTauEtmiss --runnum=00183021 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00183021/physics_JetTauEtmiss --lumiblock=550,552 --dropDESDs --dropDRAWs --dropNTUPs --preExec "'rec.doTrigger=False;'"
</jobTransformCmd>
<group>TCTTransform</group>
<queue>medium</queue>
@@ -272,7 +272,7 @@
<doc>RecoTrf with beamType=collisions</doc>
<jobTransformJobName>Run00183021_Muons_Collisions</jobTransformJobName>
<jobTransformCmd>
- tct_recotrf.py --jobnum=0 --nfiles=3 --maxEvents=500 --trigStream=Muons --runnum=00183021 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00183021/physics_Muons --AMI=q205 --lumiblock=550,552 --dropDESDs --dropDRAWs --dropNTUPs --preExec "'rec.doTrigger=False;'" --conditionsTag="COMCOND-BLKPA-RUN1-07"
+ tct_recotrf.py --jobnum=0 --nfiles=3 --maxEvents=500 --trigStream=Muons --runnum=00183021 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00183021/physics_Muons --lumiblock=550,552 --dropDESDs --dropDRAWs --dropNTUPs --preExec "'rec.doTrigger=False;'"
</jobTransformCmd>
<group>TCTTransform</group>
<queue>medium</queue>
@@ -308,7 +308,7 @@
<doc>RecoTrf with beamType=collisions</doc>
<jobTransformJobName>Run00184169_Egamma_Collisions</jobTransformJobName>
<jobTransformCmd>
- tct_recotrf.py --jobnum=0 --nfiles=3 --maxEvents=500 --trigStream=Egamma --runnum=00184169 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00184169/physics_Egamma --AMI=q205 --lumiblock=900,902 --dropDESDs --dropDRAWs --dropNTUPs --preExec "'rec.doTrigger=False;'" --conditionsTag="COMCOND-BLKPA-RUN1-07"
+ tct_recotrf.py --jobnum=0 --nfiles=3 --maxEvents=500 --trigStream=Egamma --runnum=00184169 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00184169/physics_Egamma --lumiblock=900,902 --dropDESDs --dropDRAWs --dropNTUPs --preExec "'rec.doTrigger=False;'"
</jobTransformCmd>
<group>TCTTransform</group>
<queue>medium</queue>
@@ -350,7 +350,7 @@
<doc>RecoTrf</doc>
<jobTransformJobName>EgammaStream_Run204073_Pileup_30_Collisions</jobTransformJobName>
<jobTransformCmd>
- tct_recotrf.py --jobnum=0 --trigStream=Egamma --nfiles=2 --maxEvents=300 --runnum=00204073 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00204073/physics_Egamma/ --AMI=q205 --autoConfiguration=everything --conditionsTag=COMCOND-BLKPA-RUN1-05 --geometryVersion=ATLAS-R1-2012-03-00-00 --lumiblock=144,145 --dropDESDs --dropDRAWs --dropNTUPs --preExec "'rec.doTrigger=False;'" --conditionsTag="COMCOND-BLKPA-RUN1-07"
+ tct_recotrf.py --jobnum=0 --trigStream=Egamma --nfiles=2 --maxEvents=300 --runnum=00204073 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00204073/physics_Egamma/ --autoConfiguration=everything --conditionsTag=COMCOND-BLKPA-RUN1-05 --geometryVersion=ATLAS-R1-2012-03-00-00 --lumiblock=144,145 --dropDESDs --dropDRAWs --dropNTUPs --preExec "'rec.doTrigger=False;'"
</jobTransformCmd>
<group>TCTTransform</group>
<queue>medium</queue>
@@ -1346,7 +1346,7 @@
<testname>FileGrepper</testname>
<arg>
<argname>inputFile</argname>
- <argvalue>log.???to???</argvalue> <!-- put this one if you use job log -->
+ <argvalue>log.PhysicsValidation</argvalue> <!-- put this one if you use job log -->
</arg>
<arg>
<argname>outputFile</argname>
@@ -1629,7 +1629,7 @@
<testname>FileGrepper</testname>
<arg>
<argname>inputFile</argname>
- <argvalue>log.???to???</argvalue> <!-- put this one if you use job log -->
+ <argvalue>log.???to*</argvalue> <!-- put this one if you use job log -->
</arg>
<arg>
<argname>outputFile</argname>
@@ -1809,7 +1809,7 @@
</arg>
<arg>
<argname>searchList</argname>
- <argvalue>ErrorCode=0 (OK)</argvalue> <!-- put here the string you should find to mean all ok -->
+ <argvalue>ErrorCode=0 \(OK\)</argvalue> <!-- put here the string you should find to mean all ok -->
</arg>
</test>
<testToRemove> <!-- No POOL output produced -->
@@ -1844,7 +1844,7 @@
</arg>
<arg>
<argname>searchList</argname>
- <argvalue>ErrorCode=0 (OK)</argvalue> <!-- put here the string you should find to mean all ok -->
+ <argvalue>ErrorCode=0 \(OK\)</argvalue> <!-- put here the string you should find to mean all ok -->
</arg>
</test>
<testToRemove> <!-- No POOL output produced -->
--
GitLab