From f30e4b8d6f42ca4d4d635897b8d1ce94e1b6f58d Mon Sep 17 00:00:00 2001
From: Walter Lampl <Walter.Lampl@cern.ch>
Date: Mon, 24 Aug 2020 18:09:52 +0200
Subject: [PATCH] Reconstruction: Bulk-change loadDictionary -> load_library
 (for ROOT v6.22)

---
 Reconstruction/Jet/JetRec/python/JetRecStandardTools.py         | 2 +-
 Reconstruction/Jet/JetRec/share/PFSequenceRec.py                | 2 +-
 Reconstruction/Jet/JetRecConfig/python/ConstModHelpers.py       | 2 +-
 Reconstruction/Jet/JetRecTools/python/ConstitToolManager.py     | 2 +-
 .../MET/METReconstruction/python/METAssocConfig_readAOD.py      | 2 +-
 .../CaloRingerTools/python/CaloRingerSelectorsBuilders.py       | 2 +-
 .../egamma/egammaAlgs/python/egammaForwardBuilderConfig.py      | 2 +-
 Reconstruction/egamma/egammaTools/python/EMPIDBuilderBase.py    | 2 +-
 Reconstruction/egamma/egammaTools/python/EMPIDBuilderConfig.py  | 2 +-
 .../egamma/egammaTools/python/egammaToolsFactories.py           | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Reconstruction/Jet/JetRec/python/JetRecStandardTools.py b/Reconstruction/Jet/JetRec/python/JetRecStandardTools.py
index 3797b1edec6..8e764915b01 100644
--- a/Reconstruction/Jet/JetRec/python/JetRecStandardTools.py
+++ b/Reconstruction/Jet/JetRec/python/JetRecStandardTools.py
@@ -313,7 +313,7 @@ jtm += WeightPFOTool("pflowweighter")
 # Trigger xAODType.ObjectType dict entry loading
 import cppyy
 try:
-    cppyy.loadDictionary('xAODBaseObjectTypeDict')
+    cppyy.load_library('libxAODBaseObjectTypeDict')
 except:
     pass
 from ROOT import xAODType
diff --git a/Reconstruction/Jet/JetRec/share/PFSequenceRec.py b/Reconstruction/Jet/JetRec/share/PFSequenceRec.py
index 4ce2a49a7fe..e070a493398 100644
--- a/Reconstruction/Jet/JetRec/share/PFSequenceRec.py
+++ b/Reconstruction/Jet/JetRec/share/PFSequenceRec.py
@@ -78,7 +78,7 @@ jtm += PseudoJetGetter(
   )
 import cppyy
 try:
-    cppyy.loadDictionary('xAODBaseObjectTypeDict')
+    cppyy.load_library('libxAODBaseObjectTypeDict')
 except:
     pass
 from ROOT import xAODType
diff --git a/Reconstruction/Jet/JetRecConfig/python/ConstModHelpers.py b/Reconstruction/Jet/JetRecConfig/python/ConstModHelpers.py
index a3625a451b0..5a1750857ff 100644
--- a/Reconstruction/Jet/JetRecConfig/python/ConstModHelpers.py
+++ b/Reconstruction/Jet/JetRecConfig/python/ConstModHelpers.py
@@ -8,7 +8,7 @@
 ########################################################################
 import cppyy
 try:
-    cppyy.loadDictionary('xAODBaseObjectTypeDict')
+    cppyy.load_library('libxAODBaseObjectTypeDict')
 except Exception:
     pass
 from ROOT import xAODType
diff --git a/Reconstruction/Jet/JetRecTools/python/ConstitToolManager.py b/Reconstruction/Jet/JetRecTools/python/ConstitToolManager.py
index 3808675e1bb..e47472cefaa 100644
--- a/Reconstruction/Jet/JetRecTools/python/ConstitToolManager.py
+++ b/Reconstruction/Jet/JetRecTools/python/ConstitToolManager.py
@@ -32,7 +32,7 @@ class ConstituentToolManager(object):
     standardModifierLists = dict()
     import cppyy
     try:
-        cppyy.loadDictionary('xAODBaseObjectTypeDict')
+        cppyy.load_library('libxAODBaseObjectTypeDict')
     except:
         pass
     from ROOT import xAODType
diff --git a/Reconstruction/MET/METReconstruction/python/METAssocConfig_readAOD.py b/Reconstruction/MET/METReconstruction/python/METAssocConfig_readAOD.py
index 2d962ccda6e..1b5c3c9ca08 100644
--- a/Reconstruction/MET/METReconstruction/python/METAssocConfig_readAOD.py
+++ b/Reconstruction/MET/METReconstruction/python/METAssocConfig_readAOD.py
@@ -63,7 +63,7 @@ def getAssociator(config,suffix,doPFlow=False,
     tool = None
 
     import cppyy
-    try: cppyy.loadDictionary('METReconstructionDict')
+    try: cppyy.load_library('libMETReconstructionDict')
     except: pass
 
     from AthenaCommon.AppMgr import ToolSvc
diff --git a/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerSelectorsBuilders.py b/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerSelectorsBuilders.py
index 61aa6deaa12..686e6fc7fcd 100644
--- a/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerSelectorsBuilders.py
+++ b/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerSelectorsBuilders.py
@@ -17,7 +17,7 @@ mlog.info("Entering")
 
 import cppyy
 try:
-  cppyy.loadDictionary('RingerSelectorToolsDict')
+  cppyy.load_library('libRingerSelectorToolsDict')
 except RuntimeError as e:
   mlog.error("Couldn't load RingerSelectorTools dictionary from cppyy.")
   raise RuntimeError(e)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaForwardBuilderConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaForwardBuilderConfig.py
index 0f3c09cd636..b8db76eb73b 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaForwardBuilderConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaForwardBuilderConfig.py
@@ -10,7 +10,7 @@ from ElectronPhotonSelectorTools.AsgForwardElectronIsEMSelectorsConfig import As
 egammaForwardBuilder=CompFactory.egammaForwardBuilder
 from ROOT import egammaPID
 
-cppyy.loadDictionary('ElectronPhotonSelectorToolsDict')
+cppyy.load_library('libElectronPhotonSelectorToolsDict')
 
 
 def egammaForwardBuilderCfg(flags, name='egammaForwardElectron', **kwargs):
diff --git a/Reconstruction/egamma/egammaTools/python/EMPIDBuilderBase.py b/Reconstruction/egamma/egammaTools/python/EMPIDBuilderBase.py
index bba35b955d5..fcdcaa752eb 100755
--- a/Reconstruction/egamma/egammaTools/python/EMPIDBuilderBase.py
+++ b/Reconstruction/egamma/egammaTools/python/EMPIDBuilderBase.py
@@ -10,7 +10,7 @@ from egammaTools.egammaToolsConf import EMPIDBuilder
 
 # Eventually we need to get rid of this
 #import cppyy
-#cppyy.loadDictionary('ElectronPhotonSelectorToolsDict')
+#cppyy.load_library('libElectronPhotonSelectorToolsDict')
 
 
 class EMPIDBuilderElectronBase (EMPIDBuilder):
diff --git a/Reconstruction/egamma/egammaTools/python/EMPIDBuilderConfig.py b/Reconstruction/egamma/egammaTools/python/EMPIDBuilderConfig.py
index e69fddcf6ef..816f9c087dd 100755
--- a/Reconstruction/egamma/egammaTools/python/EMPIDBuilderConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/EMPIDBuilderConfig.py
@@ -8,7 +8,7 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 EMPIDBuilder=CompFactory.EMPIDBuilder
 from ROOT import egammaPID
 import cppyy
-cppyy.loadDictionary('ElectronPhotonSelectorToolsDict')
+cppyy.load_library('libElectronPhotonSelectorToolsDict')
 
 
 def EMPIDBuilderElectronCfg(flags, name='EMPIDBuilderElectron', **kwargs):
diff --git a/Reconstruction/egamma/egammaTools/python/egammaToolsFactories.py b/Reconstruction/egamma/egammaTools/python/egammaToolsFactories.py
index 8af99a4625b..42024a9528d 100644
--- a/Reconstruction/egamma/egammaTools/python/egammaToolsFactories.py
+++ b/Reconstruction/egamma/egammaTools/python/egammaToolsFactories.py
@@ -143,7 +143,7 @@ PhotonPIDBuilder = ToolFactory(
 # ForwardElectron Selectors
 
 ## Eventually we want to get rid of cppyy here
-#cppyy.loadDictionary('ElectronPhotonSelectorToolsDict')
+#cppyy.load_library('libElectronPhotonSelectorToolsDict')
 
 LooseForwardElectronSelector = ToolFactory(
     ConfiguredAsgForwardElectronIsEMSelector,
-- 
GitLab