Manual sweep of !30831 (Add NSWCalibTool to NSWCalibToolsConfigDb and use it)

Hi,

this MR is a manual sweep of !30831 (merged) into 21.3 and master. The automatic sweep was not triggered by gitlab (cf. ATLINFR-3448).

Best, Nico

MuonSpectrometer/MuonCalib/NSWCalib/NSWCalibTools/python/NSWCalibToolsConfig.py

-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration 
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration 
 #
 # Import NSWCalibTools job properties
 #
@@ -11,4 +11,6 @@ def STgcCalibSmearingTool(name="STgcCalibSmearingTool",extraFlags=None,**kwargs)
     return CfgMgr.Muon__NSWCalibSmearingTool(name,**kwargs)
 
 def NSWCalibTool(name="NSWCalibTool",extraFlags=None,**kwargs):
+    from MuonRecExample.MuonRecTools import MuonIdHelperTool
+    kwargs.setdefault("MuonIdHelperTool", MuonIdHelperTool())
     return CfgMgr.Muon__NSWCalibTool(name,**kwargs)