diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/postInclude.RDOAnalysis.py b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/postInclude.RDOAnalysis.py
index 49dad4570c36a4b98feb57fa830c0d693dedc1bf..a07c287661012428569767b89eb5036796f3a646 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 c2cd5cca454b67a7f48a76ef74c684152c341538..afc0292e9317afeb9873599e96495e41a350dfd9 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 261f7aaaa582609510461a9557c3391fbec11f79..d9bfda9c6662cb6de944e3f4481cc5160f0b3058 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 6cf88a31cea15430eb5ee3d9719bf1c70bdd02de..d4d934494f55649ec4b2e0966e6da41dfe6a8e55 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 708e590e1fe2eb2c0c4430ad97203c2d69e0dfd9..8a636f11aab2de340a0da024b6e0a64c812375be 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 1931963d9b9614b8e26c243e0d271859bde9b813..0f7831b6167c3713a9b07b84eb369a14ca67626a 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 b547d02e5023ea38ef4b3949f0acd4aa3253aa7b..d95852323a1fdcee5a6a9b481dc6ece0fad96087 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 b6970f13056f35b04c540e9a0b123f5c49069c87..116dfb0f1700dd5139feb96760404fa1029fff3d 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 0ef48c0f9fee6c8f84e2a55ed90f56106cd04d29..ffac501791d83b012e914eb41eecf56a211e101d 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 3b4e9cea441c50127415a10ed0a11373742d3a6f..645f1f729d728a63a4e995faff539ff2614eb828 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 c668294e434902dd22455e2603b608a2d5d9a4ec..ef22236fb914d2a7bee9c6a7649028a10e03d3eb 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 11463572f93cf2bf870596b32ad7f6c1c75d7bc6..aa9343d0842a36dfd7906d3a82346c9fa1c4d1f1 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 4e68361e25d33250ee47a4c472e79bbf7717e7c4..65c0bcaee1d533084c8b664893427fdd68f5d48a 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 4798affc52f2e6362799d0ba67e8ef39c92ff5b0..01557030cca4193a606081bfba401b1b562afe5d 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 a22d8156465ae705946e2f368aa577e8c5c07bdc..7bb927d95f00d5675804cc41cb55f747181e399f 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 7143e0ee41647d3f3b98450f2ddc3fc68ef80fe7..8e4daa791a5f441e3e5b5e6f03660bad32214510 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 383484cdac8b4b5cbd4cbfe2040fd05f496424a5..f6a25b831ef09c80ccf04f31912a4fc74663dec4 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;
}