diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/share/AODToEgammaD3PD.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/share/AODToEgammaD3PD.py
index 3a7512fb4bf6feff19ec760965674ea376b81519..dfa8e02ffd393d1475db8f6d90137207f9bfb8b0 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/share/AODToEgammaD3PD.py
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/share/AODToEgammaD3PD.py
@@ -13,6 +13,8 @@
 
 from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 athenaCommonFlags.FilesInput= ["AOD.pool.root"]
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ConfigFlags.Input.Files = athenaCommonFlags.FilesInput()
 
 
 ###################################################################3
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/share/EgammaD3PD_prodJobOFragment.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/share/EgammaD3PD_prodJobOFragment.py
index a65e3009e84fc224d28a2f8b1edc0999c941855b..2b11e34ce1e6e94b26261a115de79c831823c7a6 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/share/EgammaD3PD_prodJobOFragment.py
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/share/EgammaD3PD_prodJobOFragment.py
@@ -23,9 +23,6 @@ if prodFlags.WriteEgammaD3PD.isVirtual:
     raise NameError( "Egamma D3PD set to be a virtual stream" )
     pass
 
-#configure MuonScatteringAngleSignificanceTool
-include("JetTagD3PDMaker/MuonScatteringSigToolConfig.py")
-
 # Construct the stream and file names for the SUSY D3PD:
 streamName = prodFlags.WriteEgammaD3PD.StreamName
 fileName   = buildFileName( prodFlags.WriteEgammaD3PD )