TCT: Updating express and bulk processing tests (conditions, newer runs, new...

TCT: Updating express and bulk processing tests (conditions, newer runs, new tests, adding art-include option to run in 22.0)

TCT: Updating express and bulk processing tests (conditions, newer runs, new tests, adding art-include option to run in 22.0)

Tools/Tier0ChainTests/test/test_bulkProcessing_M11_calib.sh

@@ -3,6 +3,7 @@
 # art-description: Express processing at Tier0
 # art-type: grid
 # art-include: master/Athena
+# art-include: 22.0/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:
@@ -10,7 +11,7 @@ export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-
 
 
 Reco_tf.py  \
---AMI f1206  \
+--AMI f1210  \
 --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" \

Tools/Tier0ChainTests/test/test_bulkProcessing_M11_cosmic.sh

@@ -3,6 +3,7 @@
 # art-description: Express processing at Tier0
 # art-type: grid
 # art-include: master/Athena
+# art-include: 22.0/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:
@@ -10,7 +11,7 @@ export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-
 
 
 Reco_tf.py  \
---AMI f1206  \
+--AMI f1210  \
 --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" \

Tools/Tier0ChainTests/test/test_bulkProcessing_beamSplashes.sh

@@ -3,6 +3,7 @@
 # art-description: Express processing at Tier0
 # art-type: grid
 # art-include: master/Athena
+# art-include: 22.0/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:
@@ -10,8 +11,8 @@ export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-
 
 
 Reco_tf.py  \
---AMI f1206  \
---inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_comm.00417320.express_express.merge.RAW._lb0108._SFO-ALL._0001.1" \
+--AMI f1210  \
+--inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_comm.00420624.express_express.merge.RAW._lb1054._SFO-ALL._0001.1" \
 --outputAODFile="AOD.root" \
 --outputESDFile="ESD.pool.root" \
 --outputDAOD_L1CALO2File="L1CALO2.pool.root" \

Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh

+#!/bin/sh
+#
+# art-description: Express processing at Tier0
+# art-type: grid
+# art-include: master/Athena
+# art-include: 22.0/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 f1210  \
+--inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_calib.00421734.express_express.merge.RAW._lb0021._SFO-ALL._0001.1" \
+--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 → Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh

@@ -3,6 +3,7 @@
 # art-description: Express processing at Tier0
 # art-type: grid
 # art-include: master/Athena
+# art-include: 22.0/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:
@@ -10,8 +11,8 @@ export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-
 
 
 Reco_tf.py  \
---AMI x627  \
---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" \
+--AMI f1210  \
+--inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_cos.00421739.express_express.merge.RAW._lb0534._SFO-12._0001.1" \
 --outputAODFile="AOD.root" \
 --outputESDFile="ESD.pool.root" \
 --outputDAOD_L1CALO2File="L1CALO2.pool.root" \

Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam.sh

@@ -3,6 +3,7 @@
 # art-description: RecoTrf
 # art-type: grid
 # art-include: master/Athena
+# art-include: 22.0/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:

Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_collisions.sh

+#!/bin/sh
+#
+# art-description: RecoTrf
+# art-type: grid
+# art-include: master/Athena
+# art-include: 22.0/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 f1211  \
+--inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data21_900GeV.00405514.express_express.merge.RAW._lb0123._SFO-ALL._0001.1" \
+--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_bulkProcessing_pilotBeam_local.sh

@@ -3,6 +3,7 @@
 # art-description: Test for bulk processing at Tier0
 # art-type: local
 # art-include: master/Athena
+# art-include: 22.0/Athena
 
 # 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

Tools/Tier0ChainTests/test/test_data18PHYSLITE_mp.sh

 #!/bin/sh
 
 # art-include: master/Athena
+# art-include: 22.0/Athena
 # art-include: 22.0-mc20/Athena
 # art-description: DAOD building PHYSLITE data18 MP
 # art-type: grid

Tools/Tier0ChainTests/test/test_data18PHYSLITE_serial.sh

 #!/bin/sh
 
 # art-include: master/Athena
+# art-include: 22.0/Athena
 # art-include: 22.0-mc20/Athena
 # art-description: DAOD building PHYSLITE data18
 # art-type: grid

Tools/Tier0ChainTests/test/test_data18PHYS_mp.sh

 #!/bin/sh
 
 # art-include: master/Athena
+# art-include: 22.0/Athena
 # art-include: 22.0-mc20/Athena
 # art-description: DAOD building PHYS data18 MP
 # art-type: grid

Tools/Tier0ChainTests/test/test_data18PHYS_mt.sh

 #!/bin/sh
 
 # art-include: master/Athena
+# art-include: 22.0/Athena
 # art-include: 22.0-mc20/Athena
 # art-description: DAOD building PHYS data18 MT
 # art-type: grid

Tools/Tier0ChainTests/test/test_data18PHYS_serial.sh

 #!/bin/sh
 
 # art-include: master/Athena
+# art-include: 22.0/Athena
 # art-include: 22.0-mc20/Athena
 # art-description: DAOD building PHYS data18
 # art-type: grid

Tools/Tier0ChainTests/test/test_expressProcessing_M11_calib.sh

@@ -3,6 +3,7 @@
 # art-description: Express processing at Tier0
 # art-type: grid
 # art-include: master/Athena
+# art-include: 22.0/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:
@@ -10,7 +11,7 @@ export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-
 
 
 Reco_tf.py  \
---AMI x627  \
+--AMI x638  \
 --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" \

Tools/Tier0ChainTests/test/test_expressProcessing_M11_cosmic.sh

@@ -3,6 +3,7 @@
 # art-description: Express processing at Tier0
 # art-type: grid
 # art-include: master/Athena
+# art-include: 22.0/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:
@@ -10,7 +11,7 @@ export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-
 
 
 Reco_tf.py  \
---AMI x627  \
+--AMI x638  \
 --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" \

Tools/Tier0ChainTests/test/test_expressProcessing_beamSplashes.sh

@@ -3,6 +3,7 @@
 # art-description: Express processing at Tier0
 # art-type: grid
 # art-include: master/Athena
+# art-include: 22.0/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:
@@ -10,8 +11,8 @@ export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-
 
 
 Reco_tf.py  \
---AMI x627  \
---inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_comm.00417320.express_express.merge.RAW._lb0108._SFO-ALL._0001.1" \
+--AMI x638  \
+--inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_comm.00420624.express_express.merge.RAW._lb1054._SFO-ALL._0001.1" \
 --outputAODFile="AOD.root" \
 --outputESDFile="ESD.pool.root" \
 --outputDAOD_L1CALO2File="L1CALO2.pool.root" \