TCT: Updated express and bulk processing tests, and disabling q440 and q441

Tools/Tier0ChainTests/test/test_bulk_processing.sh

@@ -9,7 +9,7 @@
 export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-admin
 
 Reco_tf.py  \
---AMI f1199  \
+--AMI f1201  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data21_comm.00404400.express_express.merge.RAW._lb2497._SFO-ALL._0001.1" \
 --outputAODFile="AOD.root" \
 --outputESDFile="ESD.pool.root" \

Tools/Tier0ChainTests/test/test_bulk_processing_local.sh

@@ -9,7 +9,7 @@ export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-
 
 
 Reco_tf.py  \
---AMI f1199  \
+--AMI f1201  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data21_comm.00404400.express_express.merge.RAW._lb2497._SFO-ALL._0001.1" \
 --maxEvents=200 \
 --outputAODFile="AOD.root" \

Tools/Tier0ChainTests/test/test_expressProcessing_M11_calib.sh

+#!/bin/sh
+#
+# art-description: Express processing at Tier0
+# art-type: grid
+# art-include: master/Athena
+# art-athena-mt: 8
+
+# There was a database connection problem reported in ATR-24782. Rodney Walker's solution is to use the following export to fix the problem:
+export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-admin
+
+
+Reco_tf.py  \
+--AMI x615  \
+--inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_calib.00412340.physics_CosmicCalo.daq.RAW._lb0018._SFO-14._0001.data" \
+--outputAODFile="AOD.root" \
+--outputESDFile="ESD.pool.root" \
+--outputDAOD_L1CALO2File="L1CALO2.pool.root" \
+--outputHISTFile="HIST.root" \
+--imf False
+
+rc1=$?
+echo "art-result: $rc1 Reco"
+
+rc2=-9999
+if [ ${rc1} -eq 0 ]
+then
+  ArtPackage=$1
+  ArtJobName=$2
+  art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool
+  rc2=$?
+fi
+echo  "art-result: ${rc2} Diff"
+

Tools/Tier0ChainTests/test/test_expressProcessing_M11_calib2.sh

+#!/bin/sh
+#
+# art-description: Express processing at Tier0
+# art-type: grid
+# art-include: master/Athena
+# art-athena-mt: 8
+
+# There was a database connection problem reported in ATR-24782. Rodney Walker's solution is to use the following export to fix the problem:
+export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-admin
+
+
+Reco_tf.py  \
+--AMI x615  \
+--inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_calib.00412340.express_express.daq.RAW._lb0015._SFO-15._0002.data" \
+--outputAODFile="AOD.root" \
+--outputESDFile="ESD.pool.root" \
+--outputDAOD_L1CALO2File="L1CALO2.pool.root" \
+--outputHISTFile="HIST.root" \
+--imf False
+
+rc1=$?
+echo "art-result: $rc1 Reco"
+
+rc2=-9999
+if [ ${rc1} -eq 0 ]
+then
+  ArtPackage=$1
+  ArtJobName=$2
+  art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool
+  rc2=$?
+fi
+echo  "art-result: ${rc2} Diff"
+

Tools/Tier0ChainTests/test/test_expressProcessing_M11_cosmic.sh

+#!/bin/sh
+#
+# art-description: Express processing at Tier0
+# art-type: grid
+# art-include: master/Athena
+# art-athena-mt: 8
+
+# There was a database connection problem reported in ATR-24782. Rodney Walker's solution is to use the following export to fix the problem:
+export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-admin
+
+
+Reco_tf.py  \
+--AMI x615  \
+--inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_cos.00412343.physics_Main.daq.RAW._lb0840._SFO-13._0001.data" \
+--outputAODFile="AOD.root" \
+--outputESDFile="ESD.pool.root" \
+--outputDAOD_L1CALO2File="L1CALO2.pool.root" \
+--outputHISTFile="HIST.root" \
+--imf False
+
+rc1=$?
+echo "art-result: $rc1 Reco"
+
+rc2=-9999
+if [ ${rc1} -eq 0 ]
+then
+  ArtPackage=$1
+  ArtJobName=$2
+  art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool
+  rc2=$?
+fi
+echo  "art-result: ${rc2} Diff"
+

Tools/Tier0ChainTests/test/test_express_processing.sh → Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam.sh

 #!/bin/sh
 #
-# art-description: RecoTrf
+# art-description: Express processing at Tier0
 # art-type: grid
 # art-include: master/Athena
 # art-athena-mt: 8
@@ -10,7 +10,7 @@ export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-
 
 
 Reco_tf.py  \
---AMI x609  \
+--AMI x615  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data21_comm.00404400.express_express.merge.RAW._lb2497._SFO-ALL._0001.1" \
 --outputAODFile="AOD.root" \
 --outputESDFile="ESD.pool.root" \

Tools/Tier0ChainTests/test/test_express_processing_local.sh → Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_local.sh

@@ -9,7 +9,7 @@ export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-
 
 
 Reco_tf.py  \
---AMI x609  \
+--AMI x615  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data21_comm.00404400.express_express.merge.RAW._lb2497._SFO-ALL._0001.1" \
 --maxEvents=200 \
 --outputAODFile="AOD.root" \

Tools/Tier0ChainTests/test/test_q440.sh

@@ -2,11 +2,6 @@
 #
 # art-description: RecoTrf
 # art-type: grid
-# art-include: 21.0/Athena
-# art-include: master/Athena
-# art-include: 22.0-mc20/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
 # art-athena-mt: 8
 
 # MT enabled for "RDOtoRDOTrigger, RAWtoESD, and ESDtoAOD as discussed in https://its.cern.ch/jira/browse/ATR-22498

Tools/Tier0ChainTests/test/test_q440_mt1.sh

@@ -2,11 +2,6 @@
 #
 # art-description: RecoTrf
 # art-type: grid
-# art-include: 21.0/Athena
-# art-include: master/Athena
-# art-include: 22.0-mc20/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
 
 # MT enabled for RDOtoRDOTrigger, RAWtoESD, and ESDtoAOD, as discussed in https://its.cern.ch/jira/browse/ATR-22498
 Reco_tf.py \

Tools/Tier0ChainTests/test/test_q441.sh

@@ -2,8 +2,6 @@
 #
 # art-description: RecoTrf
 # art-type: grid
-# art-include: master/Athena
-# art-include: 22.0-mc20/Athena
 # art-athena-mt: 8
 
 Reco_tf.py \
@@ -15,5 +13,5 @@ Reco_tf.py \
 --maxEvents=500 \
 --outputAODFile=q441.AOD.pool.root --outputESDFile=q441.ESD.pool.root
 
-#This test currently has the muon isolation reconstruction switched off. It should be switched back on at a later date. 
+#This test currently has the muon isolation reconstruction switched off. It should be switched back on at a later date.
 echo "art-result: $?"

Tools/Tier0ChainTests/test/test_q441_mt1.sh

@@ -2,8 +2,6 @@
 #
 # art-description: RecoTrf
 # art-type: grid
-# art-include: master/Athena
-# art-include: 22.0-mc20/Athena
 
 Reco_tf.py \
 --AMI=q441 \