From 39793749ceb419c078efb0b15d1dc70b381efcd4 Mon Sep 17 00:00:00 2001
From: Ke Li <ke.li@cern.ch>
Date: Mon, 27 Sep 2021 16:18:38 +0200
Subject: [PATCH] update the conditions tags and RDOs for reco jobs and fix the
 issue for...

---
 .../InDetPhysValMonitoring/share/postInclude.RDOAnalysis.py | 2 ++
 .../share/postInclude.SiHitAnalysis.py                      | 2 ++
 .../InDetPhysValMonitoring/test/test_ele5GeV_reco.sh        | 6 +++---
 .../InDetPhysValMonitoring/test/test_mu100GeV_reco.sh       | 6 +++---
 .../InDetPhysValMonitoring/test/test_mu100GeV_simreco.sh    | 3 ++-
 .../InDetPhysValMonitoring/test/test_mu10GeV_reco.sh        | 6 +++---
 .../InDetPhysValMonitoring/test/test_mu1GeV_reco.sh         | 4 ++--
 .../InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh      | 3 ++-
 .../InDetPhysValMonitoring/test/test_mu20GeV_reco.sh        | 4 ++--
 .../InDetPhysValMonitoring/test/test_mu20GeV_simreco.sh     | 3 ++-
 .../InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh      | 3 ++-
 .../InDetPhysValMonitoring/test/test_piplus1GeV_reco.sh     | 6 +++---
 .../InDetPhysValMonitoring/test/test_piplus1GeV_simreco.sh  | 3 ++-
 .../InDetPhysValMonitoring/test/test_piplus5GeV_reco.sh     | 4 ++--
 .../InDetPhysValMonitoring/test/test_piplus5GeV_simreco.sh  | 3 ++-
 Simulation/Tools/RDOAnalysis/src/PixelRDOAnalysis.cxx       | 2 +-
 Simulation/Tools/RDOAnalysis/src/SCT_RDOAnalysis.cxx        | 2 +-
 17 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/postInclude.RDOAnalysis.py b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/postInclude.RDOAnalysis.py
index 49dad4570c36..a07c28766101 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/postInclude.RDOAnalysis.py
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/postInclude.RDOAnalysis.py
@@ -1,3 +1,5 @@
+from AthenaCommon.AlgSequence import AlgSequence
+topSequence = AlgSequence()
 from RDOAnalysis.RDOAnalysisConf import PixelRDOAnalysis
 topSequence += PixelRDOAnalysis()
 PixelRDOAnalysis = PixelRDOAnalysis()
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/postInclude.SiHitAnalysis.py b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/postInclude.SiHitAnalysis.py
index c2cd5cca454b..afc0292e9317 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/postInclude.SiHitAnalysis.py
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/postInclude.SiHitAnalysis.py
@@ -1,4 +1,6 @@
 from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
+from AthenaCommon.AlgSequence import AlgSequence
+topSequence = AlgSequence()
 from HitAnalysis.HitAnalysisConf import SiHitAnalysis
 topSequence += SiHitAnalysis('PixelHitAnalysis')
 topSequence.PixelHitAnalysis.CollectionName='PixelHits'
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele5GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele5GeV_reco.sh
index 261f7aaaa582..d9bfda9c6662 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele5GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele5GeV_reco.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # art-description: art job for InDetPhysValMonitoring, Single ele 5GeV
 # art-type: grid
-# art-input: user.keli.mc16_13TeV.422028.ParticleGun_single_ele_Pt5.recon.RDO.e7967_e5984_s3126_r11774_tid20254991_00
+# art-input: user.keli:user.keli.mc16_13TeV.422028.ParticleGun_single_ele_Pt5GeV
 # art-input-nfiles: 10
 # art-cores: 4
 # art-memory: 4096
@@ -71,7 +71,7 @@ case $ArtProcess in
       --outputNTUP_PHYSVALFile physval.ntuple.root \
       --outputAODFile   physval.AOD.root \
       --steering        doRAWtoALL \
-      --conditionsTag   'CONDBR2-BLKPA-RUN2-06' \
+      --conditionsTag   'OFLCOND-MC16-SDR-RUN2-08' \
       --checkEventCount False \
       --ignoreErrors    True \
       --maxEvents       -1 \
@@ -85,7 +85,7 @@ case $ArtProcess in
       InDetPhysValFlags.doValidateTightPrimaryTracks.set_Value_and_Lock(True); \
       InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
       InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(True); \
-      InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
+      InDetPhysValFlags.doExpertOutput.set_Value_and_Lock(True); \
       rec.doDumpProperties=True; rec.doCalo=True; rec.doEgamma=True; \
       rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=True; \
       rec.doLArg=True; rec.doLucid=True; rec.doMuon=True; rec.doMuonCombined=True; \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_reco.sh
index 6cf88a31cea1..d4d934494f55 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_reco.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # art-description: art job for InDetPhysValMonitoring, Single muon 100GeV
 # art-type: grid
-# art-input: user.keli.mc16_13TeV.422036.ParticleGun_single_mu_Pt100.recon.RDO.e7967_e5984_s3126_r11774_tid20254958_00
+# art-input: user.keli:user.keli.mc16_13TeV.422036.ParticleGun_single_mu_Pt100GeV
 # art-input-nfiles: 10
 # art-cores: 4
 # art-memory: 4096
@@ -70,7 +70,7 @@ case $ArtProcess in
       --inputRDOFile $x \
       --outputNTUP_PHYSVALFile physval.ntuple.root \
       --outputAODFile   physval.AOD.root \
-      --conditionsTag   'CONDBR2-BLKPA-RUN2-06' \
+      --conditionsTag   'OFLCOND-MC16-SDR-RUN2-08' \
       --steering        doRAWtoALL \
       --checkEventCount False \
       --ignoreErrors    True \
@@ -85,7 +85,7 @@ case $ArtProcess in
       InDetPhysValFlags.doValidateTightPrimaryTracks.set_Value_and_Lock(True); \
       InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
       InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
-      InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
+      InDetPhysValFlags.doExpertOutput.set_Value_and_Lock(True); \
       rec.doDumpProperties=True; rec.doCalo=True; rec.doEgamma=True; \
       rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=True; \
       rec.doLArg=True; rec.doLucid=True; rec.doMuon=True; rec.doMuonCombined=True; \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_simreco.sh
index 708e590e1fe2..8a636f11aab2 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_simreco.sh
@@ -90,6 +90,7 @@ if [ $sim_tf_exit_code -eq 0 ]  ;then
  # Reco step based on test InDetPhysValMonitoring ART setup from Josh Moss.
  run Reco_tf.py \
    --inputHITSFile   "$hits" \
+   --outputRDOFile   output.RDO.root \
    --outputAODFile   physval.AOD.root \
    --outputNTUP_PHYSVALFile ${dcubemon_rec} \
    --conditionsTag   'OFLCOND-MC16-SDR-RUN2-08' \
@@ -105,7 +106,7 @@ if [ $sim_tf_exit_code -eq 0 ]  ;then
    InDetPhysValFlags.doValidateTightPrimaryTracks.set_Value_and_Lock(True); \
    InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
    InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
-   InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
+   InDetPhysValFlags.doExpertOutput.set_Value_and_Lock(True); \
    rec.doDumpProperties=True; rec.doCalo=True; rec.doEgamma=True; \
    rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=True; \
    rec.doLArg=True; rec.doLucid=True; rec.doMuon=True; rec.doMuonCombined=True; \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu10GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu10GeV_reco.sh
index 1931963d9b96..0f7831b6167c 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu10GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu10GeV_reco.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # art-description: art job for InDetPhysValMonitoring, Single muon 10GeV
 # art-type: grid
-# art-input: user.keli.mc16_13TeV.422034.ParticleGun_single_mu_Pt10.recon.RDO.e7967_e5984_s3126_r11774_tid20254941_00
+# art-input: user.keli:user.keli.mc16_13TeV.422034.ParticleGun_single_mu_Pt10GeV
 # art-input-nfiles: 10
 # art-cores: 4
 # art-memory: 4096
@@ -70,7 +70,7 @@ case $ArtProcess in
       --inputRDOFile $x \
       --outputNTUP_PHYSVALFile physval.ntuple.root \
       --outputAODFile   physval.AOD.root \
-      --conditionsTag   'CONDBR2-BLKPA-RUN2-06' \
+      --conditionsTag   'OFLCOND-MC16-SDR-RUN2-08' \
       --steering        doRAWtoALL \
       --checkEventCount False \
       --ignoreErrors    True \
@@ -85,7 +85,7 @@ case $ArtProcess in
       InDetPhysValFlags.doValidateTightPrimaryTracks.set_Value_and_Lock(True); \
       InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
       InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
-      InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
+      InDetPhysValFlags.doExpertOutput.set_Value_and_Lock(True); \
       rec.doDumpProperties=True; rec.doCalo=True; rec.doEgamma=True; \
       rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=True; \
       rec.doLArg=True; rec.doLucid=True; rec.doMuon=True; rec.doMuonCombined=True; \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_reco.sh
index b547d02e5023..d95852323a1f 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_reco.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # art-description: art job for InDetPhysValMonitoring, Single muon 1GeV
 # art-type: grid
-# art-input: user.goblirsc:mcforArt_2021-09-16_sglMu1_RDO
+# art-input: user.keli:user.keli.mc16_13TeV.422032.ParticleGun_single_mu_Pt1GeV
 # art-input-nfiles: 1
 # art-cores: 4
 # art-memory: 4096
@@ -70,7 +70,7 @@ case $ArtProcess in
       --inputRDOFile $x \
       --outputNTUP_PHYSVALFile physval.ntuple.root \
       --outputAODFile   physval.AOD.root \
-      --conditionsTag   'CONDBR2-BLKPA-RUN2-06' \
+      --conditionsTag   'OFLCOND-MC16-SDR-RUN2-08' \
       --steering        doRAWtoALL \
       --checkEventCount False \
       --ignoreErrors    True \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh
index b6970f13056f..116dfb0f1700 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh
@@ -90,6 +90,7 @@ if [ $sim_tf_exit_code -eq 0 ]  ;then
  # Reco step based on test InDetPhysValMonitoring ART setup from Josh Moss.
  run Reco_tf.py \
    --inputHITSFile   "$hits" \
+   --outputRDOFile   output.RDO.root \
    --outputAODFile   physval.AOD.root \
    --outputNTUP_PHYSVALFile ${dcubemon_rec} \
    --conditionsTag   'OFLCOND-MC16-SDR-RUN2-08' \
@@ -105,7 +106,7 @@ if [ $sim_tf_exit_code -eq 0 ]  ;then
    InDetPhysValFlags.doValidateTightPrimaryTracks.set_Value_and_Lock(True); \
    InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
    InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
-   InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
+   InDetPhysValFlags.doExpertOutput.set_Value_and_Lock(True); \
    rec.doDumpProperties=True; rec.doCalo=True; rec.doEgamma=True; \
    rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=True; \
    rec.doLArg=True; rec.doLucid=True; rec.doMuon=True; rec.doMuonCombined=True; \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_reco.sh
index 0ef48c0f9fee..ffac501791d8 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_reco.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # art-description: art job for InDetPhysValMonitoring, Single muon 20GeV
 # art-type: grid
-# art-input: user.goblirsc:mcforArt_2021-09-16_sglMu20_RDO
+# art-input: user.keli:user.keli.mc16_13TeV.422035.ParticleGun_single_mu_Pt20GeV
 # art-input-nfiles: 1
 # art-cores: 4
 # art-memory: 4096
@@ -70,7 +70,7 @@ case $ArtProcess in
       --inputRDOFile $x \
       --outputNTUP_PHYSVALFile physval.ntuple.root \
       --outputAODFile   physval.AOD.root \
-      --conditionsTag   'CONDBR2-BLKPA-RUN2-06' \
+      --conditionsTag   'OFLCOND-MC16-SDR-RUN2-08' \
       --steering        doRAWtoALL \
       --checkEventCount False \
       --ignoreErrors    True \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_simreco.sh
index 3b4e9cea441c..645f1f729d72 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_simreco.sh
@@ -90,6 +90,7 @@ if [ $sim_tf_exit_code -eq 0 ]  ;then
  # Reco step based on test InDetPhysValMonitoring ART setup from Josh Moss.
  run Reco_tf.py \
    --inputHITSFile   "$hits" \
+   --outputRDOFile   output.RDO.root \
    --outputAODFile   physval.AOD.root \
    --outputNTUP_PHYSVALFile ${dcubemon_rec} \
    --conditionsTag   'OFLCOND-MC16-SDR-RUN2-08' \
@@ -105,7 +106,7 @@ if [ $sim_tf_exit_code -eq 0 ]  ;then
    InDetPhysValFlags.doValidateTightPrimaryTracks.set_Value_and_Lock(True); \
    InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
    InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
-   InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
+   InDetPhysValFlags.doExpertOutput.set_Value_and_Lock(True); \
    rec.doDumpProperties=True; rec.doCalo=True; rec.doEgamma=True; \
    rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=True; \
    rec.doLArg=True; rec.doLucid=True; rec.doMuon=True; rec.doMuonCombined=True; \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh
index c668294e4349..ef22236fb914 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh
@@ -90,6 +90,7 @@ if [ $sim_tf_exit_code -eq 0 ]  ;then
  # Reco step based on test InDetPhysValMonitoring ART setup from Josh Moss.
  run Reco_tf.py \
    --inputHITSFile   "$hits" \
+   --outputRDOFile   output.RDO.root \
    --outputAODFile   physval.AOD.root \
    --outputNTUP_PHYSVALFile ${dcubemon_rec} \
    --conditionsTag   'OFLCOND-MC16-SDR-RUN2-08' \
@@ -105,7 +106,7 @@ if [ $sim_tf_exit_code -eq 0 ]  ;then
    InDetPhysValFlags.doValidateTightPrimaryTracks.set_Value_and_Lock(True); \
    InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
    InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
-   InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
+   InDetPhysValFlags.doExpertOutput.set_Value_and_Lock(True); \
    rec.doDumpProperties=True; rec.doCalo=True; rec.doEgamma=True; \
    rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=True; \
    rec.doLArg=True; rec.doLucid=True; rec.doMuon=True; rec.doMuonCombined=True; \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_reco.sh
index 11463572f93c..aa9343d0842a 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_reco.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-# art-description: art job for InDetPhysValMonitoring, Single ele 10GeV
+# art-description: art job for InDetPhysValMonitoring, Single ele 1GeV
 # art-type: grid
-# art-input: user.goblirsc:mcforArt_2021-09-16_sglpiplus1_RDO
+# art-input: user.keli:user.keli.mc16_13TeV.422047.ParticleGun_single_piplus_Pt1GeV
 # art-input-nfiles: 1
 # art-cores: 4
 # art-memory: 4096
@@ -70,7 +70,7 @@ case $ArtProcess in
       --inputRDOFile $x \
       --outputNTUP_PHYSVALFile physval.ntuple.root \
       --outputAODFile   physval.AOD.root \
-      --conditionsTag   'CONDBR2-BLKPA-RUN2-06' \
+      --conditionsTag   'OFLCOND-MC16-SDR-RUN2-08' \
       --steering        doRAWtoALL \
       --checkEventCount False \
       --ignoreErrors    True \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_simreco.sh
index 4e68361e25d3..65c0bcaee1d5 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_simreco.sh
@@ -91,6 +91,7 @@ if [ $sim_tf_exit_code -eq 0 ]  ;then
  # Reco step based on test InDetPhysValMonitoring ART setup from Josh Moss.
  run Reco_tf.py \
    --inputHITSFile   "$hits" \
+   --outputRDOFile   output.RDO.root \
    --outputAODFile   physval.AOD.root \
    --outputNTUP_PHYSVALFile ${dcubemon_rec} \
    --conditionsTag   'OFLCOND-MC16-SDR-RUN2-08' \
@@ -106,7 +107,7 @@ if [ $sim_tf_exit_code -eq 0 ]  ;then
    InDetPhysValFlags.doValidateTightPrimaryTracks.set_Value_and_Lock(True); \
    InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
    InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
-   InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
+   InDetPhysValFlags.doExpertOutput.set_Value_and_Lock(True); \
    rec.doDumpProperties=True; rec.doCalo=True; rec.doEgamma=True; \
    rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=True; \
    rec.doLArg=True; rec.doLucid=True; rec.doMuon=True; rec.doMuonCombined=True; \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_reco.sh
index 4798affc52f2..01557030cca4 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_reco.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # art-description: art job for InDetPhysValMonitoring, Single ele 10GeV
 # art-type: grid
-# art-input: user.goblirsc:mcforArt_2021-09-16_sglpiplus5_RDO
+# art-input: user.keli:user.keli.mc16_13TeV.422048.ParticleGun_single_piplus_Pt5GeV
 # art-input-nfiles: 1
 # art-cores: 4
 # art-memory: 4096
@@ -70,7 +70,7 @@ case $ArtProcess in
       --inputRDOFile $x \
       --outputNTUP_PHYSVALFile physval.ntuple.root \
       --outputAODFile   physval.AOD.root \
-      --conditionsTag   'CONDBR2-BLKPA-RUN2-06' \
+      --conditionsTag   'OFLCOND-MC16-SDR-RUN2-08' \
       --steering        doRAWtoALL \
       --checkEventCount False \
       --ignoreErrors    True \
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_simreco.sh
index a22d8156465a..7bb927d95f00 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_simreco.sh
@@ -91,6 +91,7 @@ if [ $sim_tf_exit_code -eq 0 ]  ;then
  # Reco step based on test InDetPhysValMonitoring ART setup from Josh Moss.
  run Reco_tf.py \
    --inputHITSFile   "$hits" \
+   --outputRDOFile   output.RDO.root \
    --outputAODFile   physval.AOD.root \
    --outputNTUP_PHYSVALFile ${dcubemon_rec} \
    --conditionsTag   'OFLCOND-MC16-SDR-RUN2-08' \
@@ -106,7 +107,7 @@ if [ $sim_tf_exit_code -eq 0 ]  ;then
    InDetPhysValFlags.doValidateTightPrimaryTracks.set_Value_and_Lock(True); \
    InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
    InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
-   InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
+   InDetPhysValFlags.doExpertOutput.set_Value_and_Lock(True); \
    rec.doDumpProperties=True; rec.doCalo=True; rec.doEgamma=True; \
    rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=True; \
    rec.doLArg=True; rec.doLucid=True; rec.doMuon=True; rec.doMuonCombined=True; \
diff --git a/Simulation/Tools/RDOAnalysis/src/PixelRDOAnalysis.cxx b/Simulation/Tools/RDOAnalysis/src/PixelRDOAnalysis.cxx
index 7143e0ee4164..8e4daa791a5f 100644
--- a/Simulation/Tools/RDOAnalysis/src/PixelRDOAnalysis.cxx
+++ b/Simulation/Tools/RDOAnalysis/src/PixelRDOAnalysis.cxx
@@ -371,7 +371,7 @@ StatusCode PixelRDOAnalysis::execute() {
   bool doTruthMatching = true;
   const HepMC::GenEvent* hardScatterEvent(nullptr);
 
-  if (mcEventCollection->size()==0){
+  if ((!mcEventCollection.isValid())||mcEventCollection->size()==0){
     ATH_MSG_WARNING("Failed to retrieve a nonzero sized truth event collection, disabling truthMatching");
     doTruthMatching = false;
   }
diff --git a/Simulation/Tools/RDOAnalysis/src/SCT_RDOAnalysis.cxx b/Simulation/Tools/RDOAnalysis/src/SCT_RDOAnalysis.cxx
index 383484cdac8b..f6a25b831ef0 100644
--- a/Simulation/Tools/RDOAnalysis/src/SCT_RDOAnalysis.cxx
+++ b/Simulation/Tools/RDOAnalysis/src/SCT_RDOAnalysis.cxx
@@ -334,7 +334,7 @@ StatusCode SCT_RDOAnalysis::execute() {
 
   const HepMC::GenEvent* hardScatterEvent(nullptr);
   bool doTruthMatching = true;
-  if (mcEventCollection->size()==0){
+  if ((!mcEventCollection.isValid())||mcEventCollection->size()==0){
     ATH_MSG_WARNING("Failed to retrieve a nonzero sized truth event collection, disabling truthMatching");
     doTruthMatching = false;
   }
-- 
GitLab