Merge branch 'combinedTagMaps.MuonCombinedRecExample-20180829' into 'master'

MuonCombinedRecExample+MuonCombinedBaseTools: Fix configuration of MuonCreatorAlg/Tool.

See merge request atlas/athena!13813

Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx

@@ -1149,8 +1149,10 @@ namespace MuonCombined {
       for( auto candidate : *inDetCandidates ){
 	std::vector<const TagBase*> tags;
 	for(auto map : tagMaps){
-	  const TagBase* tag=map->getTag(candidate);
-	  if(tag) tags.push_back(tag);
+          if (map) {
+            const TagBase* tag=map->getTag(candidate);
+            if(tag) tags.push_back(tag);
+          }
 	}
         if( !tags.empty() ) {
           // sort the tags based on quality

Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py

@@ -63,6 +63,15 @@ def MuonCombinedMuonCandidateAlg( name="MuonCombinedMuonCandidateAlg", **kwargs
 
 def MuonCombinedAlg( name="MuonCombinedAlg",**kwargs ):
     kwargs.setdefault("MuonCombinedTool",getPublicTool("MuonCombinedTool"))
+    tagmaps = []
+    # CombinedTagMaps must be in a 1-1 correspondence
+    # with MuonCombinedTagTools.
+    for h in kwargs['MuonCombinedTool'].MuonCombinedTagTools:
+        if h.getFullName().find('FitTagTool') >= 0:
+            tagmaps.append ('muidcoTagMap')
+        elif h.getFullName().find('StacoTagTool') >= 0:
+            tagmaps.append ('stacoTagMap')
+    kwargs.setdefault("CombinedTagMaps", tagmaps)
     return CfgMgr.MuonCombinedAlg(name,**kwargs)
 
 def MuonCreatorAlg( name="MuonCreatorAlg",**kwargs ):