From 2ba4cf5a810d937f76493c813c30875f9d665e29 Mon Sep 17 00:00:00 2001
From: Marcin Nowak <Marcin.Nowak@cern.ch>
Date: Fri, 30 Jun 2017 16:15:19 +0200
Subject: [PATCH] PyCintex cleanup in PhysicsAnalysis (from master)
Migration to cppyy, removal in some places where it is apparently not
needed. Some packages modified might have been broken anyhow since the
ROOT6 migration - if they happen to be still in use, they will need
extra work to fix.
This is cherry-picked d1f78e60c5930a86b791a721efd6991e3fc1d3cb [formerly ed45654d9c4ef60efbe2e3110f1245b0997c9f41] from
master to solve ATEAM-436
Former-commit-id: 3e1eb566552bd6869d3684c64e74657413e5a9fc
---
.../ARAUtils/share/dumpFileMetaData.py | 10 +-
.../ARAUtils/share/dumpVersionTags.py | 8 +-
.../AODSelect/share/FSRPhotonSequence.py | 4 +-
.../share/AANTEventSelector_jobOptions.py | 6 +-
.../EventUtils/python/MergeContainers.py | 1 -
.../scripts/CreateNewSelectorSkeleton.py | 6 -
.../PileupReweighting/cmt/Makefile.RootCore | 9 --
.../PileupReweighting/cmt/Makefile.Standalone | 142 ------------------
.../PileupReweighting/cmt/fragments/rlibmap | 0
.../cmt/fragments/rlibmap_header | 22 ---
.../PileupReweighting/cmt/requirements | 88 -----------
.../AraToolExample/share/init_root.py | 1 -
PhysicsAnalysis/AthenaROOTAccess/ispellwords | 5 -
.../AthenaROOTAccess/python/dumpers.py | 14 +-
.../AthenaROOTAccess/share/test.py | 10 +-
.../test/DVCollectionProxy_test.cxx | 6 -
.../test/DataBucketVoid_test.cxx | 6 -
.../AthenaROOTAccess/test/ara_brtest.py | 1 -
.../AthenaROOTAccess/test/ara_ptest.py | 4 +-
.../AthenaROOTAccess/test/ara_scantest.py | 1 -
.../D2PDMaker/python/AddContainers.py | 1 -
.../D2PDMaker/python/SUSYFilters.py | 4 +-
.../share/D2PD_ExampleSimpleHgamgam.py | 4 +-
.../D2PDMaker/share/D2PD_ExampleSimpleZee.py | 4 +-
PhysicsAnalysis/D2PDMaker/share/D2PD_Test.py | 6 +-
.../D2PDMaker/share/D2PD_WenuStream.py | 4 +-
.../D2PDMaker/share/D2PD_ZeeStream.py | 4 +-
.../D2PDMaker/share/DAODM_HighMDiJet.py | 4 +-
.../D2PDMaker/share/DAOD_ElLoose18.py | 4 +-
.../D2PDMaker/share/DAOD_H4lBremRec.py | 4 +-
.../D2PDMaker/share/DAOD_HighMDiJet.py | 4 +-
.../scripts/D3PDSizeSummary.py | 3 +-
.../D3PDMaker/D3PDMakerReader/CMakeLists.txt | 2 -
.../D3PDMakerReader/cmt/requirements | 52 -------
.../src/apps/d3pdReaderMaker.cxx | 10 --
.../src/apps/d3pdReadersFromFile.cxx | 9 --
.../python/JetTagElectronInJetD3PDObject.py | 4 +-
.../share/ElectronSelector.py | 4 -
.../share/LowPtElectronPairSelector.py | 4 -
.../share/SMTRILEP_ElectronSelector.py | 4 -
.../python/QcdElectronD3PDObject.py | 2 -
.../python/QcdPhotonD3PDObject.py | 2 -
.../python/QcdPhotonUserDataConfig.py | 4 +-
.../python/Atlfast1ElectronD3PDObject.py | 2 -
.../python/Atlfast1PhotonD3PDObject.py | 2 -
PhysicsAnalysis/DPDUtils/python/DpdLib.py | 4 +-
.../python/EGammaCommon.py | 2 -
.../python/TrackIsolationDecorator.py | 6 +-
.../DerivationFrameworkSUSY/share/SUSY4.py | 6 +-
.../python/TauCommon.py | 2 -
.../HSG1/HSG1DPDUtils/python/HSG1Filter.py | 4 -
.../HSG2/HSG2DPDUtils/python/H4lDPDMaker.py | 10 +-
.../HSG2DPDUtils/python/HSG2_2L2QDPDMaker.py | 8 +-
.../HSG2DPDUtils/share/HSG2TwoLeptonsSkim.py | 2 -
.../HSG5/HSG5DPDUtils/python/HSG5Selectors.py | 2 -
.../share/WHlnubb_boostedFilter.py | 2 -
.../share/WHlnubb_unboostedFilter.py | 2 -
.../share/WHlnubb_unboostedFilterQCDbkg.py | 3 -
.../share/ZHllbb_boostedFilter.py | 3 -
.../share/ZHllbb_unboostedFilter.py | 6 -
.../python/JetCleaningCutDefs.py | 5 -
.../python/MuonSelectorCutDefs.py | 5 -
.../NTUPtoNTUP/ExoticsN2N/CMakeLists.txt | 2 -
.../NTUPtoNTUP/ExoticsN2N/cmt/requirements | 22 ---
.../python/PrimaryDESDMFlags_PerfMS.py | 12 --
.../python/PrimaryDESDMFlags_TileMu.py | 12 --
.../PyAnalysisExamples/share/PyPoolBrowser.py | 4 +-
.../PyAnalysisExamples/share/ToolTest.py | 5 +-
.../python/ElectronRingerSelectorDefs.py | 5 +-
.../python/ElectronRingerSelectorMapping.py | 5 +-
.../python/MultiJetMetFilter.py | 5 -
.../python/MuonSegmentFilter.py | 4 -
.../python/SingleJetMetFilter.py | 5 -
73 files changed, 71 insertions(+), 573 deletions(-)
delete mode 100644 PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/Makefile.RootCore
delete mode 100644 PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/Makefile.Standalone
delete mode 100755 PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/fragments/rlibmap
delete mode 100644 PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/fragments/rlibmap_header
delete mode 100644 PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/requirements
delete mode 100644 PhysicsAnalysis/D3PDMaker/D3PDMakerReader/cmt/requirements
delete mode 100644 PhysicsAnalysis/NTUPtoNTUP/ExoticsN2N/cmt/requirements
diff --git a/PhysicsAnalysis/ARAUtils/share/dumpFileMetaData.py b/PhysicsAnalysis/ARAUtils/share/dumpFileMetaData.py
index b81c28f15c7..44aa04fdaa1 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 905595a3e47..48b0c9f03cc 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 bf7e9ff465c..72b80fc97ea 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 68c6e7b3136..aa51b4e5968 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 8070013642a..f3f6571e4c4 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 1af4da4983b..5aa110044db 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 62c33c93b48..00000000000
--- 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 GoodRunsLists
-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 40483a1d441..00000000000
--- 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 100755
index e69de29bb2d..00000000000
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/fragments/rlibmap_header b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/fragments/rlibmap_header
deleted file mode 100644
index 20351f41a97..00000000000
--- 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 e9ae2d649d7..00000000000
--- a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/cmt/requirements
+++ /dev/null
@@ -1,88 +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 xAODEventInfo xAODEventInfo-* Event/xAOD
-
-use PATInterfaces PATInterfaces-* PhysicsAnalysis/AnalysisCommon
-
-use GoodRunsLists GoodRunsLists-* DataQuality
-
-private
-use PathResolver PathResolver-* Tools
-use AthenaBaseComps AthenaBaseComps-* Control
-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 "
-end_private
-
diff --git a/PhysicsAnalysis/AraToolExample/share/init_root.py b/PhysicsAnalysis/AraToolExample/share/init_root.py
index 9843d6430bc..2ff99571768 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 8db591d7ad4..38a6e77b77c 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 cc372373f45..275d5842b20 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 f542975826c..aff6d915633 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 8b2f49db721..b2cc123f83b 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 025f1416b76..c8abc3e8498 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 d52bbb5d88d..ed0a00f7848 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 bf73c768530..0b4f6b11857 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 1d69ffa5297..44515d62910 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 bcb06a6a941..fa3f15e97be 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 c370ec4bf0c..ae250ee8021 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 91f3479fefc..36a4bf8631c 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 218d3bc712a..1599cf98c60 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 647bd93c6a4..7ccaf307f5b 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 0ae132801cf..743e6f30f5c 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 619573b799d..d3b15bf12ce 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 411429c331d..2bc45201cc7 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 07b967ce38b..5c71c431d67 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 b23d67d5fe2..699529d8269 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 9acacf2e6fb..0f1e9defaa8 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 f2dea09dd05..e185adb93f2 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 bf1daf9f767..23615453cec 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 7cc0c81cbb8..00000000000
--- 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 91b1e85bde4..11b53b55fa2 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 981ee3a2051..9ce55000b8e 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 a0c303563d9..694a40e118f 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 549eeaedf77..22344662125 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 dd46d68958f..eb547e382dd 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 7504a442d2d..bbaa2db1eb3 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 65afa914807..befa6ca4b32 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 a2ec11bc2ea..2075e399813 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 67df67c59a8..55a65c12bec 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 0a4ae720a3a..8cc3725ea95 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 2e418a1a898..61a009a4014 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 1be25f9bfb8..6fcb521dd15 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 7e5c90e2b24..31b8cb164db 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 415973072f9..999a5253387 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/TrackIsolationDecorator.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/TrackIsolationDecorator.py
@@ -36,9 +36,9 @@ CaloIsoTool.saveOnlyRequestedCorrections = True
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 9abfd1bfe0c..e6a9eaa18f5 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 0c68557df1f..c9deea403d0 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 730bdbf6614..78fc1aec5f7 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 ccec5bc06dc..650523daf9b 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 6d237fc7f46..3588f305827 100644
--- a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/python/HSG2_2L2QDPDMaker.py
+++ b/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/python/HSG2_2L2QDPDMaker.py
@@ -2,14 +2,14 @@
import AthenaPython.PyAthena as PyAthena
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
def isLoosePP(electron):
diff --git a/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/share/HSG2TwoLeptonsSkim.py b/PhysicsAnalysis/HiggsPhys/HSG2/HSG2DPDUtils/share/HSG2TwoLeptonsSkim.py
index 07f36092556..a682ec943a7 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/HSG5/HSG5DPDUtils/python/HSG5Selectors.py b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/python/HSG5Selectors.py
index e2510b25436..e4e4ef8ccb2 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 9d01b632fd9..c8337a47ca7 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 fe743e1bfd9..69dbacd6732 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 61d078797ac..b9a744a74b8 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 2ab2ff5695e..31c83a84fae 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 8d780089b0d..d9e7e13f239 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 91ccf362fbe..aa74ff01887 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 15e47261c6c..4335f1738b8 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 4f0665613e9..6255a697c35 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 800d437a259..00000000000
--- 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 99c0118fc53..3484d461c87 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 277ae3f0fd4..5fb3f3b1af6 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 ab6ccb7cc7f..3d2c5e99b60 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 b527710c29e..91853630985 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 419379535a9..b516d793718 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 2e31789f6f8..a640568a1cb 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 a94ef28b51e..d1bd1d7a5fc 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 80a1cd82718..66679a5c041 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 1f1c4deb5ac..45008830bae 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 :
--
GitLab