TrigNavTools: use xAODConfigSvc in Run3 navigation converter

Use the TrigConfigSvc configured in the TrigDecisionTool (xAODConfigSvc) to
access the list of trigger chains. Also make the `xAODConfigSvc` the
default in C++ and rename the property to `TrigConfigSvc`.

Trigger/TrigEvent/TrigNavTools/python/NavConverterConfig.py

@@ -22,20 +22,25 @@ def createNavConverterAlg():
 
 def NavConverterCfg(flags):
     acc = ComponentAccumulator()
-    from TrigConfigSvc.TrigConfigSvcCfg import HLTConfigSvcCfg
-    configSvcAcc = HLTConfigSvcCfg(flags)
-    service = configSvcAcc.getService("HLTConfigSvc") #TODO fetching the HLTConfigSvc should rely on the fact that it
-    acc.merge(configSvcAcc)
+    from TrigDecisionTool.TrigDecisionToolConfig import getTrigDecisionTool
+    tdt_ca = getTrigDecisionTool(flags)
+    tdt = tdt_ca.getPrimary()
+    acc.merge(tdt_ca)
 
     cnvAlg = createNavConverterAlg()
-    cnvAlg.HLTConfigSvc = service
+    cnvAlg.TrigDecisionTool = tdt
+    cnvAlg.TrigConfigSvc = tdt.TrigConfigSvc
     acc.addEventAlgo(cnvAlg)
+
     return acc
 
+
 if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
+    from AthenaConfiguration.TestDefaults import defaultTestFiles
+    ConfigFlags.Input.Files = defaultTestFiles.RAW
     ConfigFlags.lock()
+
     acc = NavConverterCfg(ConfigFlags)
     acc.printConfig(withDetails=True, summariseProps=True)
     acc.wasMerged()
-

Trigger/TrigEvent/TrigNavTools/share/RunNavDump.py

 #!/usr/bin/env python
 #
-#  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 #
 
 if __name__=='__main__':
@@ -36,10 +36,10 @@ if __name__=='__main__':
     from AthenaServices.MetaDataSvcConfig import MetaDataSvcCfg
     cfg.merge(MetaDataSvcCfg(ConfigFlags))
 
-    confSvc = CompFactory.TrigConf.xAODConfigSvc("HLTConfigSvc")
+    confSvc = CompFactory.TrigConf.xAODConfigSvc("xAODConfigSvc")
     cfg.addService(confSvc)
     from AthenaCommon.Constants import DEBUG
-    alg = CompFactory.Run2ToRun3TrigNavConverter("TrigNavCnv", OutputLevel=DEBUG, HLTConfigSvc=confSvc)
+    alg = CompFactory.Run2ToRun3TrigNavConverter("TrigNavCnv", OutputLevel=DEBUG, TrigConfigSvc=confSvc)
     alg.doPrint = False
     alg.Collections = ["xAOD::MuonContainer","xAOD::L2StandAloneMuonContainer"]
     

Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverter.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 TRIGNAVTOOLS_RUN2TORUN3TRIGNAVCONVERTER_H
 #define TRIGNAVTOOLS_RUN2TORUN3TRIGNAVCONVERTER_H
@@ -48,7 +48,7 @@ private:
     Gaudi::Property<std::vector<std::string>> m_chainsToSave{ this, "Chains", {} };
     Gaudi::Property<std::vector<std::string>> m_roisToSave{ this, "Rois", {} };
 
-    ServiceHandle< TrigConf::IHLTConfigSvc > m_configSvc { this, "HLTConfigSvc", "HLTConfigSvc", "HLTConfig Service" };
+    ServiceHandle< TrigConf::IHLTConfigSvc > m_configSvc { this, "TrigConfigSvc", "TrigConf::xAODConfigSvc/xAODConfigSvc", "Trigger configuration service" };
     ServiceHandle<IClassIDSvc> m_clidSvc{ this, "ClassIDSvc", "ClassIDSvc", "Service to translate CLID to class name" };
     SG::WriteHandleKey<xAOD::TrigCompositeContainer> m_trigNavWriteKey { this, "TrigNavWriteKey", "HLTNav_All" };
     SG::WriteHandleKey<xAOD::TrigCompositeContainer> m_trigSummaryWriteKey { this, "TrigSummaryWriteKey", "HLTNav_Summary" };

Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py

@@ -202,7 +202,7 @@ class TrigDecisionGetterRun1or2(Configured):
             if (ConfigFlags.Trigger.EDMVersion == 1 or ConfigFlags.Trigger.EDMVersion == 2) and ConfigFlags.Trigger.doEDMVersionConversion:
                 from TrigNavTools.NavConverterConfig import createNavConverterAlg
                 navCnvAlg = createNavConverterAlg()
-                navCnvAlg.HLTConfigSvc = "HLTConfigSvcRun3"
+                navCnvAlg.TrigConfigSvc = "HLTConfigSvcRun3"
                 navCnvAlg.ExtraInputs += [("TrigBSExtractionOutput", "StoreGateSvc+TrigBSExtractionOutput")]
                 topSequence += navCnvAlg