Merge branch 'combinedRecOffCosmics' into '21.0'

Fix combined muon reco for cosmics (ATLASRECTS-3998)

See merge request !1743

Former-commit-id: d0465827

Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py

@@ -82,10 +82,10 @@ class MuonCombinedReconstruction(ConfiguredMuonRec):
 
         topSequence = AlgSequence()
                       
-        if jobproperties.Beam.beamType()=='collisions':
+        #if jobproperties.Beam.beamType()=='collisions':
             # creates input collections for ID and MS candidates
-            topSequence += getAlgorithm("MuonCombinedInDetCandidateAlg") 
-            topSequence += getAlgorithm("MuonCombinedMuonCandidateAlg") 
+        topSequence += getAlgorithm("MuonCombinedInDetCandidateAlg") 
+        topSequence += getAlgorithm("MuonCombinedMuonCandidateAlg") 
             
             # runs ID+MS combinations (fit, staco, mugirl, ID-taggers)
         if muonCombinedRecFlags.doStatisticalCombination() or muonCombinedRecFlags.doCombinedFit():

Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py

@@ -59,6 +59,8 @@ def MuonCombinedParticleCreator(name="MuonCombinedParticleCreator",**kwargs):
     kwargs.setdefault("TrackSummaryTool", ToolSvc.CombinedMuonTrackSummary ) #getPublicTool("CombinedMuonTrackSummary") )
     kwargs.setdefault("KeepAllPerigee",True )
     kwargs.setdefault("UseMuonSummaryTool",True )
+    if beamFlags.beamType() == 'cosmics':
+        kwargs.setdefault("PerigeeExpression","Origin")
     return CfgMgr.Trk__TrackParticleCreatorTool(name,**kwargs)
 
 def MuonCaloParticleCreator(name="MuonCaloParticleCreator",**kwargs):