Bug fixes for combined muon config

Fixing a couple of bugs in the combined muon configuration:

• Merge the component accumulator for the ExtrapolateMuonToIPTool only when the tool is needed (in cosmics)
• Update a couple of instances of the MuidCaloEnergyParam to be the MuidCaloEnergyToolParam as the tool using this expects that later type of tool.

Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py

@@ -195,7 +195,7 @@ def MuonCandidateToolCfg(flags, name="MuonCandidateTool",**kwargs):
         extrapolator = acc.popPrivateTools()
         result.addPublicTool(extrapolator)
         kwargs.setdefault("TrackExtrapolationTool", extrapolator )
-    result.merge(acc)
+        result.merge(acc)
 
     acc = MuonAmbiProcessorCfg(flags)
     ambiguityprocessor = acc.popPrivateTools()
@@ -389,8 +389,8 @@ def MuidCaloTrackStateOnSurfaceParamCfg(flags, name='MuidCaloTrackStateOnSurface
     kwargs.setdefault("Propagator", CompFactory.Trk__RungeKuttaPropagator(name = 'AtlasRungeKuttaPropagator'))# FIXME - there should be a CA for this!
     kwargs.setdefault("MinRemainingEnergy" , 0.2*GeV )
     kwargs.setdefault("ParamPtCut"         , 3.0*GeV )
-    kwargs.setdefault("CaloEnergyDeposit"  , MuidCaloEnergyParam(flags) )
-    kwargs.setdefault("CaloEnergyParam"  ,   MuidCaloEnergyParam(flags) )
+    kwargs.setdefault("CaloEnergyDeposit"  , MuidCaloEnergyToolParam(flags) )
+    kwargs.setdefault("CaloEnergyParam"  ,   MuidCaloEnergyToolParam(flags) )
     tool = CompFactory.Rec__MuidCaloTrackStateOnSurface(name,**kwargs)
     result.setPrivateTools(tool)
     return result