Merge branch 'atr22658' into 'master'

Make segment copying in MuonCreatorAlg configurable property

See merge request atlas/athena!40288

Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCreatorAlg.cxx

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "MuonCreatorAlg.h"
@@ -32,8 +32,6 @@ StatusCode MuonCreatorAlg::initialize()
 {
 
   ATH_CHECK(m_muonCreatorTool.retrieve());
-  m_copySegs=true; //to have MuGirl and MuidCo segments in the same final collection/container; not needed for trigger or stau
-  if(m_buildSlowMuon || name().find("Trig")!=std::string::npos) m_copySegs=false;
   if(m_copySegs) ATH_CHECK(m_muonSegmentConverterTool.retrieve());
   else m_muonSegmentConverterTool.disable();
   ATH_CHECK(m_muonCollectionName.initialize());

Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCreatorAlg.h

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MUONCOMBINEDALGS_MUONCREATORALG_H
@@ -64,7 +64,7 @@ class MuonCreatorAlg : public AthAlgorithm
   Gaudi::Property<bool> m_buildSlowMuon{this, "BuildSlowMuon", false};
   Gaudi::Property<bool> m_doSA{this, "CreateSAmuons", false};
   Gaudi::Property<bool> m_makeClusters{this, "MakeClusters", true};
-  bool m_copySegs;
+  Gaudi::Property<bool> m_copySegs{this, "CopySegments", true};
 
   // Monitoring tool
   ToolHandle< GenericMonitoringTool > m_monTool { this, "MonTool", "", "Monitoring tool" };

Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedReconstructionConfig.py

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
@@ -238,6 +238,7 @@ def MuonCreatorAlgCfg( flags, name="MuonCreatorAlg",**kwargs ):
     if flags.Muon.MuonTrigger:
         kwargs.setdefault("MakeClusters", False)
         kwargs.setdefault("ClusterContainerName", "")
+        kwargs.setdefault("CopySegments", False)
         if flags.Muon.SAMuonTrigger:
             kwargs.setdefault("CreateSAmuons", True)
             kwargs.setdefault("TagMaps", [])
@@ -260,6 +261,7 @@ def StauCreatorAlgCfg(flags, name="StauCreatorAlg", **kwargs ):
     kwargs.setdefault("BuildSlowMuon",1)
     kwargs.setdefault("ClusterContainerName", "SlowMuonClusterCollection")
     kwargs.setdefault("TagMaps",["stauTagMap"])
+    kwargs.setdefault("CopySegments", False)
     # if not TriggerFlags.MuonSlice.doTrigMuonConfig:
     #     recordMuonCreatorAlgObjs (kwargs)
     acc = MuonCreatorAlgCfg(flags, name,**kwargs)

Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
 from AthenaCommon.CfgGetter import getPublicTool, getAlgorithm
@@ -168,6 +168,7 @@ def MuonCreatorAlg( name="MuonCreatorAlg",**kwargs ):
     if TriggerFlags.MuonSlice.doTrigMuonConfig:
         kwargs.setdefault("MakeClusters", False)
         kwargs.setdefault("ClusterContainerName", "")
+        kwargs.setdefault("CopySegments", False)
     return CfgMgr.MuonCreatorAlg(name,**kwargs)
 
 
@@ -202,6 +203,7 @@ def StauCreatorAlg( name="StauCreatorAlg", **kwargs ):
     kwargs.setdefault("BuildSlowMuon",1)
     kwargs.setdefault("ClusterContainerName", "SlowMuonClusterCollection")
     kwargs.setdefault("TagMaps",["stauTagMap"])
+    kwargs.setdefault("CopySegments", False)
     if not TriggerFlags.MuonSlice.doTrigMuonConfig:
         recordMuonCreatorAlgObjs (kwargs)
     return MuonCreatorAlg(name,**kwargs)