diff --git a/PhysicsAnalysis/ARAUtils/share/dumpFileMetaData.py b/PhysicsAnalysis/ARAUtils/share/dumpFileMetaData.py
index b81c28f15c714e9f03fce8ba028c84f9cec1a172..44aa04fdaa11794f2de9f4c972fa1543c1f1f47f 100755
--- a/PhysicsAnalysis/ARAUtils/share/dumpFileMetaData.py
+++ b/PhysicsAnalysis/ARAUtils/share/dumpFileMetaData.py
@@ -24,7 +24,7 @@ import ROOT
sys.argv.remove('-b')
from PyCool import coral
from time import ctime
-import PyCintex
+import cppyy
import AthenaROOTAccess.transientTree
from optparse import OptionParser
@@ -266,19 +266,19 @@ def iovPrint(self):
if __name__ == "__main__":
- t = PyCintex.makeClass("IOVPayloadContainer")
+ t = cppyy.makeClass("IOVPayloadContainer")
# Add on iterators for the different containers
t.iter = iter
#print "t type ",t
- t = PyCintex.makeClass("CondAttrListCollection")
+ t = cppyy.makeClass("CondAttrListCollection")
# Add on iterators for the different containers
t.attr_iter = attr_iter
t.iov_iter = iov_iter
t.name_iter = name_iter
- t = PyCintex.makeClass("std::set<unsigned int>")
+ t = cppyy.makeClass("std::set<unsigned int>")
t.iter = iter
#print "t type ",t
- IOVRange = PyCintex.makeClass('IOVRange')
+ IOVRange = cppyy.makeClass('IOVRange')
IOVRange.iovPrint = iovPrint
# read in and treat options
diff --git a/PhysicsAnalysis/ARAUtils/share/dumpVersionTags.py b/PhysicsAnalysis/ARAUtils/share/dumpVersionTags.py
index 905595a3e47dfe942f1c9567e8dfdea39ffa55e4..48b0c9f03cc98d028582fafd79a654511f0da4eb 100755
--- a/PhysicsAnalysis/ARAUtils/share/dumpVersionTags.py
+++ b/PhysicsAnalysis/ARAUtils/share/dumpVersionTags.py
@@ -25,7 +25,7 @@ import ROOT
sys.argv.remove('-b')
from PyCool import coral
from time import ctime
-import PyCintex
+import cppyy
import AthenaROOTAccess.transientTree
from optparse import OptionParser
@@ -129,17 +129,17 @@ def iovPrint(self):
if __name__ == "__main__":
- t = PyCintex.makeClass("IOVPayloadContainer")
+ t = cppyy.makeClass("IOVPayloadContainer")
# Add on iterators for the different containers
t.iter = iter
#print "t type ",t
- t = PyCintex.makeClass("CondAttrListCollection")
+ t = cppyy.makeClass("CondAttrListCollection")
# Add on iterators for the different containers
t.attr_iter = attr_iter
t.iov_iter = iov_iter
t.name_iter = name_iter
#print "t type ",t
- IOVRange = PyCintex.makeClass('IOVRange')
+ IOVRange = cppyy.makeClass('IOVRange')
IOVRange.iovPrint = iovPrint
# Skip branches with problems
diff --git a/PhysicsAnalysis/AnalysisCommon/AODSelect/share/FSRPhotonSequence.py b/PhysicsAnalysis/AnalysisCommon/AODSelect/share/FSRPhotonSequence.py
index bf7e9ff465cac0104850f475cc2a6720ec4c24c8..72b80fc97eaa6240dfcef74aaa67f1b5e7a274c4 100644
--- a/PhysicsAnalysis/AnalysisCommon/AODSelect/share/FSRPhotonSequence.py
+++ b/PhysicsAnalysis/AnalysisCommon/AODSelect/share/FSRPhotonSequence.py
@@ -19,8 +19,8 @@ import AthenaCommon.SystemOfUnits as Units
# IsEM selections and also the author selections
import PyUtils.RootUtils as ru
ROOT = ru.import_root()
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
+import cppyy
+cppyy.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
from ROOT import egammaParameters
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/share/AANTEventSelector_jobOptions.py b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/share/AANTEventSelector_jobOptions.py
index 68c6e7b3136281a0b7e82a5342400bdbce9b0dba..aa51b4e5968de2f22f59eec61419c441c7a1b796 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/share/AANTEventSelector_jobOptions.py
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/share/AANTEventSelector_jobOptions.py
@@ -3,9 +3,9 @@ theApp.ExtSvc += [ "AANTEventSelector/EventSelector"]
theApp.EvtSel = "EventSelector"
# set C++->Python converter for TTree
-import PyCintex
-PyCintex.loadDictionary("AnalysisToolsDict")
-aantGate = PyCintex.Namespace('').AANTTreeGate
+import cppyy
+cppyy.loadDictionary("AnalysisToolsDict")
+aantGate = cppyy.Namespace('').AANTTreeGate
def aantConvFunc():
return aantGate.getTree()
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/python/MergeContainers.py b/PhysicsAnalysis/AnalysisCommon/EventUtils/python/MergeContainers.py
index 8070013642a309ac4689ea7aeaafbeb7b042440c..f3f6571e4c4d4cd03fd662bef40187a18bbeff91 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/python/MergeContainers.py
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/python/MergeContainers.py
@@ -84,7 +84,6 @@ class MergeContainers( PyAthena.Alg ):
## Import needed modules
import PyUtils.RootUtils as ru
ROOT = ru.import_root()
- import PyCintex
## Get the StoreGate service
self.storeGateSvc = PyAthena.py_svc('StoreGateSvc')
diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/scripts/CreateNewSelectorSkeleton.py b/PhysicsAnalysis/AnalysisCommon/PATCore/scripts/CreateNewSelectorSkeleton.py
index 1af4da4983b3b1e7ca84ca6e5e663d08600c690d..5aa110044dbcb821e56715474954e846b3f04087 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATCore/scripts/CreateNewSelectorSkeleton.py
+++ b/PhysicsAnalysis/AnalysisCommon/PATCore/scripts/CreateNewSelectorSkeleton.py
@@ -1088,9 +1088,6 @@ def CreateConfiguredTPythonFile( _packageName, _selectorName ) :
_lineList.append('##\n')
_lineList.append('##=============================================================================\n')
_lineList.append('\n')
- _lineList.append('# import the needed Reflex and ROOT stuff\n')
- _lineList.append('import PyCintex\n')
- _lineList.append('PyCintex.Cintex.Enable()\n')
_lineList.append('import ROOT\n')
_lineList.append('\n')
_lineList.append('# Import the needed stuff specific to the %s\n' % _selectorName )
@@ -1150,9 +1147,6 @@ def CreateCutDefsPythonFile( _packageName, _selectorName, _doubleCutNameList ) :
_lineList.append('##\n')
_lineList.append('##=============================================================================\n')
_lineList.append('\n')
- _lineList.append('# import the needed Reflex and ROOT stuff\n')
- _lineList.append('import PyCintex\n')
- _lineList.append('PyCintex.Cintex.Enable()\n')
_lineList.append('import ROOT\n')
_lineList.append('\n')
_lineList.append('# Import a needed helper\n')
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/Makefile.RootCore b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/Makefile.RootCore
deleted file mode 100644
index 6eaa6bd2d92c38bd47e6ca8ae632aead6eaa3faf..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/Makefile.RootCore
+++ /dev/null
@@ -1,9 +0,0 @@
-PACKAGE = PileupReweighting
-PACKAGE_CXXFLAGS =
-PACKAGE_LDFLAGS =
-PACKAGE_PRELOAD = Hist
-PACKAGE_DEP = AsgTools ReweightUtils xAODEventInfo PathResolver xAODCore PATInterfaces TrigDecisionInterface AsgAnalysisInterfaces
-PACKAGE_REFLEX = 1
-PACKAGE_PEDANTIC = 1
-
-include $(ROOTCOREDIR)/Makefile-common
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/Makefile.Standalone b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/Makefile.Standalone
deleted file mode 100644
index 40483a1d441efb7b7fffdef00a7808568d511b14..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/Makefile.Standalone
+++ /dev/null
@@ -1,142 +0,0 @@
-# Author: Karsten Koeneke (karsten.koeneke@cernSPAMNOT.ch)
-# PileupReweighting root stand-alone makefile
-
-#
-# Include the architecture definitions from the ROOT sources
-#
-# Makefile.arch can be in two different locations depending on the system
-# you're compiling on. The Fink installed version of ROOT has this file
-# in a different location than the "normally installed" ROOT versions...
-#
-ARCH_LOC_1 := $(wildcard $(shell root-config --prefix)/test/Makefile.arch)
-ARCH_LOC_2 := $(wildcard $(shell root-config --prefix)/share/root/test/Makefile.arch)
-ARCH_LOC_3 := $(wildcard $(shell root-config --prefix)/share/doc/root/test/Makefile.arch)
-ARCH_LOC_4 := $(wildcard $(shell root-config --prefix)/etc/Makefile.arch)
-ifneq ($(strip $(ARCH_LOC_1)),)
- $(info Using $(ARCH_LOC_1))
- include $(ARCH_LOC_1)
-else
- ifneq ($(strip $(ARCH_LOC_2)),)
- $(info Using $(ARCH_LOC_2))
- include $(ARCH_LOC_2)
- else
- ifneq ($(strip $(ARCH_LOC_3)),)
- $(info Using $(ARCH_LOC_3))
- include $(ARCH_LOC_3)
- else
- ifneq ($(strip $(ARCH_LOC_4)),)
- $(info Using $(ARCH_LOC_4))
- include $(ARCH_LOC_4)
- else
- $(error Could not find Makefile.arch!)
- endif
- endif
- endif
-endif
-
-# -------------------------------------------------------------
-# General flags
-# -------------------------------------------------------------
-PACKAGE = PileupReweighting
-OUTPUTDIR = ../StandAlone
-
-# Get these from Makefile.arch above
-#CC = g++
-#CCFLAGS = -g -m32 -fPIC -Wall -W -Woverloaded-virtual -Wno-parentheses -Wno-unused-parameter -Wno-unused-variable
-#LDFLAGS = -g -m32 -fPIC
-
-MFLAGS = -MM -Wall -W -Woverloaded-virtual
-INCLUDES += -I$(shell root-config --incdir) -I.. -I../Root -I../PileupReweighting
-
-# Need these to avoid loading dependent libraries when ROOT starts
-#LINKLIBS = -L$(shell root-config --libdir) -lRIO -lTree -lHist -lMatrix
-LINKLIBS = $(shell root-config --libs)
-
-# for cross-compilation. ATLAS env sets CPPEXPFLAGS if it is needed
-# If you want to cross-compile standalone just set CPPEXPFLAGS, for host-slc6&target-slc5 with gcc43 it is -D__USE_XOPEN2K8
-ifneq ($(strip $(CPPEXPFLAGS)),)
-CXXFLAGS += $(CPPEXPFLAGS)
-endif
-
-#rootcint not compatible with c++11 yet, so remove temporary fix thanks to Emil...
-CXXFLAGS_NO_C11 = $(subst -std=c++11,,$(CXXFLAGS))
-
-# -------------------------------------------------------------
-# ROOT Cint
-# -------------------------------------------------------------
-CINT = pileupreweightingcint
-LDEFFILE = ../Root/LinkDef.h
-CINTFILE = ../Root/TPileupReweightingCint.cxx
-CINTFILEH = ../Root/TPileupReweighting.h
-CINTOBJ = ../Root/TPileupReweightingCint.o
-CCLISTT = TPileupReweighting.cxx
-CCLISTC = $(addprefix ../Root/,$(CCLISTT)) $(CINTFILE)
-HHLISTT = TPileupReweighting.h
-HHLISTC = $(addprefix ../PileupReweighting/,$(HHLISTT))
-OLISTC = $(patsubst %.cxx,%.o,$(CCLISTC))
-CCLIST = $(CCLISTC) $(wildcard ../src/*.cxx) $(wildcard ../Modules/*.cxx)
-HLIST = $(wildcard ../PileupReweighting/*.h)
-OLIST = $(patsubst %.cxx,%.o,$(CCLIST))
-DLIST = $(patsubst %.h,%.d,$(HLIST))
-
-# -------------------------------------------------------------
-# Libraries
-# -------------------------------------------------------------
-SHLIBFILE = $(OUTPUTDIR)/lib$(PACKAGE).so
-
-ifeq ($(PLATFORM),macosx)
-###EXTRALDFLAGS = -install_name @rpath/$(SHLIBFILE)
-EXTRALDFLAGS = -install_name $(PACKAGE)/StandAlone/lib$(PACKAGE).so
-endif
-
-# get libraries of ROOT
-define ldlinksuffixROOT
- $(addsuffix $(LDLINKSUFFIX),$(Lib)) $(shell if [ "$(findstring -Ldlink2,$(OPTIONS))" ]; then echo $(addsuffix _pkgid_$(ROOTVER),$(Lib)); fi)
-endef
-
-# -------------------------------------------------------------
-# Compilation
-# -------------------------------------------------------------
-
-default: shlib
-
-# Implicit rule making all dependency Makefiles included at the end of this makefile
-%.d: %.cxx $(HLIST)
- @echo "Making $@"
- @set -e; $(CC) $(MFLAGS) $(CXXFLAGS) $< \
- | awk '{ sub("^$(notdir $*).o:","$*.o $@:") ; print }' > $@ ;\
- [ -s $@ ] || rm -f $@
-
-# Implicit rule to compile all classes
-%.o : %.cxx
- @echo "Compiling $<"
- @$(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $*.o
-
-# Rule to make ROOTCINT output file
-$(CINTOBJ) : $(HHLISTC) $(LDEFFILE)
- @echo "Running rootcint"
- @$(ROOTSYS)/bin/rootcint -f $(CINTFILE) -c -p $(CXXFLAGS_NO_C11) $(INCLUDES) $(HHLISTC) LinkDef.h
- @echo "Compiling $(CINTFILE)"
- @$(CXX) $(CXXFLAGS) $(INCLUDES) -c $(CINTFILE) -o $@
-
-rootcint : $(HHLISTC) $(LDEFFILE)
- @echo "Running rootcint"
- $(ROOTSYS)/bin/rootcint -f $(CINTFILE) -c -p $(CXXFLAGS_NO_C11) $(INCLUDES) $(HHLISTC) LinkDef.h
-
-# Rule to combine objects into a shared library
-$(SHLIBFILE): $(OLISTC)
- @echo "Linking $(SHLIBFILE)"
- @mkdir -p $(OUTPUTDIR)
- @rm -f $(SHLIBFILE)
- @$(LD) $(CXXFLAGS) $(SOFLAGS) $(LINKLIBS) $(EXTRALDFLAGS) $(OLISTC) -o $(SHLIBFILE)
- @rm -f $(OUTPUTDIR)/PileupReweightingLib.so
- @ln -s $(SHLIBFILE) $(OUTPUTDIR)/PileupReweightingLib.so
-
--include $(DLIST)
-
-pileupreweightingcint: $(CINTOBJ)
-shlib: $(SHLIBFILE)
-
-clean:
- @rm -f ../*/*.o ../*/*.d ../*/*Cint.*
-
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/fragments/rlibmap b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/fragments/rlibmap
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/fragments/rlibmap_header b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/fragments/rlibmap_header
deleted file mode 100644
index 20351f41a9747c5e0b5cec8a2898cb60dd1604de..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/fragments/rlibmap_header
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-
-rootmapfile = ${LIBNAME}.rootmap
-ROOTMAP_DIR = ../$(tag)
-fulllibname = lib${LIBNAME}.$(shlibsuffix)
-
-${CONSTITUENT} :: ${ROOTMAP_DIR}/$(rootmapfile)
- @:
-
-${ROOTMAP_DIR}/$(rootmapfile) :: $(bin)$(fulllibname)
- @echo 'Generating rlibmap rootmap file for $(fulllibname)'
- cd ../$(tag);rlibmap -o $(rootmapfile) -l $(fulllibname) -c ../Root/LinkDef.h
-
-install :: ${CONSTITUENT}install
-${CONSTITUENT}install :: ${CONSTITUENT}
-
-uninstall :: ${CONSTITUENT}uninstall
-${CONSTITUENT}uninstall :: ${CONSTITUENT}clean
-
-${CONSTITUENT}clean ::
- @echo 'Deleting $(rootmapfile)'
- @rm -f ${ROOTMAP_DIR}/$(rootmapfile)
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/requirements b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/requirements
deleted file mode 100644
index 1e6a82f2140f1c4c4eaf8d2a90c21a22e38da505..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/requirements
+++ /dev/null
@@ -1,94 +0,0 @@
-package PileupReweighting
-
-author Will Buttinger <will@cern.ch>
-
-## For Athena policies: it has to be the first use statement
-use AtlasPolicy AtlasPolicy-*
-use AtlasROOT AtlasROOT-* External
-use GaudiInterface GaudiInterface-* External
-use AsgTools AsgTools-* Control/AthToolSupport
-
-
-use PATInterfaces PATInterfaces-* PhysicsAnalysis/AnalysisCommon
-use AsgAnalysisInterfaces AsgAnalysisInterfaces-* PhysicsAnalysis/Interfaces
-use TrigDecisionInterface TrigDecisionInterface-* Trigger/TrigEvent
-
-private
-use xAODEventInfo xAODEventInfo-* Event/xAOD
-use PathResolver PathResolver-* Tools
-use AthenaBaseComps AthenaBaseComps-* Control
-
-use POOLRootAccess POOLRootAccess-* PhysicsAnalysis
-
-end_private
-
-
-
-
-## macros
-apply_tag ROOTBasicLibs
-apply_tag ROOTMathLibs
-
-apply_tag ROOTCintexLibs
-
-# Specify the required ROOT components for cmake (transparent to CMT)
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS MathCore RIO)"
-
-## declare the directories CMT should know about
-branches python share doc src Root
-
-#compilation order will be (names as the 'Constituents'):
-#1. PileupReweightingDict (a 'library'): the reflex library (makes libPileupReweightingDict)
-#2. PileupReweightingLibDict (a 'document'): the rootcint library
-#3. PileupReweightingLib (a 'library'): the installed library (makes libPileupReweightingLib)
-#4. PileupReweighting: the component library (makes libPileupReweighting)
-
-private
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-apply_pattern lcgdict dict=PileupReweighting selectionfile=selection.xml headerfiles="../PileupReweighting/PileupReweightingDict.h"
-end_private
-
-macro extra_in "" AthAnalysisBase "-DXAOD_ANALYSIS"
-apply_pattern have_root_headers root_headers="TPileupReweighting.h ../Root/LinkDef.h" headers_lib="PileupReweightingLib" extra_includes="$(extra_in) "
-#macro_append PileupReweightingLibDict_dependencies " PileupReweightingDict " ?? not necessary any more?
-
-library PileupReweightingLib "../Root/*.cxx"
-apply_pattern named_installed_library library=PileupReweightingLib
-#next line ensures the rootcint command is executed before trying to build this lib (this may not be necessary, but at some point I seemed to think so)
-macro_append PileupReweightingLib_dependencies " PileupReweightingLibDict "
-
-library PileupReweighting *.cxx -s=components *.cxx
-macro_append PileupReweighting_dependencies " PileupReweightingLib"
-apply_pattern component_library
-
-
-## install our python modules
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_joboptions files="*.py"
-
-## install default config file
-apply_pattern declare_calib files="../share/*.root"
-
-
-
-application testPRW -group=check -check testPRW.C
-#ensure the main library is compiled first
-macro_append testPRW_dependencies " PileupReweighting "
-
-application testPRWTool -group=check -check testPRWTool.C
-#ensure the main library is compiled first
-macro_append testPRWTool_dependencies " PileupReweighting "
-
-application checkPRWConfigFile checkPRWConfigFile.C
-#ensure the main library is compiled first
-macro_append checkPRWConfigFile_dependencies " PileupReweighting "
-
-
-private
-use TestTools TestTools-* AtlasTest
-apply_pattern UnitTest_run unit_test=ut_PRWExample
-macro_append ut_PRWExample_test_dependencies " PileupReweighting PileupReweightingMergeComponentsList "
-apply_pattern UnitTest_run unit_test=ut_PRWDataWeightExample
-macro_append ut_PRWDataWeightExample_test_dependencies " PileupReweighting PileupReweightingMergeComponentsList "
-end_private
-
diff --git a/PhysicsAnalysis/AraToolExample/share/init_root.py b/PhysicsAnalysis/AraToolExample/share/init_root.py
index 9843d6430bcc0946b12f03102cffd078a10f183f..2ff9957176883dc99e829bd8d15e05a50c2f740b 100644
--- a/PhysicsAnalysis/AraToolExample/share/init_root.py
+++ b/PhysicsAnalysis/AraToolExample/share/init_root.py
@@ -1,3 +1,2 @@
import user # look for .pythonrc.py for user init
import ROOT
-import PyCintex
diff --git a/PhysicsAnalysis/AthenaROOTAccess/ispellwords b/PhysicsAnalysis/AthenaROOTAccess/ispellwords
index 8db591d7ad48148de9a74b0eba75879cee95f492..38a6e77b77c76482649f397d3ca12074727c4e1c 100644
--- a/PhysicsAnalysis/AthenaROOTAccess/ispellwords
+++ b/PhysicsAnalysis/AthenaROOTAccess/ispellwords
@@ -235,7 +235,6 @@ associatedDetectorElement
getProxy
ssnyder
snyder
-cint
PyAnalysisCore
clids
CLIDs
@@ -360,7 +359,6 @@ libJetTagInfoDict
FIXME
Fixup
MuTagTrackParticles
-cintex
libTrigSteeringEventDict
DataModelRunTests
DataProxyStorageConvert
@@ -423,7 +421,6 @@ getCLIDAliases
skipPers
libIdDictDetDescr
FP
-PyCintex
TCanvas
TileMuContainer
fMapfile
@@ -1101,5 +1098,3 @@ nolist'
Atlfast'
Trig'
s'
-libCintex'
-Cintex'
diff --git a/PhysicsAnalysis/AthenaROOTAccess/python/dumpers.py b/PhysicsAnalysis/AthenaROOTAccess/python/dumpers.py
index 77d71a3192f54dc4a4a162ef56dfa1ff421c27cc..bcc700830d76c2244edb6e466c0270a0027083c2 100644
--- a/PhysicsAnalysis/AthenaROOTAccess/python/dumpers.py
+++ b/PhysicsAnalysis/AthenaROOTAccess/python/dumpers.py
@@ -9,17 +9,9 @@
# @brief Test for AthenaROOTAccess.
#
-import cppyy
-
-try:
- # try to touch ROOT5-only attribute
- cppyy.Cintex.Debug
- _root5 = True
-except AttributeError:
- # ROOT 6
- from PyUtils.Helpers import ROOT6Setup
- ROOT6Setup()
- _root5 = False
+from PyUtils.Helpers import ROOT6Setup
+ROOT6Setup()
+_root5 = False
onlytypes = []
diff --git a/PhysicsAnalysis/AthenaROOTAccess/share/test.py b/PhysicsAnalysis/AthenaROOTAccess/share/test.py
index f542975826cdadda5ecbf4c72971f23aec4d0381..aff6d915633f4331fd4ec408fffbe70c2342d4a6 100755
--- a/PhysicsAnalysis/AthenaROOTAccess/share/test.py
+++ b/PhysicsAnalysis/AthenaROOTAccess/share/test.py
@@ -1,15 +1,9 @@
import user # look for .pythonrc.py for user init
import ROOT
-import cppyy
import AthenaROOTAccess.transientTree
-try:
- # try to touch ROOT5-only attribute
- cppyy.Cintex.Debug
-except AttributeError:
- # ROOT 6
- from PyUtils.Helpers import ROOT6Setup
- ROOT6Setup()
+from PyUtils.Helpers import ROOT6Setup
+ROOT6Setup()
# Put your AOD file here.
aodFile = 'AOD.pool.root'
diff --git a/PhysicsAnalysis/AthenaROOTAccess/test/DVCollectionProxy_test.cxx b/PhysicsAnalysis/AthenaROOTAccess/test/DVCollectionProxy_test.cxx
index 8b2f49db721ccac0e042228c42521c9f69598b7d..b2cc123f83b0411bcf75648f1395fc04d464253d 100644
--- a/PhysicsAnalysis/AthenaROOTAccess/test/DVCollectionProxy_test.cxx
+++ b/PhysicsAnalysis/AthenaROOTAccess/test/DVCollectionProxy_test.cxx
@@ -17,9 +17,6 @@
#include "AthenaROOTAccess/DVCollectionProxy.h"
#include "AthenaROOTAccess/TestTypes.h"
#include "TInterpreter.h"
-#if ROOT_VERSION_CODE < ROOT_VERSION(6,0,0)
-#include "Cintex/Cintex.h"
-#endif
#include <iostream>
#include <cassert>
@@ -66,9 +63,6 @@ void test1()
int main()
{
-#if ROOT_VERSION_CODE < ROOT_VERSION(6,0,0)
- ROOT::Cintex::Cintex::Enable();
-#endif
gInterpreter->EnableAutoLoading();
TClass::GetClass("DataVector<AthenaROOTAccess::DVCollectionProxyDummy>");
diff --git a/PhysicsAnalysis/AthenaROOTAccess/test/DataBucketVoid_test.cxx b/PhysicsAnalysis/AthenaROOTAccess/test/DataBucketVoid_test.cxx
index 025f1416b76c3fe9fd2b93ae97b34ea42b16ab8a..c8abc3e8498b8af729008870a46aafbc351df4fe 100644
--- a/PhysicsAnalysis/AthenaROOTAccess/test/DataBucketVoid_test.cxx
+++ b/PhysicsAnalysis/AthenaROOTAccess/test/DataBucketVoid_test.cxx
@@ -18,9 +18,6 @@
#include "AthenaROOTAccess/TestTypes.h"
#include "TInterpreter.h"
#include "TClass.h"
-#if ROOT_VERSION_CODE < ROOT_VERSION(6,0,0)
-#include "Cintex/Cintex.h"
-#endif
#include <iostream>
#include <cassert>
@@ -77,9 +74,6 @@ void test1()
int main()
{
-#if ROOT_VERSION_CODE < ROOT_VERSION(6,0,0)
- ROOT::Cintex::Cintex::Enable();
-#endif
gInterpreter->EnableAutoLoading();
test1();
return 0;
diff --git a/PhysicsAnalysis/AthenaROOTAccess/test/ara_brtest.py b/PhysicsAnalysis/AthenaROOTAccess/test/ara_brtest.py
index d52bbb5d88df6b863561fe4f06740baa5a2c7e7d..ed0a00f78489d22cd29f63f3c7dab9429134d5fc 100644
--- a/PhysicsAnalysis/AthenaROOTAccess/test/ara_brtest.py
+++ b/PhysicsAnalysis/AthenaROOTAccess/test/ara_brtest.py
@@ -13,7 +13,6 @@
import ROOT
-import PyCintex
import AthenaROOTAccess.transientTree
import sys
diff --git a/PhysicsAnalysis/AthenaROOTAccess/test/ara_ptest.py b/PhysicsAnalysis/AthenaROOTAccess/test/ara_ptest.py
index bf73c768530763b8b5535c1864b6379b1a155ff1..0b4f6b11857cb1e375b021ca337d7c17c6171818 100644
--- a/PhysicsAnalysis/AthenaROOTAccess/test/ara_ptest.py
+++ b/PhysicsAnalysis/AthenaROOTAccess/test/ara_ptest.py
@@ -12,10 +12,10 @@
#
import ROOT
-import PyCintex
+import cppyy
import AthenaROOTAccess.transientTree
-PyCintex.loadDictionary("libDataModelTestDataWriteDict")
+cppyy.loadDictionary("libDataModelTestDataWriteDict")
f = ROOT.TFile ('../../../Control/DataModelTest/DataModelRunTests/run/SimplePoolFile.root')
tt = AthenaROOTAccess.transientTree.makeTree (f,
diff --git a/PhysicsAnalysis/AthenaROOTAccess/test/ara_scantest.py b/PhysicsAnalysis/AthenaROOTAccess/test/ara_scantest.py
index 1d69ffa5297583cba58dde4b7c08e11ea60976c4..44515d629105e784c7f8b4164b6da25577f7bdc0 100644
--- a/PhysicsAnalysis/AthenaROOTAccess/test/ara_scantest.py
+++ b/PhysicsAnalysis/AthenaROOTAccess/test/ara_scantest.py
@@ -12,7 +12,6 @@
#
import ROOT
-import PyCintex
import AthenaROOTAccess.transientTree
import sys
diff --git a/PhysicsAnalysis/D2PDMaker/python/AddContainers.py b/PhysicsAnalysis/D2PDMaker/python/AddContainers.py
index bcb06a6a9418f79f0899b6f66ef0063b5050c8f6..fa3f15e97be53c7877384c8ef8665dc761bd04ef 100644
--- a/PhysicsAnalysis/D2PDMaker/python/AddContainers.py
+++ b/PhysicsAnalysis/D2PDMaker/python/AddContainers.py
@@ -74,7 +74,6 @@ class AddContainers( PyAthena.Alg ):
## Import needed modules
import PyUtils.RootUtils as ru
ROOT = ru.import_root()
- import PyCintex
## Get the StoreGate service
self.storeGateSvc = PyAthena.py_svc('StoreGateSvc')
diff --git a/PhysicsAnalysis/D2PDMaker/python/SUSYFilters.py b/PhysicsAnalysis/D2PDMaker/python/SUSYFilters.py
index c370ec4bf0cd5e9424cf3cfa0a33386198399a7f..ae250ee802176f7fb859d4caa1a260962f1ae294 100644
--- a/PhysicsAnalysis/D2PDMaker/python/SUSYFilters.py
+++ b/PhysicsAnalysis/D2PDMaker/python/SUSYFilters.py
@@ -66,8 +66,8 @@ MuidDiMuonSelectorSUSY = D2PDMuonSelector( "MuidDiMuonSelectorSUSY",
# Electron filters
import PyUtils.RootUtils as ru
ROOT = ru.import_root()
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
+import cppyy
+cppyy.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
from ROOT import egammaParameters
diff --git a/PhysicsAnalysis/D2PDMaker/share/D2PD_ExampleSimpleHgamgam.py b/PhysicsAnalysis/D2PDMaker/share/D2PD_ExampleSimpleHgamgam.py
index 91f3479fefc13ad1213a97f7d33a3f5aa82a03a1..36a4bf8631ce3840327d6c375f85c44354f57d86 100644
--- a/PhysicsAnalysis/D2PDMaker/share/D2PD_ExampleSimpleHgamgam.py
+++ b/PhysicsAnalysis/D2PDMaker/share/D2PD_ExampleSimpleHgamgam.py
@@ -24,8 +24,8 @@ from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
# IsEM selections and also the author selections
import PyUtils.RootUtils as ru
ROOT = ru.import_root()
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
+import cppyy
+cppyy.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
from ROOT import egammaParameters
diff --git a/PhysicsAnalysis/D2PDMaker/share/D2PD_ExampleSimpleZee.py b/PhysicsAnalysis/D2PDMaker/share/D2PD_ExampleSimpleZee.py
index 218d3bc712ae2ed261237f3bc903a180da76fc28..1599cf98c60ca0892932f5f08bb799dd80628fa9 100644
--- a/PhysicsAnalysis/D2PDMaker/share/D2PD_ExampleSimpleZee.py
+++ b/PhysicsAnalysis/D2PDMaker/share/D2PD_ExampleSimpleZee.py
@@ -25,8 +25,8 @@ from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
# IsEM selections and also the author selections
import PyUtils.RootUtils as ru
ROOT = ru.import_root()
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
+import cppyy
+cppyy.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
from ROOT import egammaParameters
diff --git a/PhysicsAnalysis/D2PDMaker/share/D2PD_Test.py b/PhysicsAnalysis/D2PDMaker/share/D2PD_Test.py
index 647bd93c6a4cd8d749992088dd96497f5837233a..7ccaf307f5bce0307569ea65302a65360312c624 100644
--- a/PhysicsAnalysis/D2PDMaker/share/D2PD_Test.py
+++ b/PhysicsAnalysis/D2PDMaker/share/D2PD_Test.py
@@ -40,8 +40,8 @@ from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
# IsEM selections and also the author selections
import PyUtils.RootUtils as ru
ROOT = ru.import_root()
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
+import cppyy
+cppyy.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
from ROOT import egammaParameters
@@ -49,7 +49,7 @@ from ROOT import egammaParameters
# This is needed to always be up-to-date with the tau
# ID selections and also the author selections
# This only works starting with tauEvent-00-05-21!!!
-#PyCintex.loadDictionary('tauEventEnumsDict')
+#cppyy.loadDictionary('tauEventEnumsDict')
#from ROOT import TauJetParameters
diff --git a/PhysicsAnalysis/D2PDMaker/share/D2PD_WenuStream.py b/PhysicsAnalysis/D2PDMaker/share/D2PD_WenuStream.py
index 0ae132801cfc80f9d1616dd1a5534a7028e88a76..743e6f30f5c9a13de31cfe247cbc8db7d372b0d8 100644
--- a/PhysicsAnalysis/D2PDMaker/share/D2PD_WenuStream.py
+++ b/PhysicsAnalysis/D2PDMaker/share/D2PD_WenuStream.py
@@ -37,8 +37,8 @@ from PrimaryDPDMaker.LogicalFilterCombiner import LogicalFilterCombiner
# IsEM selections and also the author selections
import PyUtils.RootUtils as ru
ROOT = ru.import_root()
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
+import cppyy
+cppyy.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
from ROOT import egammaParameters
diff --git a/PhysicsAnalysis/D2PDMaker/share/D2PD_ZeeStream.py b/PhysicsAnalysis/D2PDMaker/share/D2PD_ZeeStream.py
index 619573b799d28086a9182a9361393faa5cfe67bf..d3b15bf12ce5230ecf09814047bab25539066730 100644
--- a/PhysicsAnalysis/D2PDMaker/share/D2PD_ZeeStream.py
+++ b/PhysicsAnalysis/D2PDMaker/share/D2PD_ZeeStream.py
@@ -34,8 +34,8 @@ from PrimaryDPDMaker.LogicalFilterCombiner import LogicalFilterCombiner
# IsEM selections and also the author selections
import PyUtils.RootUtils as ru
ROOT = ru.import_root()
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
+import cppyy
+cppyy.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
from ROOT import egammaParameters
diff --git a/PhysicsAnalysis/D2PDMaker/share/DAODM_HighMDiJet.py b/PhysicsAnalysis/D2PDMaker/share/DAODM_HighMDiJet.py
index 411429c331dd87e61073848d69702c4e58dc6b4e..2bc45201cc7473d00e91dea9871021af1476392a 100644
--- a/PhysicsAnalysis/D2PDMaker/share/DAODM_HighMDiJet.py
+++ b/PhysicsAnalysis/D2PDMaker/share/DAODM_HighMDiJet.py
@@ -19,8 +19,8 @@ from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
# IsEM selections and also the author selections
import PyUtils.RootUtils as ru
ROOT = ru.import_root()
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
+import cppyy
+cppyy.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
from ROOT import egammaParameters
diff --git a/PhysicsAnalysis/D2PDMaker/share/DAOD_ElLoose18.py b/PhysicsAnalysis/D2PDMaker/share/DAOD_ElLoose18.py
index 07b967ce38b2d550a2c22653228740dc178ec21c..5c71c431d671c1481096425f2b31e5376ca39a38 100644
--- a/PhysicsAnalysis/D2PDMaker/share/DAOD_ElLoose18.py
+++ b/PhysicsAnalysis/D2PDMaker/share/DAOD_ElLoose18.py
@@ -19,8 +19,8 @@ from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
# IsEM selections and also the author selections
import PyUtils.RootUtils as ru
ROOT = ru.import_root()
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
+import cppyy
+cppyy.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
from ROOT import egammaParameters
diff --git a/PhysicsAnalysis/D2PDMaker/share/DAOD_H4lBremRec.py b/PhysicsAnalysis/D2PDMaker/share/DAOD_H4lBremRec.py
index b23d67d5fe29ae762c02a4a4f3a9eab0b37c881f..699529d8269209258fd7aeaaa7a7bab5f735cc76 100644
--- a/PhysicsAnalysis/D2PDMaker/share/DAOD_H4lBremRec.py
+++ b/PhysicsAnalysis/D2PDMaker/share/DAOD_H4lBremRec.py
@@ -37,8 +37,8 @@ from D2PDMaker.D2PDMakerConf import D2PDParticleCombiner
# IsEM selections and also the author selections
#import PyUtils.RootUtils as ru
#ROOT = ru.import_root()
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
+import cppyy
+cppyy.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
from ROOT import egammaParameters
diff --git a/PhysicsAnalysis/D2PDMaker/share/DAOD_HighMDiJet.py b/PhysicsAnalysis/D2PDMaker/share/DAOD_HighMDiJet.py
index 9acacf2e6fb66ec93686650612b20a9066bfc041..0f1e9defaa8c352c9db08e98db87436799d11f39 100644
--- a/PhysicsAnalysis/D2PDMaker/share/DAOD_HighMDiJet.py
+++ b/PhysicsAnalysis/D2PDMaker/share/DAOD_HighMDiJet.py
@@ -19,8 +19,8 @@ from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
# IsEM selections and also the author selections
import PyUtils.RootUtils as ru
ROOT = ru.import_root()
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
+import cppyy
+cppyy.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
from ROOT import egammaParameters
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/scripts/D3PDSizeSummary.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/scripts/D3PDSizeSummary.py
index f2dea09dd058f13b2c8d3cd45d1c9d1b5704bf62..e185adb93f25faec00758d9f2206d06a849cda6b 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/scripts/D3PDSizeSummary.py
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/scripts/D3PDSizeSummary.py
@@ -4,7 +4,6 @@
import ROOT
-import PyCintex
import os
import sys
import re
@@ -306,4 +305,4 @@ class Filestats:
ff = Filestats (args[0])
ff.print_stats_text()
if options.plots:
- ff.draw_pie()
\ No newline at end of file
+ ff.draw_pie()
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/CMakeLists.txt
index bf1daf9f76717b21fd73ed4c9ac943156113002b..23615453cece9ff171ee695b7a0eb2b8a0b9e2b4 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/CMakeLists.txt
@@ -17,8 +17,6 @@ atlas_depends_on_subdirs( PRIVATE
find_package( Boost COMPONENTS filesystem thread system )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-# tag ROOTCintexLibs was not recognized in automatic conversion in cmt2cmake
-
# Component(s) in the package:
atlas_add_library( D3PDMakerReaderLib
src/*.cxx
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/cmt/requirements b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/cmt/requirements
deleted file mode 100644
index 7cc0c81cbb81e730684281e72de3112da48b07bf..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/cmt/requirements
+++ /dev/null
@@ -1,52 +0,0 @@
-package D3PDMakerReader
-author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
-
-# Base package(s):
-use AtlasPolicy AtlasPolicy-*
-
-private
-use GaudiInterface GaudiInterface-* External
-use AtlasROOT AtlasROOT-* External
-use AtlasBoost AtlasBoost-* External
-use AthenaBaseComps AthenaBaseComps-* Control
-use AthenaKernel AthenaKernel-* Control
-use D3PDMakerInterfaces D3PDMakerInterfaces-* PhysicsAnalysis/D3PDMaker
-use D3PDMakerUtils D3PDMakerUtils-* PhysicsAnalysis/D3PDMaker
-end_private
-
-# Change to a dual_use_library since the lcgdict pattern can only link against an installed_library
-# for cmake. This pollutes the linkopts a bit for clients, but is otherwise harmless.
-apply_pattern dual_use_library files=*.cxx
-
-apply_tag ROOTCintexLibs
-
-apply_pattern declare_python_modules files=*.py
-apply_pattern declare_scripts files="d3pdReaderLibraryMaker.py \
- d3pdReaderRootCoreMaker.py \
- d3pdReaderSFrameMaker.py"
-
-# Create a stand-alone code generator application:
-application d3pdReaderMaker "apps/d3pdReaderMaker.cxx \
- CodeGenerator_v2.cxx \
- RootObjectMetadata.cxx \
- isPrimitive.cxx"
-macro_append d3pdReaderMaker_dependencies "D3PDMakerReader"
-macro_append d3pdReaderMakerlinkopts "$(Boost_linkopts_program_options) \
- $(Boost_linkopts_regex)"
-
-application d3pdReadersFromFile "apps/d3pdReadersFromFile.cxx \
- CodeGenerator_v2.cxx \
- RootObjectMetadata.cxx \
- isPrimitive.cxx"
-macro_append d3pdReadersFromFile_dependencies "D3PDMakerReader"
-macro_append d3pdReadersFromFilelinkopts "$(Boost_linkopts_program_options)"
-
-private
-
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-apply_pattern lcgdict dict=D3PDMakerReader \
- selectionfile="selection.xml" \
- headerfiles="-s=${D3PDMakerReader_root}/src D3PDMakerReaderDict.h"
-
-end_private
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/apps/d3pdReaderMaker.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/apps/d3pdReaderMaker.cxx
index 91b1e85bde428607f09b3bfc525326a57066189a..11b53b55fa20cce6f633709b7e3a691670528393 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/apps/d3pdReaderMaker.cxx
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/apps/d3pdReaderMaker.cxx
@@ -24,13 +24,6 @@
#include <TLeaf.h>
#include <TError.h>
-#if ROOT_VERSION_CODE < ROOT_VERSION(6,0,0)
-# include <Cintex/Cintex.h>
-# define CINTEX_ENABLE ROOT::Cintex::Cintex::Enable();
-#else
-# define CINTEX_ENABLE
-#endif
-
// Gaudi/Athena include(s):
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/Bootstrap.h"
@@ -95,9 +88,6 @@ StatusCode extractVariables( const std::string& file_name, const std::string& tr
namespace po = boost::program_options;
int main( int argc, char* argv[] ) {
-
- // As a first thing, let's enable Cintex:
- CINTEX_ENABLE
// Let's disable the ROOT warnings:
gErrorIgnoreLevel = kError;
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/apps/d3pdReadersFromFile.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/apps/d3pdReadersFromFile.cxx
index 981ee3a20519598a168a58dbe3e8acd01ebe04fb..9ce55000b8ebd889d1661d43db3d710286bae68a 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/apps/d3pdReadersFromFile.cxx
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/apps/d3pdReadersFromFile.cxx
@@ -23,12 +23,6 @@
#include <TString.h>
#include <TObjString.h>
#include <TError.h>
-#if ROOT_VERSION_CODE < ROOT_VERSION(6,0,0)
-# include <Cintex/Cintex.h>
-# define CINTEX_ENABLE ROOT::Cintex::Cintex::Enable();
-#else
-# define CINTEX_ENABLE
-#endif
// Gaudi/Athena include(s):
#include "GaudiKernel/StatusCode.h"
@@ -97,9 +91,6 @@ mergeObjects( const std::set< D3PD::ObjectMetadata >& objects );
namespace po = boost::program_options;
int main( int argc, char* argv[] ) {
-
- // As a first thing, let's enable Cintex:
- CINTEX_ENABLE
// Let's disable the ROOT warnings:
gErrorIgnoreLevel = kError;
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagElectronInJetD3PDObject.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagElectronInJetD3PDObject.py
index a0c303563d9d4b3facc839595f428a93114e9ed9..694a40e118fbff6f001022e7b08df768e0b5869e 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagElectronInJetD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagElectronInJetD3PDObject.py
@@ -12,8 +12,8 @@ import TrackD3PDMaker
import egammaD3PDMaker
import EventCommonD3PDMaker
##from egammaD3PDMaker.isem_version import isem_version ## use 16
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
+import cppyy
+cppyy.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
import D3PDMakerCoreComps
diff --git a/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/share/ElectronSelector.py b/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/share/ElectronSelector.py
index 549eeaedf77ee114114510022efaf29ea7fd2ea8..22344662125c106bc0478233f89bce0ebf5a7e01 100644
--- a/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/share/ElectronSelector.py
+++ b/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/share/ElectronSelector.py
@@ -1,9 +1,5 @@
include.block( "PhysicsD3PDMaker/ElectronSelector.py" )
-import PyUtils.RootUtils as ru
-ROOT = ru.import_root()
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
from ROOT import egammaParameters
diff --git a/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/share/LowPtElectronPairSelector.py b/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/share/LowPtElectronPairSelector.py
index dd46d68958ff336fb34efff0de3f5b622abea058..eb547e382ddb8bf305a4d021dcb024466f99bab7 100644
--- a/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/share/LowPtElectronPairSelector.py
+++ b/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/share/LowPtElectronPairSelector.py
@@ -1,9 +1,5 @@
include.block( "PhysicsD3PDMaker/LowPtElectronPairSelector.py" )
-import PyUtils.RootUtils as ru
-ROOT = ru.import_root()
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
from ROOT import egammaParameters
diff --git a/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/share/SMTRILEP_ElectronSelector.py b/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/share/SMTRILEP_ElectronSelector.py
index 7504a442d2d855d964c46366cd94ad178e2e7942..bbaa2db1eb3fb8ea5ced622e1fd35808d7d88178 100644
--- a/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/share/SMTRILEP_ElectronSelector.py
+++ b/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/share/SMTRILEP_ElectronSelector.py
@@ -1,9 +1,5 @@
include.block( "SMEWTrilepSkim/SMTRILEP_ElectronSelector.py" )
-import PyUtils.RootUtils as ru
-ROOT = ru.import_root()
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
from ROOT import egammaParameters
diff --git a/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/python/QcdElectronD3PDObject.py b/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/python/QcdElectronD3PDObject.py
index 65afa9148075e335890adbbfc831bbdcd12379d5..befa6ca4b3260127dd96a11cea4e94586a636f34 100644
--- a/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/python/QcdElectronD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/python/QcdElectronD3PDObject.py
@@ -20,8 +20,6 @@ import TrackD3PDMaker
import CaloD3PDMaker
import D3PDMakerCoreComps
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
from ROOT import egammaParameters
from ROOT import egammaPID
diff --git a/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/python/QcdPhotonD3PDObject.py b/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/python/QcdPhotonD3PDObject.py
index a2ec11bc2ea163f2d7cc5631faa15a56a9787ae3..2075e3998130676e5d527b2d16c3c5d8e62aa0a3 100644
--- a/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/python/QcdPhotonD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/python/QcdPhotonD3PDObject.py
@@ -19,8 +19,6 @@ import EventCommonD3PDMaker
import CaloD3PDMaker
import D3PDMakerCoreComps
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
from ROOT import egammaParameters
from ROOT import egammaPID
diff --git a/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/python/QcdPhotonUserDataConfig.py b/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/python/QcdPhotonUserDataConfig.py
index 67df67c59a81228154bcb6cf73256367a25f40ce..55a65c12bec72b5f700588dda82e549fb4272d65 100644
--- a/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/python/QcdPhotonUserDataConfig.py
+++ b/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/python/QcdPhotonUserDataConfig.py
@@ -9,8 +9,8 @@ import D3PDMakerCoreComps
from AthenaCommon.AlgSequence import AlgSequence
-import PyCintex
-PyCintex.loadDictionary('egammaInterfacesEnumsDict')
+import cppyy
+cppyy.loadDictionary('egammaInterfacesEnumsDict')
from ROOT import egammaIsolationType
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/python/Atlfast1ElectronD3PDObject.py b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/python/Atlfast1ElectronD3PDObject.py
index 0a4ae720a3a83ec6a77a4d0576c9604bc1715a4a..8cc3725ea955a16eb12afb07730330b9811037a0 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/python/Atlfast1ElectronD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/python/Atlfast1ElectronD3PDObject.py
@@ -11,8 +11,6 @@ import egammaD3PDMaker
import EventCommonD3PDMaker
import D3PDMakerCoreComps
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
from ROOT import egammaParameters
from ROOT import egammaPID
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/python/Atlfast1PhotonD3PDObject.py b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/python/Atlfast1PhotonD3PDObject.py
index 2e418a1a898e51686933bcbc525712d91147be36..61a009a401408fe779cbd711b1dbd2f1c491a819 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/python/Atlfast1PhotonD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/python/Atlfast1PhotonD3PDObject.py
@@ -11,8 +11,6 @@ import egammaD3PDMaker
import EventCommonD3PDMaker
import D3PDMakerCoreComps
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
from ROOT import egammaParameters
from ROOT import egammaPID
diff --git a/PhysicsAnalysis/DPDUtils/python/DpdLib.py b/PhysicsAnalysis/DPDUtils/python/DpdLib.py
index 1be25f9bfb875be859bee1fe4e53e38a4ee026b8..6fcb521dd157359ea931a63f77313f2b496e1bb3 100644
--- a/PhysicsAnalysis/DPDUtils/python/DpdLib.py
+++ b/PhysicsAnalysis/DPDUtils/python/DpdLib.py
@@ -436,8 +436,8 @@ class ElectronFilter(PyAthena.Alg):
# get the C++ enum...
# we have to explicitly load the dictionary holding the enum b/c
# of a gccxml/reflex bug
- import PyCintex
- egdict = PyCintex.loadDict("egammaEventDict")
+ import cppyy
+ egdict = cppyy.loadDict("egammaEventDict")
self.elePidCut = getattr(PyAthena.egammaPID, self.elePidCut)
# get some C++ utils
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py
index 7e5c90e2b243f96516b3d7e297d9c6b5baaa94dc..31b8cb164dbc629e5191cbefded381bb31d05471 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/EGammaCommon.py
@@ -55,8 +55,6 @@ if isFullSim:
# ELECTRON SELECTION (loose, medium and tight LLH)
# see http://acode-browser.usatlas.bnl.gov/lxr/source/atlas/Reconstruction/egamma/egammaTools/python/EMPIDBuilderBase.py on how to configure the selectors
#====================================================================
-import PyCintex
-PyCintex.loadDictionary('ElectronPhotonSelectorToolsDict')
from ROOT import LikeEnum
from ElectronPhotonSelectorTools.ConfiguredAsgElectronLikelihoodTools import ConfiguredAsgElectronLikelihoodTool
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/TrackIsolationDecorator.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/TrackIsolationDecorator.py
index fe2d587a798e6d21c1e611047b6340ca4b14b3e7..77fa4230cbf4325399155595c022afab058316cb 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/TrackIsolationDecorator.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/TrackIsolationDecorator.py
@@ -40,9 +40,9 @@ print CaloIsoTool
ToolSvc += CaloIsoTool
-import ROOT, PyCintex
-PyCintex.loadDictionary('xAODCoreRflxDict')
-PyCintex.loadDictionary('xAODPrimitivesDict')
+import ROOT, cppyy
+cppyy.loadDictionary('xAODCoreRflxDict')
+cppyy.loadDictionary('xAODPrimitivesDict')
isoPar = ROOT.xAOD.Iso
deco_ptcones = [isoPar.ptcone40, isoPar.ptcone30]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY4.py
index 9abfd1bfe0c004288f7890f2b27713c8709922b7..e6a9eaa18f5a9c16d2a54645933152e7ad9bedb6 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY4.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY4.py
@@ -201,9 +201,9 @@ TrackIsoTool500.TrackSelectionTool.CutLevel= "Loose"
ToolSvc += TrackIsoTool500
from DerivationFrameworkSUSY.DerivationFrameworkSUSYConf import DerivationFramework__trackIsolationDecorator
-import ROOT, PyCintex
-PyCintex.loadDictionary('xAODCoreRflxDict')
-PyCintex.loadDictionary('xAODPrimitivesDict')
+import ROOT, cppyy
+cppyy.loadDictionary('xAODCoreRflxDict')
+cppyy.loadDictionary('xAODPrimitivesDict')
isoPar = ROOT.xAOD.Iso
Pt1000IsoTrackDecorator = DerivationFramework__trackIsolationDecorator(name = "Pt1000IsoTrackDecorator",
TrackIsolationTool = TrackIsoTool,
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/python/TauCommon.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/python/TauCommon.py
index 0c68557df1ff5a74be13a46735885d3ffa18c8fb..c9deea403d0c13eeb44ea74889fc2847d0f2c8ec 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/python/TauCommon.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/python/TauCommon.py
@@ -10,8 +10,6 @@ from DerivationFrameworkCore.DerivationFrameworkMaster import *
#====================================================================
# MAKE TAU ENUMS AVAILABLE
#====================================================================
-#import PyCintex
-#PyCintex.loadDictionary('xAODTauDict')
#from ROOT import xAOD__TauJetParameters__IsTauFlag
#====================================================================
diff --git a/PhysicsAnalysis/HiggsPhys/HSG1/HSG1DPDUtils/python/HSG1Filter.py b/PhysicsAnalysis/HiggsPhys/HSG1/HSG1DPDUtils/python/HSG1Filter.py
index 730bdbf661430c3649f3042173eca71744530475..78fc1aec5f784ec31c2b5ab0ef6f2263ad3d1b42 100755
--- a/PhysicsAnalysis/HiggsPhys/HSG1/HSG1DPDUtils/python/HSG1Filter.py
+++ b/PhysicsAnalysis/HiggsPhys/HSG1/HSG1DPDUtils/python/HSG1Filter.py
@@ -21,10 +21,6 @@ import AthenaCommon.SystemOfUnits as Units
# ---- Load the egammaPID and egammaParameters information
# This is needed to always be up-to-date with the egamma
# IsEM selections and also the author selections
-import PyUtils.RootUtils as ru
-ROOT = ru.import_root()
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
from ROOT import egammaParameters
diff --git a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/python/H4lDPDMaker.py b/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/python/H4lDPDMaker.py
index c8a42e9757e5ce8e6491a43206c84a0b4ee63f55..4a9a049e3a620f627ed47482209ed3719eb6f268 100644
--- a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/python/H4lDPDMaker.py
+++ b/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/python/H4lDPDMaker.py
@@ -9,17 +9,17 @@ import AthenaCommon.SystemOfUnits as Units
from AthenaPython.PyAthena import StatusCode
from AthenaPython.PyAthena import EventInfo
from copy import copy
-import PyCintex
+import cppyy
import ROOT
import math
# Get enum for tracking enum
-PyCintex.loadDict("libTrkTrackSummaryDict")
-PyCintex.loadDict('libTrkEventPrimitivesDict')
-PyCintex.loadDictionary('egammaEnumsDict')
+cppyy.loadDict("libTrkTrackSummaryDict")
+cppyy.loadDict('libTrkEventPrimitivesDict')
+cppyy.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
from ROOT import egammaParameters
from ROOT import TLorentzVector
-PyCintex.loadDict('libegammaAnalysisUtilsDict')
+cppyy.loadDict('libegammaAnalysisUtilsDict')
import os
import os.path
diff --git a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/python/HSG2_2L2QDPDMaker.py b/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/python/HSG2_2L2QDPDMaker.py
index 41eee084b46e45b674a55aa6131957a97cebee3c..b65f48e989fde75b5ca9cac26fc6ff35a2482890 100644
--- a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/python/HSG2_2L2QDPDMaker.py
+++ b/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/python/HSG2_2L2QDPDMaker.py
@@ -3,14 +3,14 @@
import AthenaPython.PyAthena as PyAthena
import AthenaCommon.SystemOfUnits as Units
from AthenaPython.PyAthena import StatusCode
-import PyCintex
+import cppyy
import ROOT
import math
-PyCintex.loadDictionary('egammaEnumsDict') # Needed for egammaParameters
+cppyy.loadDictionary('egammaEnumsDict') # Needed for egammaParameters
from ROOT import egammaParameters
from ROOT import egammaPID
-PyCintex.loadDict("libTrkTrackSummaryDict")
-PyCintex.loadDict('libegammaAnalysisUtilsDict')
+cppyy.loadDict("libTrkTrackSummaryDict")
+cppyy.loadDict('libegammaAnalysisUtilsDict')
from ROOT import TLorentzVector
class HSG2_2L2QDPDFilter(PyAthena.AthFilterAlgorithm):
diff --git a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/share/HSG2TwoLeptonsSkim.py b/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/share/HSG2TwoLeptonsSkim.py
index 07f360925565e5b2a30aea5207def75c2465fe23..a682ec943a77e2b70d985e60e1ae9c345aae78ce 100644
--- a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/share/HSG2TwoLeptonsSkim.py
+++ b/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/share/HSG2TwoLeptonsSkim.py
@@ -52,8 +52,6 @@ from PrimaryDPDMaker.ElectronFilter import ElectronFilter
# ---- Load the egammaPID and egammaParameters information
# This is needed to always be up-to-date with the egamma
# IsEM selections and also the author selections
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
from ROOT import egammaParameters
diff --git a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/share/hsg2_d3pdmaker_2L2Q.prodJobOFragment.py b/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/share/hsg2_d3pdmaker_2L2Q.prodJobOFragment.py
index 3c59a4039ad18b427090b3ec776491d58fd88309..33921dd7d4f84b94c06eb05784b4e180ea0642df 100644
--- a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/share/hsg2_d3pdmaker_2L2Q.prodJobOFragment.py
+++ b/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/share/hsg2_d3pdmaker_2L2Q.prodJobOFragment.py
@@ -31,8 +31,8 @@ msg = logging.getLogger( "NTUP_2L2QHSG2_Filter" )
# AthElectronLikelihoodTool with PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/data/ElectronLikelihoodPdfs.root
# and LikeEnum::Loose by following https://twiki.cern.ch/twiki/bin/viewauth/AtlasProtected/HiggsZZllllSummer2013#More_information
import ROOT
-import PyCintex
-PyCintex.loadDict('libElectronPhotonSelectorToolsDict')
+import cppyy
+cppyy.loadDict('libElectronPhotonSelectorToolsDict')
from AthenaCommon.AppMgr import ToolSvc
if not hasattr(ToolSvc, "AthElectronLikelihoodTool_VeryLoose"):
from ElectronPhotonSelectorTools.ElectronPhotonSelectorToolsConf import AthElectronLikelihoodTool
diff --git a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/share/hsg2_daodmaker_4lepton.prodJobOFragment.py b/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/share/hsg2_daodmaker_4lepton.prodJobOFragment.py
index 393f16b16f40da6d6a5b33e6ecca5b60c642d359..5b75a27c80437c368996a75f16f1718750e7d112 100644
--- a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/share/hsg2_daodmaker_4lepton.prodJobOFragment.py
+++ b/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/share/hsg2_daodmaker_4lepton.prodJobOFragment.py
@@ -23,8 +23,8 @@ msg = logging.getLogger( "HSG2DAODFilters" )
# AthElectronLikelihoodTool with PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/data/ElectronLikelihoodPdfs.root
# and LikeEnum::Loose by following https://twiki.cern.ch/twiki/bin/viewauth/AtlasProtected/HiggsZZllllSummer2013#More_information
import ROOT
-import PyCintex
-PyCintex.loadDict('libElectronPhotonSelectorToolsDict')
+import cppyy
+cppyy.loadDict('libElectronPhotonSelectorToolsDict')
from AthenaCommon.AppMgr import ToolSvc
if not hasattr(ToolSvc, "AthElectronLikelihoodTool_Loose"):
from ElectronPhotonSelectorTools.ElectronPhotonSelectorToolsConf import AthElectronLikelihoodTool
diff --git a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/python/HSG5Selectors.py b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/python/HSG5Selectors.py
index e2510b25436dbb04f27e0ad4ff4825ef5940a774..e4e4ef8ccb28e84582965a31710d46bdba5d06fc 100644
--- a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/python/HSG5Selectors.py
+++ b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/python/HSG5Selectors.py
@@ -3,8 +3,6 @@
import AthenaCommon.SystemOfUnits as Units
from D2PDMaker.D2PDMakerConf import D2PDMuonSelector, D2PDElectronSelector
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
class MuonSelector( object ) :
diff --git a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/WHlnubb_boostedFilter.py b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/WHlnubb_boostedFilter.py
index 9d01b632fd9161add41a8d53a0130f5324c54e76..c8337a47ca790fe82e3e00c722a3b7e7d0ee67bc 100644
--- a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/WHlnubb_boostedFilter.py
+++ b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/WHlnubb_boostedFilter.py
@@ -2,8 +2,6 @@
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
from AthenaCommon.AlgSequence import AlgSequence,AthSequencer
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
sequencer = AthSequencer("HSG5WH_Sequencer",
diff --git a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/WHlnubb_unboostedFilter.py b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/WHlnubb_unboostedFilter.py
index fe743e1bfd9a8194dce1c424059cacfb7d2d7c99..69dbacd67322e40835a07d1666686ffe126c3050 100644
--- a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/WHlnubb_unboostedFilter.py
+++ b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/WHlnubb_unboostedFilter.py
@@ -7,8 +7,6 @@ Created on 28 Feb 2012
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
from AthenaCommon.AlgSequence import AlgSequence,AthSequencer
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
sequencer = AthSequencer("HSG5WHU_Sequencer",
diff --git a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/WHlnubb_unboostedFilterQCDbkg.py b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/WHlnubb_unboostedFilterQCDbkg.py
index 61d078797ac74bc89caecb625b8b9ab27c6f5a8b..b9a744a74b861ca4855bd240796c4e044de96a89 100644
--- a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/WHlnubb_unboostedFilterQCDbkg.py
+++ b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/WHlnubb_unboostedFilterQCDbkg.py
@@ -6,9 +6,6 @@ Created on 28 Feb 2012
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
from AthenaCommon.AlgSequence import AlgSequence,AthSequencer
-
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
sequencer = AthSequencer("HSG5WHQ_Sequencer",
diff --git a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/ZHllbb_boostedFilter.py b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/ZHllbb_boostedFilter.py
index 2ab2ff5695edc333e4efdb4c0a037ce635d44c90..31c83a84faec929e2f1e5a7ebb004e5e4f77216c 100644
--- a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/ZHllbb_boostedFilter.py
+++ b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/ZHllbb_boostedFilter.py
@@ -1,9 +1,6 @@
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
from AthenaCommon.AlgSequence import AlgSequence,AthSequencer
-
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
sequencer = AthSequencer("HSG5ZHLL_Sequencer",
diff --git a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/ZHllbb_unboostedFilter.py b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/ZHllbb_unboostedFilter.py
index 8d780089b0d49771ce8b70bee6169957397106c9..d9e7e13f239beda3025b73c29f2f6ef0a387ca80 100644
--- a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/ZHllbb_unboostedFilter.py
+++ b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/ZHllbb_unboostedFilter.py
@@ -1,9 +1,6 @@
from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
from AthenaCommon.AlgSequence import AlgSequence,AthSequencer
-
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
from ROOT import egammaPID
sequencer = AthSequencer("HSG5ZHLLunb_Sequencer",
@@ -15,9 +12,6 @@ leptonFilter=HSG5__LeptonFilter("HSG5ZHLLunb_DileptonFilter",
MuonFilterNameAndTypeVec=["D2PDMuonSelector/HSG5ZHLLunb_MuidMuonSelector",
"D2PDMuonSelector/HSG5ZHLLunb_StacoMuonSelector"])
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
-from ROOT import egammaPID
# create electron and muon selectors
from D2PDMaker.D2PDMakerConf import D2PDElectronSelector
diff --git a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/python/JetCleaningCutDefs.py b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/python/JetCleaningCutDefs.py
index 91ccf362fbe0513971baa10eb98f0a1d197b0389..aa74ff01887a7b0446a874d2558cdd0758dbd992 100644
--- a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/python/JetCleaningCutDefs.py
+++ b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/python/JetCleaningCutDefs.py
@@ -10,11 +10,6 @@
##
##=============================================================================
-# import the needed Reflex and ROOT stuff
-import PyCintex
-PyCintex.Cintex.Enable()
-import ROOT
-
# Import a needed helper
from PATCore.HelperUtils import GetTool
diff --git a/PhysicsAnalysis/MuonID/MuonSelectorTools/python/MuonSelectorCutDefs.py b/PhysicsAnalysis/MuonID/MuonSelectorTools/python/MuonSelectorCutDefs.py
index 15e47261c6c2353d0256d1c572fbf789857b9247..4335f1738b8e557319a6f15d2e3bcc2af0c4cba4 100644
--- a/PhysicsAnalysis/MuonID/MuonSelectorTools/python/MuonSelectorCutDefs.py
+++ b/PhysicsAnalysis/MuonID/MuonSelectorTools/python/MuonSelectorCutDefs.py
@@ -10,11 +10,6 @@
##
##=============================================================================
-# import the needed Reflex and ROOT stuff
-import PyCintex
-PyCintex.Cintex.Enable()
-import ROOT
-
# Import a needed helper
from PATCore.HelperUtils import *
diff --git a/PhysicsAnalysis/NTUPtoNTUP/ExoticsN2N/CMakeLists.txt b/PhysicsAnalysis/NTUPtoNTUP/ExoticsN2N/CMakeLists.txt
index 4f0665613e90a1074e03b9fcdddb80207d923b38..6255a697c3572ca9b2ddfe01516f5d07d427535f 100644
--- a/PhysicsAnalysis/NTUPtoNTUP/ExoticsN2N/CMakeLists.txt
+++ b/PhysicsAnalysis/NTUPtoNTUP/ExoticsN2N/CMakeLists.txt
@@ -8,8 +8,6 @@ atlas_subdir( ExoticsN2N )
# External dependencies:
find_package( ROOT COMPONENTS Hist Physics Tree Core MathCore RIO pthread MathMore Minuit Minuit2 Matrix HistPainter Rint Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
-# tag ROOTCintexLibs was not recognized in automatic conversion in cmt2cmake
-
# Component(s) in the package:
atlas_add_executable( ExoticsMultiJetSkim
src/ExoticsMultiJetSkim.cxx
diff --git a/PhysicsAnalysis/NTUPtoNTUP/ExoticsN2N/cmt/requirements b/PhysicsAnalysis/NTUPtoNTUP/ExoticsN2N/cmt/requirements
deleted file mode 100644
index 800d437a2593a0409d8a1403f4894bffd243653e..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/NTUPtoNTUP/ExoticsN2N/cmt/requirements
+++ /dev/null
@@ -1,22 +0,0 @@
-package ExoticsN2N
-
-use AtlasPolicy AtlasPolicy-*
-
-
-private
-use AtlasROOT AtlasROOT-* External
-
-# Specify the required ROOT components for cmake (transparent to CMT)
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS Hist Physics Tree)"
-
-branches doc python share
-
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-
-apply_tag ROOTCintexLibs
-apply_tag ROOTMathLibs
-apply_tag ROOTGraphicsLibs
-application ExoticsMultiJetSkim ../src/ExoticsMultiJetSkim.cxx
-
-end_private
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDESDMFlags_PerfMS.py b/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDESDMFlags_PerfMS.py
index 99c0118fc532dde52b326d2b441db7cc7f4b6b92..3484d461c87766aacf063bef3d1dab8a81901c2f 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDESDMFlags_PerfMS.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDESDMFlags_PerfMS.py
@@ -18,18 +18,6 @@ from AthenaCommon.JobProperties import jobproperties
import AthenaCommon.SystemOfUnits as Units
-# ---- Load the egammaPID and egammaParameters information
-# This is needed to always be up-to-date with the egamma
-# IsEM selections and also the author selections
-import PyUtils.RootUtils as ru
-ROOT = ru.import_root()
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
-#from ROOT import egammaPID
-#from ROOT import egammaParameters
-
-
-
#=====================================================================
# First define container for the PrimaryDPDMaker flags
#=====================================================================
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDESDMFlags_TileMu.py b/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDESDMFlags_TileMu.py
index 277ae3f0fd4c6c8aa635ed23519d5274e7725b53..5fb3f3b1af629907173500661977918c52d4137b 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDESDMFlags_TileMu.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDESDMFlags_TileMu.py
@@ -17,18 +17,6 @@ from AthenaCommon.JobProperties import jobproperties
import AthenaCommon.SystemOfUnits as Units
-# ---- Load the egammaPID and egammaParameters information
-# This is needed to always be up-to-date with the egamma
-# IsEM selections and also the author selections
-import PyUtils.RootUtils as ru
-ROOT = ru.import_root()
-import PyCintex
-PyCintex.loadDictionary('egammaEnumsDict')
-#from ROOT import egammaPID
-#from ROOT import egammaParameters
-
-
-
#=====================================================================
# First define container for the PrimaryDPDMaker flags
#=====================================================================
diff --git a/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/share/PyPoolBrowser.py b/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/share/PyPoolBrowser.py
index ab6ccb7cc7fc875b60a88c36c9b6938b9c0a8f23..3d2c5e99b60b58fd681e43fc24a69929a98d44b5 100755
--- a/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/share/PyPoolBrowser.py
+++ b/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/share/PyPoolBrowser.py
@@ -6,8 +6,8 @@ import re
import time
# import PyDataHeader and PyCLIDSvc
-import PyCintex
-PyCintex.loadDictionary("PyAnalysisCoreDict")
+import cppyy
+cppyy.loadDictionary("PyAnalysisCoreDict")
#############################################################################
diff --git a/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/share/ToolTest.py b/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/share/ToolTest.py
index b527710c29e538446e8b32bac6cc732ae3ffc91c..91853630985bc438202756ff534e1f3eb8416144 100755
--- a/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/share/ToolTest.py
+++ b/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/share/ToolTest.py
@@ -5,7 +5,8 @@
######################################################################
# load dict for MyCutClass
-PyCintex.loadDictionary("PyAnalysisExamplesDict")
+import cppyy
+cppyy.loadDictionary("PyAnalysisExamplesDict")
## get a handle to the default top-level algorithm sequence
from AthenaCommon.AlgSequence import AlgSequence
@@ -29,7 +30,7 @@ tool.setPython(tool)
# set proxy
def convFunc():
- ptr = PyCintex.libPyROOT.MakeNullPointer(g.MyObj)
+ ptr = cppyy.libPyROOT.MakeNullPointer(g.MyObj)
proxy = g.PyReverseProxy.getProxy("MyObj_Proxy")
proxy.getObj(ptr)
return ptr
diff --git a/PhysicsAnalysis/RingerSelectorTools/python/ElectronRingerSelectorDefs.py b/PhysicsAnalysis/RingerSelectorTools/python/ElectronRingerSelectorDefs.py
index 419379535a90544294833987050de302468b7442..b516d793718faab0c060ab8a9f35d544ba7e7aa6 100644
--- a/PhysicsAnalysis/RingerSelectorTools/python/ElectronRingerSelectorDefs.py
+++ b/PhysicsAnalysis/RingerSelectorTools/python/ElectronRingerSelectorDefs.py
@@ -6,10 +6,7 @@ mlog = logging.getLogger( 'ElectronRingerSelectorDefs.py' )
from AthenaCommon.Configurable import Configurable
# Import from Ringer utilities:
-try:
- import cppyy
-except ImportError:
- import PyCintex as cppyy
+import cppyy
try :
cppyy.loadDictionary('RingerSelectorToolsDict')
diff --git a/PhysicsAnalysis/RingerSelectorTools/python/ElectronRingerSelectorMapping.py b/PhysicsAnalysis/RingerSelectorTools/python/ElectronRingerSelectorMapping.py
index 2e31789f6f8a629e6fdf6d3b6d995354eb95df90..a640568a1cb994b1cc332f9996f45bc0b2ba847f 100644
--- a/PhysicsAnalysis/RingerSelectorTools/python/ElectronRingerSelectorMapping.py
+++ b/PhysicsAnalysis/RingerSelectorTools/python/ElectronRingerSelectorMapping.py
@@ -9,10 +9,7 @@
## Description: Retrieve selector from mask mapping
##=============================================================================
-try:
- import cppyy
-except ImportError:
- import PyCintex as cppyy
+import cppyy
try :
cppyy.loadDictionary('RingerSelectorToolsDict')
diff --git a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/python/MultiJetMetFilter.py b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/python/MultiJetMetFilter.py
index a94ef28b51edb3031a574c01844cc775de138fa9..d1bd1d7a5fc499c73a6f5cf0ec58e577ef4d80d2 100644
--- a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/python/MultiJetMetFilter.py
+++ b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/python/MultiJetMetFilter.py
@@ -60,11 +60,6 @@ class MultiJetMetFilter( PyAthena.AthFilterAlgorithm ):
self.nEventPassJet = 0
self.nEventPassMet = 0
-
- ## Import needed modules
- import ROOT
- import PyCintex
-
## Get the StoreGate service
self.storeGateSvc = PyAthena.py_svc('StoreGateSvc')
if not self.storeGateSvc :
diff --git a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/python/MuonSegmentFilter.py b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/python/MuonSegmentFilter.py
index 80a1cd8271810c68463fec346b07cdcb5850837b..66679a5c041ed813f4deeb4799be48d26bfc16a7 100644
--- a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/python/MuonSegmentFilter.py
+++ b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/python/MuonSegmentFilter.py
@@ -62,10 +62,6 @@ class MuonSegmentFilter( PyAthena.AthFilterAlgorithm ):
self.nMuonSegments = 0
self.nEventPassed = 0
- ## Import needed modules
- import ROOT
- import PyCintex
-
## retrieve a handle to the event store
self.sgSvc = PyAthena.py_svc('StoreGateSvc')
if not self.sgSvc :
diff --git a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/python/SingleJetMetFilter.py b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/python/SingleJetMetFilter.py
index 1f1c4deb5ac5c0768051672ca67b44973c1a3ce9..45008830baea9c8061ec44797a9162e220a9c997 100644
--- a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/python/SingleJetMetFilter.py
+++ b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/python/SingleJetMetFilter.py
@@ -67,11 +67,6 @@ class SingleJetMetFilter( PyAthena.AthFilterAlgorithm ):
self.nEventPassJet = 0
self.nEventPassMet = 0
-
- ## Import needed modules
- import ROOT
- import PyCintex
-
## Get the StoreGate service
self.storeGateSvc = PyAthena.py_svc('StoreGateSvc')
if not self.storeGateSvc :