Commit f30e4b8d authored by Walter Lampl's avatar Walter Lampl
Browse files

Reconstruction: Bulk-change loadDictionary -> load_library (for ROOT v6.22)

parent e8278e69
......@@ -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
......
......@@ -78,7 +78,7 @@ jtm += PseudoJetGetter(
)
import cppyy
try:
cppyy.loadDictionary('xAODBaseObjectTypeDict')
cppyy.load_library('libxAODBaseObjectTypeDict')
except:
pass
from ROOT import xAODType
......
......@@ -8,7 +8,7 @@
########################################################################
import cppyy
try:
cppyy.loadDictionary('xAODBaseObjectTypeDict')
cppyy.load_library('libxAODBaseObjectTypeDict')
except Exception:
pass
from ROOT import xAODType
......
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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):
......
......@@ -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):
......
......@@ -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):
......
......@@ -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,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment