From 1ab52867cd10c3e4b900eef47708d573253f15fa Mon Sep 17 00:00:00 2001
From: Peter Berta <peter.berta@cern.ch>
Date: Mon, 24 May 2021 22:14:14 +0200
Subject: [PATCH 1/2] disabling HLTMon; updating contitionsTag; running the
 comparison step only when the reco step is successful

---
 .../test_mainstream_run307716_collisions.sh   | 32 +++++++++++++++----
 ...stream_run307716_collisions_withouthist.sh | 19 ++++++++---
 .../test/test_reco_with_derived_outputs_2.sh  | 14 +++++++-
 3 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/Tools/Tier0ChainTests/test/test_mainstream_run307716_collisions.sh b/Tools/Tier0ChainTests/test/test_mainstream_run307716_collisions.sh
index 70452a1bc8ae..c3b619b3db54 100755
--- a/Tools/Tier0ChainTests/test/test_mainstream_run307716_collisions.sh
+++ b/Tools/Tier0ChainTests/test/test_mainstream_run307716_collisions.sh
@@ -8,10 +8,30 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 
-Reco_tf.py  --outputHISTFile=myMergedMonitoring_Main_0.root --AMI=f741 --maxEvents=375 --outputESDFile=myESD_Main_0.pool.root --outputAODFile=myAOD_Main_0.AOD.pool.root --ignoreErrors=False --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data16_13TeV.00307716.physics_Main.daq.RAW._lb0220._SFO-1._0001.data,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data16_13TeV.00307716.physics_Main.daq.RAW._lb0221._SFO-1._0001.data --imf False
-echo "art-result: $? Reco"
+# disabled HLTMon in preExec as recommended in https://its.cern.ch/jira/browse/ATR-22947
+
+Reco_tf.py \
+--AMI=f741 \
+--preExec 'r2a:from InDetPrepRawDataToxAOD.SCTxAODJobProperties import SCTxAODFlags;SCTxAODFlags.Prescale.set_Value_and_Lock(50);from AthenaMonitoring.DQMonFlags import DQMonFlags; DQMonFlags.doHLTMon=False' \
+--maxEvents=375 \
+--conditionsTag=CONDBR2-BLKPA-RUN2-03 \
+--geometryVersion='ATLAS-R2-2016-01-00-01' \
+--outputESDFile=myESD_Main_0.pool.root --outputAODFile=myAOD_Main_0.AOD.pool.root --outputHISTFile=myMergedMonitoring_Main_0.root \
+--inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data16_13TeV.00307716.physics_Main.daq.RAW._lb0220._SFO-1._0001.data,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data16_13TeV.00307716.physics_Main.daq.RAW._lb0221._SFO-1._0001.data \
+--ignoreErrors=False \
+--imf False
+
+
+rc1=$?
+echo "art-result: $rc1 Reco"
+
+rc2=-9999
+if [ ${rc1} -eq 0 ]
+then
+  ArtPackage=$1
+  ArtJobName=$2
+  art.py compare grid --entries 20 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
+  rc2=$?
+fi
+echo  "art-result: ${rc2} Diff"
 
-ArtPackage=$1
-ArtJobName=$2
-art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
-echo "art-result: $? Diff"
diff --git a/Tools/Tier0ChainTests/test/test_mainstream_run307716_collisions_withouthist.sh b/Tools/Tier0ChainTests/test/test_mainstream_run307716_collisions_withouthist.sh
index a95cef8e4c35..4d989f6949e0 100755
--- a/Tools/Tier0ChainTests/test/test_mainstream_run307716_collisions_withouthist.sh
+++ b/Tools/Tier0ChainTests/test/test_mainstream_run307716_collisions_withouthist.sh
@@ -9,9 +9,18 @@
 # art-include: 21.9/Athena
 
 Reco_tf.py  --AMI=f741 --maxEvents=375 --outputESDFile=myESD_Main_2.pool.root --outputAODFile=myAOD_Main_2.AOD.pool.root --ignoreErrors=False --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data16_13TeV.00307716.physics_Main.daq.RAW._lb0220._SFO-1._0001.data,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data16_13TeV.00307716.physics_Main.daq.RAW._lb0221._SFO-1._0001.data --imf False
-echo "art-result: $? Reco"
 
-ArtPackage=$1
-ArtJobName=$2
-art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
-echo "art-result: $? Diff"
+
+rc1=$?
+echo "art-result: $rc1 Reco"
+
+rc2=-9999
+if [ ${rc1} -eq 0 ]
+then
+  ArtPackage=$1
+  ArtJobName=$2
+  art.py compare grid --entries 20 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
+  rc2=$?
+fi
+echo  "art-result: ${rc2} Diff"
+
diff --git a/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs_2.sh b/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs_2.sh
index 2eea5c5d95f4..9c146c75e366 100755
--- a/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs_2.sh
+++ b/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs_2.sh
@@ -8,7 +8,19 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 
-Reco_tf.py  --outputDESDM_IDALIGNFile=IDALIGN_Main_0.pool.root --outputDESDM_SLTTMUFile=SLTTMU_Main_0.pool.root --outputDRAW_ZMUMUFile=ZMUMU_Main_0.data --outputDAOD_IDTIDEFile=IDTIDE_Main_0.AOD.pool.root --outputDESDM_MCPFile=MCP_Main_0.pool.root --outputDRAW_EGZFile=EGZ_Main_0.data --outputDESDM_PHOJETFile=PHOJET_Main_0.pool.root --outputDESDM_TILEMUFile=TILEMU_Main_0.pool.root --outputDRAW_RPVLLFile=RPVLL_Main_0.data --outputDAOD_IDTRKVALIDFile=IDTRKVALID_Main_0.AOD.pool.root --outputHISTFile=myMergedMonitoring_Main_0.root --AMI=f739 --outputDESDM_EXOTHIPFile=EXOTHIP_Main_0.pool.root --outputDESDM_SGLELFile=SGLEL_Main_0.pool.root --maxEvents=500 --outputESDFile=myESD_Main_0.pool.root --outputDESDM_EGAMMAFile=EGAMMA_Main_0.pool.root --outputAODFile=myAOD_Main_0.AOD.pool.root --ignoreErrors=False --conditionsTag=CONDBR2-BLKPA-2017-05 --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data16_13TeV.00304008.physics_Main.daq.RAW._lb0838._SFO-6._0001.data --outputDRAW_TAUMUHFile=TAUMUH_Main_0.data --outputDESDM_CALJETFile=CALJET_Main_0.pool.root --imf False
+# disabled HLTMon in preExec as recommended in https://its.cern.ch/jira/browse/ATR-22947                                    
+
+Reco_tf.py \
+--AMI=f739 \
+--preExec 'r2a:from InDetPrepRawDataToxAOD.SCTxAODJobProperties import SCTxAODFlags;SCTxAODFlags.Prescale.set_Value_and_Lock(50);from AthenaMonitoring.DQMonFlags import DQMonFlags; DQMonFlags.doHLTMon=False'
+--conditionsTag=CONDBR2-BLKPA-RUN2-03 \
+--geometryVersion='ATLAS-R2-2016-01-00-01' \
+--inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data16_13TeV.00304008.physics_Main.daq.RAW._lb0838._SFO-6._0001.data \
+--outputDESDM_IDALIGNFile=IDALIGN_Main_0.pool.root --outputDESDM_SLTTMUFile=SLTTMU_Main_0.pool.root --outputDRAW_ZMUMUFile=ZMUMU_Main_0.data --outputDAOD_IDTIDEFile=IDTIDE_Main_0.AOD.pool.root --outputDESDM_MCPFile=MCP_Main_0.pool.root --outputDRAW_EGZFile=EGZ_Main_0.data --outputDESDM_PHOJETFile=PHOJET_Main_0.pool.root --outputDESDM_TILEMUFile=TILEMU_Main_0.pool.root --outputDRAW_RPVLLFile=RPVLL_Main_0.data --outputDAOD_IDTRKVALIDFile=IDTRKVALID_Main_0.AOD.pool.root --outputHISTFile=myMergedMonitoring_Main_0.root --outputDESDM_EXOTHIPFile=EXOTHIP_Main_0.pool.root --outputDESDM_SGLELFile=SGLEL_Main_0.pool.root --maxEvents=500 --outputESDFile=myESD_Main_0.pool.root --outputDESDM_EGAMMAFile=EGAMMA_Main_0.pool.root --outputAODFile=myAOD_Main_0.AOD.pool.root --outputDRAW_TAUMUHFile=TAUMUH_Main_0.data --outputDESDM_CALJETFile=CALJET_Main_0.pool.root \
+--ignoreErrors=False \
+--imf False
+
+
 
 rc1=$?
 echo "art-result: $rc1 Reco"
-- 
GitLab


From 6001f53b51b97792e2fc950ce1e7421fd1f9f1ff Mon Sep 17 00:00:00 2001
From: Peter Berta <peter.berta@cern.ch>
Date: Mon, 24 May 2021 22:22:27 +0200
Subject: [PATCH 2/2] updating contidiosTag and geometryVersion

---
 ...test_mainstream_run307716_collisions_withouthist.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Tools/Tier0ChainTests/test/test_mainstream_run307716_collisions_withouthist.sh b/Tools/Tier0ChainTests/test/test_mainstream_run307716_collisions_withouthist.sh
index 4d989f6949e0..57ddd52a7d10 100755
--- a/Tools/Tier0ChainTests/test/test_mainstream_run307716_collisions_withouthist.sh
+++ b/Tools/Tier0ChainTests/test/test_mainstream_run307716_collisions_withouthist.sh
@@ -8,7 +8,15 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 
-Reco_tf.py  --AMI=f741 --maxEvents=375 --outputESDFile=myESD_Main_2.pool.root --outputAODFile=myAOD_Main_2.AOD.pool.root --ignoreErrors=False --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data16_13TeV.00307716.physics_Main.daq.RAW._lb0220._SFO-1._0001.data,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data16_13TeV.00307716.physics_Main.daq.RAW._lb0221._SFO-1._0001.data --imf False
+Reco_tf.py \
+--AMI=f741 \
+--maxEvents=375 \
+--conditionsTag=CONDBR2-BLKPA-RUN2-03 \
+--geometryVersion='ATLAS-R2-2016-01-00-01' \
+--inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data16_13TeV.00307716.physics_Main.daq.RAW._lb0220._SFO-1._0001.data,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data16_13TeV.00307716.physics_Main.daq.RAW._lb0221._SFO-1._0001.data \
+--outputESDFile=myESD_Main_2.pool.root --outputAODFile=myAOD_Main_2.AOD.pool.root \
+--ignoreErrors=False \
+--imf False
 
 
 rc1=$?
-- 
GitLab