Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Kazuya Mochizuki
athena
Commits
f30e4b8d
Commit
f30e4b8d
authored
Aug 24, 2020
by
Walter Lampl
Browse files
Reconstruction: Bulk-change loadDictionary -> load_library (for ROOT v6.22)
parent
e8278e69
Changes
10
Hide whitespace changes
Inline
Side-by-side
Reconstruction/Jet/JetRec/python/JetRecStandardTools.py
View file @
f30e4b8d
...
...
@@ -313,7 +313,7 @@ jtm += WeightPFOTool("pflowweighter")
# Trigger xAODType.ObjectType dict entry loading
import
cppyy
try
:
cppyy
.
load
Diction
ary
(
'xAODBaseObjectTypeDict'
)
cppyy
.
load
_libr
ary
(
'
lib
xAODBaseObjectTypeDict'
)
except
:
pass
from
ROOT
import
xAODType
...
...
Reconstruction/Jet/JetRec/share/PFSequenceRec.py
View file @
f30e4b8d
...
...
@@ -78,7 +78,7 @@ jtm += PseudoJetGetter(
)
import
cppyy
try
:
cppyy
.
load
Diction
ary
(
'xAODBaseObjectTypeDict'
)
cppyy
.
load
_libr
ary
(
'
lib
xAODBaseObjectTypeDict'
)
except
:
pass
from
ROOT
import
xAODType
...
...
Reconstruction/Jet/JetRecConfig/python/ConstModHelpers.py
View file @
f30e4b8d
...
...
@@ -8,7 +8,7 @@
########################################################################
import
cppyy
try
:
cppyy
.
load
Diction
ary
(
'xAODBaseObjectTypeDict'
)
cppyy
.
load
_libr
ary
(
'
lib
xAODBaseObjectTypeDict'
)
except
Exception
:
pass
from
ROOT
import
xAODType
...
...
Reconstruction/Jet/JetRecTools/python/ConstitToolManager.py
View file @
f30e4b8d
...
...
@@ -32,7 +32,7 @@ class ConstituentToolManager(object):
standardModifierLists
=
dict
()
import
cppyy
try
:
cppyy
.
load
Diction
ary
(
'xAODBaseObjectTypeDict'
)
cppyy
.
load
_libr
ary
(
'
lib
xAODBaseObjectTypeDict'
)
except
:
pass
from
ROOT
import
xAODType
...
...
Reconstruction/MET/METReconstruction/python/METAssocConfig_readAOD.py
View file @
f30e4b8d
...
...
@@ -63,7 +63,7 @@ def getAssociator(config,suffix,doPFlow=False,
tool
=
None
import
cppyy
try
:
cppyy
.
load
Diction
ary
(
'METReconstructionDict'
)
try
:
cppyy
.
load
_libr
ary
(
'
lib
METReconstructionDict'
)
except
:
pass
from
AthenaCommon.AppMgr
import
ToolSvc
...
...
Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerSelectorsBuilders.py
View file @
f30e4b8d
...
...
@@ -17,7 +17,7 @@ mlog.info("Entering")
import
cppyy
try
:
cppyy
.
load
Diction
ary
(
'RingerSelectorToolsDict'
)
cppyy
.
load
_libr
ary
(
'
lib
RingerSelectorToolsDict'
)
except
RuntimeError
as
e
:
mlog
.
error
(
"Couldn't load RingerSelectorTools dictionary from cppyy."
)
raise
RuntimeError
(
e
)
...
...
Reconstruction/egamma/egammaAlgs/python/egammaForwardBuilderConfig.py
View file @
f30e4b8d
...
...
@@ -10,7 +10,7 @@ from ElectronPhotonSelectorTools.AsgForwardElectronIsEMSelectorsConfig import As
egammaForwardBuilder
=
CompFactory
.
egammaForwardBuilder
from
ROOT
import
egammaPID
cppyy
.
load
Diction
ary
(
'ElectronPhotonSelectorToolsDict'
)
cppyy
.
load
_libr
ary
(
'
lib
ElectronPhotonSelectorToolsDict'
)
def
egammaForwardBuilderCfg
(
flags
,
name
=
'egammaForwardElectron'
,
**
kwargs
):
...
...
Reconstruction/egamma/egammaTools/python/EMPIDBuilderBase.py
View file @
f30e4b8d
...
...
@@ -10,7 +10,7 @@ from egammaTools.egammaToolsConf import EMPIDBuilder
# Eventually we need to get rid of this
#import cppyy
#cppyy.load
Diction
ary('ElectronPhotonSelectorToolsDict')
#cppyy.load
_libr
ary('
lib
ElectronPhotonSelectorToolsDict')
class
EMPIDBuilderElectronBase
(
EMPIDBuilder
):
...
...
Reconstruction/egamma/egammaTools/python/EMPIDBuilderConfig.py
View file @
f30e4b8d
...
...
@@ -8,7 +8,7 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
EMPIDBuilder
=
CompFactory
.
EMPIDBuilder
from
ROOT
import
egammaPID
import
cppyy
cppyy
.
load
Diction
ary
(
'ElectronPhotonSelectorToolsDict'
)
cppyy
.
load
_libr
ary
(
'
lib
ElectronPhotonSelectorToolsDict'
)
def
EMPIDBuilderElectronCfg
(
flags
,
name
=
'EMPIDBuilderElectron'
,
**
kwargs
):
...
...
Reconstruction/egamma/egammaTools/python/egammaToolsFactories.py
View file @
f30e4b8d
...
...
@@ -143,7 +143,7 @@ PhotonPIDBuilder = ToolFactory(
# ForwardElectron Selectors
## Eventually we want to get rid of cppyy here
#cppyy.load
Diction
ary('ElectronPhotonSelectorToolsDict')
#cppyy.load
_libr
ary('
lib
ElectronPhotonSelectorToolsDict')
LooseForwardElectronSelector
=
ToolFactory
(
ConfiguredAsgForwardElectronIsEMSelector
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment