diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele10GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele10GeV_reco.sh
index 5086401058bb4020b8a914e70eb483bbb33ddef9..e61afe00cf7cc2d11ebb3c788cdd4366e7b90097 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele10GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele10GeV_reco.sh
@@ -85,11 +85,11 @@ case $ArtProcess in
       InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
       InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
       InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
-      rec.doDumpProperties=True; rec.doCalo=False; rec.doEgamma=False; \
-      rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=False; \
-      rec.doLArg=False; rec.doLucid=False; rec.doMuon=False; rec.doMuonCombined=False; \
-      rec.doSemiDetailedPerfMon=True; rec.doTau=False; rec.doTile=False;\
-      from ParticleBuilderOptions.AODFlags import AODFlags;\
+      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; \
+      rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+      from ParticleBuilderOptions.AODFlags import AODFlags; \
       AODFlags.ThinGeantTruth.set_Value_and_Lock(False);  \
       AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
       AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele5GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele5GeV_reco.sh
index eb4d9f2de97a49d95479e750a9b1b7247f36689c..ed71b2246d16ba5369904c923aebc0ab0108c639 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele5GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ele5GeV_reco.sh
@@ -85,11 +85,11 @@ case $ArtProcess in
       InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
       InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
       InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
-      rec.doDumpProperties=True; rec.doCalo=False; rec.doEgamma=False; \
-      rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=False; \
-      rec.doLArg=False; rec.doLucid=False; rec.doMuon=False; rec.doMuonCombined=False; \
-      rec.doSemiDetailedPerfMon=True; rec.doTau=False; rec.doTile=False;\
-      from ParticleBuilderOptions.AODFlags import AODFlags;\
+      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; \
+      rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+      from ParticleBuilderOptions.AODFlags import AODFlags; \
       AODFlags.ThinGeantTruth.set_Value_and_Lock(False);  \
       AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
       AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_reco.sh
index 148333086560accb235a402e25a7a8f5a4b122c5..962c16b4c8de751a3362daded41d6940eea3a00a 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_reco.sh
@@ -85,11 +85,11 @@ case $ArtProcess in
       InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
       InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
       InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
-      rec.doDumpProperties=True; rec.doCalo=False; rec.doEgamma=False; \
-      rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=False; \
-      rec.doLArg=False; rec.doLucid=False; rec.doMuon=False; rec.doMuonCombined=False; \
-      rec.doSemiDetailedPerfMon=True; rec.doTau=False; rec.doTile=False;\
-      from ParticleBuilderOptions.AODFlags import AODFlags;\
+      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; \
+      rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+      from ParticleBuilderOptions.AODFlags import AODFlags; \
       AODFlags.ThinGeantTruth.set_Value_and_Lock(False);  \
       AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
       AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_simreco.sh
index 214093a27a6559b757dc6ba4945d8b782f3e6891..ea3ed5ec4f94c06e7aaf23110c92c88e1087c7a2 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu100GeV_simreco.sh
@@ -103,11 +103,11 @@ if [ $sim_tf_exit_code -eq 0 ]  ;then
    InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
    InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
    InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
-   rec.doDumpProperties=True; rec.doCalo=False; rec.doEgamma=False; \
-   rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=False; \
-   rec.doLArg=False; rec.doLucid=False; rec.doMuon=False; rec.doMuonCombined=False; \
-   rec.doSemiDetailedPerfMon=True; rec.doTau=False; rec.doTile=False;\
-   from ParticleBuilderOptions.AODFlags import AODFlags;\
+   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; \
+   rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+   from ParticleBuilderOptions.AODFlags import AODFlags; \
    AODFlags.ThinGeantTruth.set_Value_and_Lock(False);  \
    AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
    AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu10GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu10GeV_reco.sh
index 726e0bcf4173db34353d6c5e3395855c1af2b332..ba6a38f08e35f7da424d4ee710e2fbf890383bf4 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu10GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu10GeV_reco.sh
@@ -85,11 +85,11 @@ case $ArtProcess in
       InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
       InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
       InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
-      rec.doDumpProperties=True; rec.doCalo=False; rec.doEgamma=False; \
-      rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=False; \
-      rec.doLArg=False; rec.doLucid=False; rec.doMuon=False; rec.doMuonCombined=False; \
-      rec.doSemiDetailedPerfMon=True; rec.doTau=False; rec.doTile=False;\
-      from ParticleBuilderOptions.AODFlags import AODFlags;\
+      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; \
+      rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+      from ParticleBuilderOptions.AODFlags import AODFlags; \
       AODFlags.ThinGeantTruth.set_Value_and_Lock(False);  \
       AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
       AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_reco.sh
index 7e8ca67601355b8336845ca9c8a952f422140334..7bdf4995388166963efeeae22d1488b712550f46 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_reco.sh
@@ -85,11 +85,11 @@ case $ArtProcess in
       InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
       InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
       InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
-      rec.doDumpProperties=True; rec.doCalo=False; rec.doEgamma=False; \
-      rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=False; \
-      rec.doLArg=False; rec.doLucid=False; rec.doMuon=False; rec.doMuonCombined=False; \
-      rec.doSemiDetailedPerfMon=True; rec.doTau=False; rec.doTile=False;\
-      from ParticleBuilderOptions.AODFlags import AODFlags;\
+      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; \
+      rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+      from ParticleBuilderOptions.AODFlags import AODFlags; \
       AODFlags.ThinGeantTruth.set_Value_and_Lock(False);  \
       AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
       AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh
index cf55b9bfb7867964508519f11197a35582db2511..4e2107e62e37d66faba241e236495013c24372bd 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu1GeV_simreco.sh
@@ -103,11 +103,11 @@ if [ $sim_tf_exit_code -eq 0 ]  ;then
    InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
    InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
    InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
-   rec.doDumpProperties=True; rec.doCalo=False; rec.doEgamma=False; \
-   rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=False; \
-   rec.doLArg=False; rec.doLucid=False; rec.doMuon=False; rec.doMuonCombined=False; \
-   rec.doSemiDetailedPerfMon=True; rec.doTau=False; rec.doTile=False;\
-   from ParticleBuilderOptions.AODFlags import AODFlags;\
+   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; \
+   rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+   from ParticleBuilderOptions.AODFlags import AODFlags; \
    AODFlags.ThinGeantTruth.set_Value_and_Lock(False);  \
    AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
    AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_reco.sh
index 82b60f8d7e0610be5a82f1b280742a0c3de9c60a..f554ae9ce8bd1b453078df350e9207c2f8ee4f8f 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_reco.sh
@@ -85,11 +85,11 @@ case $ArtProcess in
       InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
       InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
       InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
-      rec.doDumpProperties=True; rec.doCalo=False; rec.doEgamma=False; \
-      rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=False; \
-      rec.doLArg=False; rec.doLucid=False; rec.doMuon=False; rec.doMuonCombined=False; \
-      rec.doSemiDetailedPerfMon=True; rec.doTau=False; rec.doTile=False;\
-      from ParticleBuilderOptions.AODFlags import AODFlags;\
+      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; \
+      rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+      from ParticleBuilderOptions.AODFlags import AODFlags; \
       AODFlags.ThinGeantTruth.set_Value_and_Lock(False);  \
       AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
       AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_simreco.sh
index 2789b5caa69e55fa74ca5faa625fbb4aa68e71f3..1eeda3849c957ab498055e74989856a30efd902b 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu20GeV_simreco.sh
@@ -103,11 +103,11 @@ if [ $sim_tf_exit_code -eq 0 ]  ;then
    InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
    InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
    InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
-   rec.doDumpProperties=True; rec.doCalo=False; rec.doEgamma=False; \
-   rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=False; \
-   rec.doLArg=False; rec.doLucid=False; rec.doMuon=False; rec.doMuonCombined=False; \
-   rec.doSemiDetailedPerfMon=True; rec.doTau=False; rec.doTile=False;\
-   from ParticleBuilderOptions.AODFlags import AODFlags;\
+   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; \
+   rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+   from ParticleBuilderOptions.AODFlags import AODFlags; \
    AODFlags.ThinGeantTruth.set_Value_and_Lock(False);  \
    AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
    AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh
index 7e985c36938a12df85edcf93bffe8d1a63c52a57..12d120f167655ee8f2297529fb97b499c60c7488 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_mu5GeV_simreco.sh
@@ -103,11 +103,11 @@ if [ $sim_tf_exit_code -eq 0 ]  ;then
    InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
    InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
    InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
-   rec.doDumpProperties=True; rec.doCalo=False; rec.doEgamma=False; \
-   rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=False; \
-   rec.doLArg=False; rec.doLucid=False; rec.doMuon=False; rec.doMuonCombined=False; \
-   rec.doSemiDetailedPerfMon=True; rec.doTau=False; rec.doTile=False;\
-   from ParticleBuilderOptions.AODFlags import AODFlags;\
+   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; \
+   rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+   from ParticleBuilderOptions.AODFlags import AODFlags; \
    AODFlags.ThinGeantTruth.set_Value_and_Lock(False);  \
    AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
    AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_reco.sh
index eaaca9a8252c684a13fd9f2c20614e7b4ee214aa..772ea143b84922207cccea7cd26548f15a0fcbe7 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_reco.sh
@@ -85,11 +85,11 @@ case $ArtProcess in
       InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
       InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
       InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
-      rec.doDumpProperties=True; rec.doCalo=False; rec.doEgamma=False; \
-      rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=False; \
-      rec.doLArg=False; rec.doLucid=False; rec.doMuon=False; rec.doMuonCombined=False; \
-      rec.doSemiDetailedPerfMon=True; rec.doTau=False; rec.doTile=False;\
-      from ParticleBuilderOptions.AODFlags import AODFlags;\
+      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; \
+      rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+      from ParticleBuilderOptions.AODFlags import AODFlags; \
       AODFlags.ThinGeantTruth.set_Value_and_Lock(False);  \
       AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
       AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_simreco.sh
index 27666acc52d30ebb3bbd6658abac9d0441a73e70..300a74242c095e219abb9ca57471ec229f68dea4 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus1GeV_simreco.sh
@@ -104,11 +104,11 @@ if [ $sim_tf_exit_code -eq 0 ]  ;then
    InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
    InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
    InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
-   rec.doDumpProperties=True; rec.doCalo=False; rec.doEgamma=False; \
-   rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=False; \
-   rec.doLArg=False; rec.doLucid=False; rec.doMuon=False; rec.doMuonCombined=False; \
-   rec.doSemiDetailedPerfMon=True; rec.doTau=False; rec.doTile=False;\
-   from ParticleBuilderOptions.AODFlags import AODFlags;\
+   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; \
+   rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+   from ParticleBuilderOptions.AODFlags import AODFlags; \
    AODFlags.ThinGeantTruth.set_Value_and_Lock(False);  \
    AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
    AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_reco.sh
index 1a87aacf0da3586bdd23a534e355fbd69b87bf50..97f7087f92f41059818d859a7e089da4d1c54ce3 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_reco.sh
@@ -85,11 +85,11 @@ case $ArtProcess in
       InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
       InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
       InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
-      rec.doDumpProperties=True; rec.doCalo=False; rec.doEgamma=False; \
-      rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=False; \
-      rec.doLArg=False; rec.doLucid=False; rec.doMuon=False; rec.doMuonCombined=False; \
-      rec.doSemiDetailedPerfMon=True; rec.doTau=False; rec.doTile=False;\
-      from ParticleBuilderOptions.AODFlags import AODFlags;\
+      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; \
+      rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+      from ParticleBuilderOptions.AODFlags import AODFlags; \
       AODFlags.ThinGeantTruth.set_Value_and_Lock(False);  \
       AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
       AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_simreco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_simreco.sh
index 7d17e449811e0a1d3eab1b1db152f2a2ecfd3375..3585eb5ca189c4ad134ffc9f4fb4d29a0467c738 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_simreco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_piplus5GeV_simreco.sh
@@ -104,11 +104,11 @@ if [ $sim_tf_exit_code -eq 0 ]  ;then
    InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
    InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
    InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
-   rec.doDumpProperties=True; rec.doCalo=False; rec.doEgamma=False; \
-   rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=False; \
-   rec.doLArg=False; rec.doLucid=False; rec.doMuon=False; rec.doMuonCombined=False; \
-   rec.doSemiDetailedPerfMon=True; rec.doTau=False; rec.doTile=False;\
-   from ParticleBuilderOptions.AODFlags import AODFlags;\
+   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; \
+   rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+   from ParticleBuilderOptions.AODFlags import AODFlags; \
    AODFlags.ThinGeantTruth.set_Value_and_Lock(False);  \
    AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
    AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU0_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU0_reco.sh
index 91315337749144f7d619c41c2a371b4c3913b7d5..9c1e678c08bdf300d5a445b4941d3dc58abebe6a 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU0_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU0_reco.sh
@@ -35,11 +35,11 @@ run Reco_tf.py \
   InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
   InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
   InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
-  rec.doDumpProperties=True; rec.doCalo=False; rec.doEgamma=False; \
-  rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=False; \
-  rec.doLArg=False; rec.doLucid=False; rec.doMuon=False; rec.doMuonCombined=False; \
-  rec.doSemiDetailedPerfMon=True; rec.doTau=False; rec.doTile=False;\
-  from ParticleBuilderOptions.AODFlags import AODFlags;\
+  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; \
+  rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+  from ParticleBuilderOptions.AODFlags import AODFlags; \
   AODFlags.ThinGeantTruth.set_Value_and_Lock(False);  \
   AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
   AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh
index 8bf728909983f839f607e71b47bc868c5592b024..e867491661fe1e90c55d6aeba71ad8afcb37fc71 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh
@@ -35,11 +35,11 @@ run Reco_tf.py \
   InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(False); \
   InDetPhysValFlags.doValidateGSFTracks.set_Value_and_Lock(False); \
   InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(True); \
-  rec.doDumpProperties=True; rec.doCalo=False; rec.doEgamma=False; \
-  rec.doForwardDet=False; rec.doInDet=True; rec.doJetMissingETTag=False; \
-  rec.doLArg=False; rec.doLucid=False; rec.doMuon=False; rec.doMuonCombined=False; \
-  rec.doSemiDetailedPerfMon=True; rec.doTau=False; rec.doTile=False;\
-  from ParticleBuilderOptions.AODFlags import AODFlags;\
+  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; \
+  rec.doSemiDetailedPerfMon=True; rec.doTau=True; rec.doTile=True; \
+  from ParticleBuilderOptions.AODFlags import AODFlags; \
   AODFlags.ThinGeantTruth.set_Value_and_Lock(False);  \
   AODFlags.ThinNegativeEnergyCaloClusters.set_Value_and_Lock(False); \
   AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);\