diff --git a/Tools/Tier0ChainTests/CMakeLists.txt b/Tools/Tier0ChainTests/CMakeLists.txt
index 842be098b78c166e81661c507586fa6cb7fa4a52..610c24267185f71802e06d27a350729bea00d3fa 100644
--- a/Tools/Tier0ChainTests/CMakeLists.txt
+++ b/Tools/Tier0ChainTests/CMakeLists.txt
@@ -9,10 +9,9 @@ atlas_subdir( Tier0ChainTests )
atlas_depends_on_subdirs( PRIVATE
TestPolicy )
-# this line failed automatic conversion in cmt2cmake :
-# path_append TCTXMLFILE "../test/Tier0ChainTests_`echo $CMTPATH | awk -F "nightlies" '{ print $2 }' | sed 's/-VAL//' | sed 's/-T0//' | sed 's/-Prod//' | cut -d "/" -f 2,3 | sed 's/\//_/'`.xml"
-
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_scripts( scripts/tct_*.py scripts/tct_*.sh )
+atlas_install_runtime( test/Tier0ChainTests_TestConfiguration.xml )
+
diff --git a/Tools/Tier0ChainTests/cmt/requirements b/Tools/Tier0ChainTests/cmt/requirements
index c197f38f9f14d08516fd59e0a94d4f22de4a26f9..62c231d9911271d307d9397c5a644cc8ba042462 100644
--- a/Tools/Tier0ChainTests/cmt/requirements
+++ b/Tools/Tier0ChainTests/cmt/requirements
@@ -8,17 +8,17 @@ apply_pattern declare_scripts files="../scripts/tct_*.py ../scripts/tct_*.sh"
#apply_pattern declare_joboptions files="../share/*.py"
apply_pattern declare_python_modules files="../python/*.py"
-## note that the cut command is picking arguments 6 and 7, need for the built directory
-## /build/atnight/localbuilds/nightlies/14.5.X.Y-T0/AtlasTier0/rel_0
-## path_append TCTXMLFILE "../test/Tier0ChainTests_`echo $CMTPATH | sed 's/-VAL//' | sed 's/-T0//' | sed 's/-Prod//' | cut -d "/" -f 6,7 | sed 's/\//_/'`.xml"
+# note that the cut command is picking arguments 6 and 7, need for the built directory
+# /build/atnight/localbuilds/nightlies/14.5.X.Y-T0/AtlasTier0/rel_0
+# path_append TCTXMLFILE "../test/Tier0ChainTests_`echo $CMTPATH | sed 's/-VAL//' | sed 's/-T0//' | sed 's/-Prod//' | cut -d "/" -f 6,7 | sed 's/\//_/'`.xml"
path_append TCTXMLFILE "../test/Tier0ChainTests_`echo $CMTPATH | awk -F "nightlies" '{ print $2 }' | sed 's/-VAL//' | sed 's/-T0//' | sed 's/-Prod//' | cut -d "/" -f 2,3 | sed 's/\//_/'`.xml"
macro Tier0ChainTests_TestConfiguration "../../../InstallArea/share/Tier0ChainTests_TestConfiguration.xml"
apply_pattern declare_runtime extras="`if [ -f ${TCTXMLFILE} ]; then cp -f $TCTXMLFILE ../Tier0ChainTests_TestConfiguration.xml ; echo ../Tier0ChainTests_TestConfiguration.xml; else echo ../test/Tier0ChainTests_TestConfiguration.xml; fi`"
-## For example, for $CMTPATH=/afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasOffline/rel_4, the following command:
-## > echo "../test/Tier0ChainTests_`echo $AtlasArea | sed 's/-VAL//' | sed 's/-T0//' | sed 's/-Prod//' | cut -d "/" -f 8,9 | sed 's/\//_/'`.xml"
-## will result in: ../test/Tier0ChainTests_devval_AtlasOffline.xml
-## if this file is not found, the fall-back file is: ../test/Tier0ChainTests_TestConfiguration.xml
+# For example, for $CMTPATH=/afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasOffline/rel_4, the following command:
+# > echo "../test/Tier0ChainTests_`echo $AtlasArea | sed 's/-VAL//' | sed 's/-T0//' | sed 's/-Prod//' | cut -d "/" -f 8,9 | sed 's/\//_/'`.xml"
+# will result in: ../test/Tier0ChainTests_devval_AtlasOffline.xml
+# if this file is not found, the fall-back file is: ../test/Tier0ChainTests_TestConfiguration.xml
private
use TestPolicy TestPolicy-*
diff --git a/Tools/Tier0ChainTests/scripts/tct_recotrf.py b/Tools/Tier0ChainTests/scripts/tct_recotrf.py
index e9cb9ee50c27fa124d0182d925bb4b6739c9922b..f1f124d960bcc2d18746194df4f5f4d2d41f259e 100755
--- a/Tools/Tier0ChainTests/scripts/tct_recotrf.py
+++ b/Tools/Tier0ChainTests/scripts/tct_recotrf.py
@@ -257,6 +257,7 @@ def parseCmdLine(args):
parser.add_option("--postExec_e2a", dest="postExec_e2a", help="postExec_e2a options", default='')
parser.add_option("--triggerConfig", dest="triggerConfig", help="Trigger configuration", default='')
parser.add_option("--RunNumber", dest="RunNumber", help="Run number", default='')
+ parser.add_option("--steering", dest="steering", help="transform steering", default='')
parser.add_option("--HI", dest="doHI_", help="Run with Heavy ions settings",
action='store_true', default=False)
parser.add_option("--HIP", dest="doHIP_", help="Run with proton-lead settings",
diff --git a/Tools/Tier0ChainTests/test/Tier0ChainTests_TestConfiguration.xml b/Tools/Tier0ChainTests/test/Tier0ChainTests_TestConfiguration.xml
index 339698b3fb1d25af26f9b28d582f9f3c090b6a5e..210053f3096c0e480d2e2f069f2cbb7969b64365 100755
--- a/Tools/Tier0ChainTests/test/Tier0ChainTests_TestConfiguration.xml
+++ b/Tools/Tier0ChainTests/test/Tier0ChainTests_TestConfiguration.xml
@@ -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-GEO-20-00-02 --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/ --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"
</jobTransformCmd>
<group>TCTTransform</group>
<queue>medium</queue>
@@ -385,7 +385,7 @@
<doc>RecoTrf</doc>
<jobTransformJobName>MuonsStream_Run204073_Pileup_30_Collisions</jobTransformJobName>
<jobTransformCmd>
- tct_recotrf.py --jobnum=0 --trigStream=Muons --nfiles=2 --maxEvents=300 --runnum=00204073 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00204073/physics_Muons/ --AMI=q205 --autoConfiguration=everything --conditionsTag=COMCOND-BLKPA-RUN1-05 --geometryVersion=ATLAS-GEO-20-00-02 --lumiblock=144,145 --dropDESDs --dropDRAWs --dropNTUPs --preExec "'rec.doTrigger=False;'" --conditionsTag="COMCOND-BLKPA-RUN1-07"
+ tct_recotrf.py --jobnum=0 --trigStream=Muons --nfiles=2 --maxEvents=300 --runnum=00204073 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00204073/physics_Muons/ --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"
</jobTransformCmd>
<group>TCTTransform</group>
<queue>medium</queue>
@@ -420,7 +420,7 @@
<doc>RecoTrf</doc>
<jobTransformJobName>JetTauEtmissStream_Run204073_Pileup_30_Collisions</jobTransformJobName>
<jobTransformCmd>
- tct_recotrf.py --jobnum=0 --trigStream=JetTauEtmiss --nfiles=2 --maxEvents=300 --runnum=00204073 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00204073/physics_JetTauEtmiss/ --AMI=q205 --autoConfiguration=everything --conditionsTag=COMCOND-BLKPA-RUN1-05 --geometryVersion=ATLAS-GEO-20-00-02 --lumiblock=144,145 --dropDESDs --dropDRAWs --dropNTUPs --preExec "'rec.doTrigger=False;'" --conditionsTag="COMCOND-BLKPA-RUN1-07"
+ tct_recotrf.py --jobnum=0 --trigStream=JetTauEtmiss --nfiles=2 --maxEvents=300 --runnum=00204073 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00204073/physics_JetTauEtmiss/ --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"
</jobTransformCmd>
<group>TCTTransform</group>
<queue>medium</queue>
@@ -455,7 +455,7 @@
<doc>RecoTrf</doc>
<jobTransformJobName>MinBiasStream_Run204073_Pileup_30_Collisions</jobTransformJobName>
<jobTransformCmd>
- tct_recotrf.py --jobnum=0 --trigStream=MinBias --nfiles=2 --maxEvents=300 --runnum=00204073 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00204073/physics_MinBias/ --AMI=q205 --autoConfiguration=everything --conditionsTag=COMCOND-BLKPA-RUN1-05 --geometryVersion=ATLAS-GEO-20-00-02 --lumiblock=144,145 --dropDESDs --dropDRAWs --dropNTUPs --preExec "'rec.doTrigger=False;'" --conditionsTag="COMCOND-BLKPA-RUN1-07"
+ tct_recotrf.py --jobnum=0 --trigStream=MinBias --nfiles=2 --maxEvents=300 --runnum=00204073 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00204073/physics_MinBias/ --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"
</jobTransformCmd>
<group>TCTTransform</group>
<queue>medium</queue>
@@ -1083,6 +1083,44 @@
</chainElement>
+
+ <!-- Same as above but in RAWtoALL workflow -->
+ <chainElement>
+
+ <jobTransform userJobId="ExpressStream_4_Run276689_Collisions_RAWtoALL">
+ <doc>RecoTrf</doc>
+ <jobTransformJobName>ExpressStream_4_Run276689_Collisions</jobTransformJobName>
+ <jobTransformCmd>
+ tct_recotrf.py --jobnum=3 --trigStream=express --nfiles=2 --maxEvents=30 --runnum=00276689 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00276689/express_express/ --AMI=f628 --lumiblock=226,227 --dropDESDs --dropDRAWs --dropNTUPs --steering=doRAWtoALL
+ </jobTransformCmd>
+ <group>TCTTransform</group>
+ <queue>medium</queue>
+ <batchWallTime>420</batchWallTime>
+ <castorSvcClass>t0atlas</castorSvcClass>
+
+ <test>
+ <modulename>RttLibraryTools</modulename>
+ <testname>FileGrepper</testname>
+ <arg>
+ <argname>inputFile</argname>
+ <argvalue>log.???to???</argvalue> <!-- put this one if you use job log -->
+ </arg>
+ <arg>
+ <argname>outputFile</argname>
+ <argvalue>ExpressStream_4_Run276689_Collisions_RAWtoALL.summary.txt</argvalue>
+ </arg>
+ <arg>
+ <argname>searchList</argname>
+ <argvalue>successful run</argvalue> <!-- put here the string you should find to mean all ok -->
+ </arg>
+ </test>
+
+ </jobTransform>
+
+ </chainElement>
+
+
+
<!-- Reconstruction job, using latest castor collections -->
<chainElement>
@@ -1090,7 +1128,7 @@
<doc>RecoTrf</doc>
<jobTransformJobName>LatestRun_Main1</jobTransformJobName>
<jobTransformCmd>
- tct_recotrf.py --jobnum=1 --trigStream=Main --nfiles=1 --maxEvents=250 --latestrun --castordir=/eos/atlas/atlastier0/rucio/data15_13TeV --AMI=f611 --dropDESDs --dropDRAWs --dropNTUPs --preExec "'all:from MuonRecExample.MuonRecFlags import muonRecFlags;muonRecFlags.useLooseErrorTuning.set_Value_and_Lock(True);DQMonFlags.doCTPMon=True;'"
+ tct_recotrf.py --jobnum=1 --trigStream=Main --nfiles=1 --maxEvents=250 --latestrun --castordir=/eos/atlas/atlastier0/rucio/data16_13TeV --AMI=f694 --dropDESDs --dropDRAWs --dropNTUPs
</jobTransformCmd>
<group>TCTTransform</group>
<queue>medium</queue>
@@ -1125,7 +1163,7 @@
<doc>RecoTrf</doc>
<jobTransformJobName>2012_reco_wTrigger</jobTransformJobName>
<jobTransformCmd>
- tct_recotrf.py --jobnum=0 --trigStream=Single_Stream --runnum=00212967 --nfiles=1 --maxEvents=100 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00212967/Single_Stream --lumiblock=291 --autoConfiguration=everything --conditionsTag="COMCOND-BLKPA-RUN1-07" --geometryVersion=ATLAS-GEO-20-00-02 --dropDESDs --dropDRAWs --dropNTUPs
+ tct_recotrf.py --jobnum=0 --trigStream=Single_Stream --runnum=00212967 --nfiles=1 --maxEvents=100 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00212967/Single_Stream --lumiblock=291 --autoConfiguration=everything --conditionsTag="COMCOND-BLKPA-RUN1-07" --geometryVersion=ATLAS-R1-2012-03-00-00 --dropDESDs --dropDRAWs --dropNTUPs
</jobTransformCmd>
<group>TCTTransform</group>
<queue>medium</queue>
@@ -1158,7 +1196,7 @@
<doc>RecoTrf</doc>
<jobTransformJobName>2012_reco_wReprocessedTrigger</jobTransformJobName>
<jobTransformCmd>
- tct_recotrf.py --jobnum=0 --trigStream=Single_StreamRepro --runnum=00212967 --nfiles=1 --maxEvents=100 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00212967/Single_StreamRepro --lumiblock=291 --autoConfiguration=everything --conditionsTag="COMCOND-BLKPA-RUN1-07" --geometryVersion=ATLAS-GEO-20-00-02 --dropDESDs --dropDRAWs --dropNTUPs
+ tct_recotrf.py --jobnum=0 --trigStream=Single_StreamRepro --runnum=00212967 --nfiles=1 --maxEvents=100 --castordir=/eos/atlas/atlascerngroupdisk/proj-sit/tct/rec_input/00212967/Single_StreamRepro --lumiblock=291 --autoConfiguration=everything --conditionsTag="COMCOND-BLKPA-RUN1-07" --geometryVersion=ATLAS-R1-2012-03-00-00 --dropDESDs --dropDRAWs --dropNTUPs
</jobTransformCmd>
<group>TCTTransform</group>
<queue>medium</queue>