From ee35372eab1e6ef647eb11c3fef1ee2acdf06298 Mon Sep 17 00:00:00 2001
From: Marcin Nowak <Marcin.Nowak@cern.ch>
Date: Wed, 28 Jun 2017 16:58:44 +0200
Subject: [PATCH] Replacing PyCintex with cppyy in various Athena packages
If Cintex referenced in cmt/ - simply removing the directory
Former-commit-id: 5b5c2fe24ca1caed0418a94a40d54174edfb82ee
---
.../python/subdetectors/tile.py | 7 +-
DataQuality/DQUtils/python/quick_retrieve.py | 18 +--
.../GoodRunsLists/cmt/Makefile.RootCore | 11 --
.../GoodRunsLists/cmt/Makefile.Standalone | 131 ------------------
.../GoodRunsLists/cmt/precompile.RootCore | 31 -----
DataQuality/GoodRunsLists/cmt/requirements | 72 ----------
.../HanConfigGenerator/cmt/requirements | 33 -----
.../dqm_algorithms/workbench/Workbench.C | 2 -
.../python/LogicalExpressionFilter.py | 4 +-
.../python/TriggerUnixStandardSetup.py | 16 +--
.../PixelCalibAlgs/PixelNtupleTracks.h | 8 --
.../PixelCalibAlgs/cmt/requirements | 96 -------------
.../PixelCalibAlgs/src/PixelRIOs.cxx | 9 --
.../TRT_CalibAlgs/share/dumpVersion.py | 1 -
.../InDetValidation/PixelRTT/cmt/requirements | 34 -----
LumiBlock/LumiBlockComps/python/LumiQuery.py | 1 -
LumiBlock/LumiCalc/CMakeLists.txt | 2 -
LumiBlock/LumiCalc/cmt/requirements | 39 ------
LumiBlock/LumiCalc/src/iLumiCalc.cxx | 3 -
.../MuonCalibExtraNtuple/cmt/requirements | 43 ------
.../MuonLayerHough/cmt/requirements | 33 -----
.../MissingETPerformance/share/MyFilter.py | 2 -
Reconstruction/RecAlgs/src/JobInfo.cxx | 46 ------
Reconstruction/RecAlgs/src/JobInfo.h | 10 --
.../share/CustomTrackIsoGetter.py | 6 +-
.../python/CaloRingerBuilderFactories.py | 4 -
.../python/CaloRingerSelectorsBuilders.py | 5 +-
.../share/AthTest_IsolationTool.py | 8 +-
.../share/egammaPerformance_hist.C | 1 -
.../python/egammaRTT_create.py | 3 -
.../egammaValidation/share/egammaRTTInit.py | 1 -
.../share/egammaValidation_hist.C | 1 -
.../python/ValidateRootFile.py | 1 -
.../AtlantisJava/share/InteractiveServer.py | 15 +-
34 files changed, 26 insertions(+), 671 deletions(-)
delete mode 100644 DataQuality/GoodRunsLists/cmt/Makefile.RootCore
delete mode 100644 DataQuality/GoodRunsLists/cmt/Makefile.Standalone
delete mode 100755 DataQuality/GoodRunsLists/cmt/precompile.RootCore
delete mode 100644 DataQuality/GoodRunsLists/cmt/requirements
delete mode 100755 DataQuality/HanConfigGenerator/cmt/requirements
delete mode 100755 InnerDetector/InDetCalibAlgs/PixelCalibAlgs/cmt/requirements
delete mode 100755 InnerDetector/InDetValidation/PixelRTT/cmt/requirements
delete mode 100755 LumiBlock/LumiCalc/cmt/requirements
delete mode 100644 MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraNtuple/cmt/requirements
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/cmt/requirements
diff --git a/DataQuality/DCSCalculator2/python/subdetectors/tile.py b/DataQuality/DCSCalculator2/python/subdetectors/tile.py
index 99ea507bba3..8f676f06ee4 100644
--- a/DataQuality/DCSCalculator2/python/subdetectors/tile.py
+++ b/DataQuality/DCSCalculator2/python/subdetectors/tile.py
@@ -12,12 +12,9 @@ N_CHANNELS_PER_MODULE = 90
from itertools import product
# Magic, needed for functioning coral Blob
-try:
- import PyCintex as C
-except:
- import cppyy as C
+import cppyy
import PyCool
-Blob = C.gbl.coral.Blob
+Blob = cppyy.gbl.coral.Blob
from TileCalibBlobObjs.Classes import (
TileCalibDrawerBch, TileBchDecoder, TileBchStatus, TileCalibUtils, TileBchPrbs)
diff --git a/DataQuality/DQUtils/python/quick_retrieve.py b/DataQuality/DQUtils/python/quick_retrieve.py
index 2d6a3f9a7c0..e07b44a23d5 100644
--- a/DataQuality/DQUtils/python/quick_retrieve.py
+++ b/DataQuality/DQUtils/python/quick_retrieve.py
@@ -7,17 +7,13 @@ Load the DQUtils dictionary
Exposes quick_retrieve and GIL releasing functions
"""
-try:
- import cppyy as PyCintex
-except:
- import PyCintex
- PyCintex.Cintex.Enable()
-PyCintex.loadDictionary("DQUtilsDict")
+import cppyy
+cppyy.loadDictionary("DQUtilsDict")
import PyCool
-quick_retrieve = PyCintex.gbl.quick_retrieve
-browse_coracool = PyCintex.gbl.browse_coracool
-get_coracool_payload_spec = PyCintex.gbl.get_coracool_payload_spec
-make_fieldselection = PyCintex.gbl.make_fieldselection
-make_selection_vector = PyCintex.gbl.make_selection_vector
+quick_retrieve = cppyy.gbl.quick_retrieve
+browse_coracool = cppyy.gbl.browse_coracool
+get_coracool_payload_spec = cppyy.gbl.get_coracool_payload_spec
+make_fieldselection = cppyy.gbl.make_fieldselection
+make_selection_vector = cppyy.gbl.make_selection_vector
diff --git a/DataQuality/GoodRunsLists/cmt/Makefile.RootCore b/DataQuality/GoodRunsLists/cmt/Makefile.RootCore
deleted file mode 100644
index 87251dcb88a..00000000000
--- a/DataQuality/GoodRunsLists/cmt/Makefile.RootCore
+++ /dev/null
@@ -1,11 +0,0 @@
-# Author: Max Baak (mbaak@cern.ch)
-
-PACKAGE = GoodRunsLists
-PACKAGE_PRELOAD = Tree TreePlayer XMLParser XMLIO
-PACKAGE_TRYDEP = AsgTools xAODEventInfo PathResolver AsgAnalysisInterfaces
-PACKAGE_CXXFLAGS = -I/usr/include/libxml2
-PACKAGE_BINFLAGS = -lxml2
-PACKAGE_PEDANTIC = 1
-PACKAGE_REFLEX = 1
-
-include $(ROOTCOREDIR)/Makefile-common
diff --git a/DataQuality/GoodRunsLists/cmt/Makefile.Standalone b/DataQuality/GoodRunsLists/cmt/Makefile.Standalone
deleted file mode 100644
index 50e1d0fc72f..00000000000
--- a/DataQuality/GoodRunsLists/cmt/Makefile.Standalone
+++ /dev/null
@@ -1,131 +0,0 @@
-# Author: Max Baak (mbaak@cern.ch)
-# GoodRunsLists root stand-alone makefile
-
-# --- External configuration ----------------------------------
-ifeq ($(wildcard $(ROOTSYS)/test/Makefile.arch),)
- include $(ROOTSYS)/etc/Makefile.arch
-else
- include $(ROOTSYS)/test/Makefile.arch
-endif
-
-# -------------------------------------------------------------
-# General flags
-# -------------------------------------------------------------
-PACKAGE = GoodRunsLists
-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${ROOTSYS}/include -I.. -I../Root -I../GoodRunsLists
-
-# Need these to avoid loading dependent libraries when ROOT starts
-LINKLIBS = -L${ROOTSYS}/lib -lHist -lMatrix -lXMLParser
-
-
-# -------------------------------------------------------------
-# xml library configuration
-# -------------------------------------------------------------
-
-## default: turn off dependency on libxml2. xml writing not possible
-XMLCONFIG=
-## uncomment following line to turn on libxml2
-#XMLCONFIG=on
-ifneq ($(XMLCONFIG),)
- INCLUDES += -I/usr/include/libxml2
- ifeq ($(PLATFORM),macosx)
- LINKLIBS += /usr/lib/libxml2.dylib
- else
- ifeq ($(ARCH),linuxx8664gcc)
- LINKLIBS += -lxml2
- else
- LINKLIBS += /usr/lib/libxml2.so.2
- endif
- endif
-else
- CXXFLAGS += -D__NOLIBXML__
-endif
-
-#-lRIO -lNet needed for root >v5.16
-#-lxml2
-
-# -------------------------------------------------------------
-# ROOT Cint
-# -------------------------------------------------------------
-CINT = goodrunscint
-LDEFFILE = ../Root/LinkDef.h
-CINTFILE = ../Root/TGoodRunsListsCint.cxx
-CINTFILEH = ../Root/TGoodRunsLists.h
-CINTOBJ = ../Root/TGoodRunsListsCint.o
-CCLISTT = TUniqueGRLString.cxx RegularFormula.cxx StrUtil.cxx TMsgLogger.cxx TGoodRunsListWriter.cxx TGoodRunsListReader.cxx TLumiBlockRange.cxx TGoodRun.cxx TGoodRunsList.cxx TGRLCollection.cxx DQHelperFunctions.cxx
-CCLISTC = $(addprefix ../Root/,$(CCLISTT)) $(CINTFILE)
-HHLISTT = TUniqueGRLString.h RegularFormula.h StrUtil.h TMsgLogger.h TGoodRunsListWriter.h TGoodRunsListReader.h TLumiBlockRange.h TGoodRun.h TGoodRunsList.h TGRLCollection.h DQHelperFunctions.h
-HHLISTC = $(addprefix ../GoodRunsLists/,$(HHLISTT))
-OLISTC = $(patsubst %.cxx,%.o,$(CCLISTC))
-CCLIST = $(CCLISTC) $(wildcard ../src/*.cxx) $(wildcard ../Modules/*.cxx)
-HLIST = $(wildcard ../GoodRunsLists/*.h)
-OLIST = $(patsubst %.cxx,%.o,$(CCLIST))
-DLIST = $(patsubst %.h,%.d,$(HLIST))
-
-# -------------------------------------------------------------
-# Libraries
-# -------------------------------------------------------------
-SHLIBFILE = $(OUTPUTDIR)/libGoodRunsLists.so
-
-ifeq ($(PLATFORM),macosx)
-EXTRALDFLAGS = -install_name @rpath/$(SHLIBFILE)
-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) $(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) $(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)/GoodRunsListsLib.so
- @ln -s $(SHLIBFILE) $(OUTPUTDIR)/GoodRunsListsLib.so
-
--include $(DLIST)
-
-goodrunscint: $(CINTOBJ)
-shlib: $(SHLIBFILE)
-
-clean:
- @rm -f ../*/*.o ../*/*.d $(CINTFILE) $(CINTFILEH)
diff --git a/DataQuality/GoodRunsLists/cmt/precompile.RootCore b/DataQuality/GoodRunsLists/cmt/precompile.RootCore
deleted file mode 100755
index 3cc0a66a334..00000000000
--- a/DataQuality/GoodRunsLists/cmt/precompile.RootCore
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-if test -f $ROOTCORECMT/Makefile.RootCore
-then
- CONFFILE=$ROOTCORECMT/config.RootCore
- OUTFILE=$ROOTCORECMT/configured
- MAKEFILE=$ROOTCORECMT/Makefile.RootCore
-else
- CONFFILE=config.RootCore
- OUTFILE=configured
- MAKEFILE=Makefile.RootCore
-fi
-
-test -e $OUTFILE -a $OUTFILE -nt $0 -a $OUTFILE -nt $CONFFILE -a $OUTFILE -nt $ROOTCOREBIN/packages && exit 0
-
-echo configuring GoodRunsList package
-
-export ROOTCORETEST_CXXFLAGS="-I/usr/include/libxml2"
-if $ROOTCOREDIR/scripts/test_cc.sh compile <<EOF
-#include <libxml/encoding.h>
-#include <libxml/xmlwriter.h>
-EOF
-then
- $ROOTCOREDIR/scripts/set_field.sh $MAKEFILE PACKAGE_CXXFLAGS "-I/usr/include/libxml2"
- $ROOTCOREDIR/scripts/set_field.sh $MAKEFILE PACKAGE_BINFLAGS "-lxml2"
-else
- $ROOTCOREDIR/scripts/set_field.sh $MAKEFILE PACKAGE_CXXFLAGS "-D__NOLIBXML__"
- $ROOTCOREDIR/scripts/set_field.sh $MAKEFILE PACKAGE_BINFLAGS ""
-fi
-
-touch $OUTFILE
diff --git a/DataQuality/GoodRunsLists/cmt/requirements b/DataQuality/GoodRunsLists/cmt/requirements
deleted file mode 100644
index 3057bd3974f..00000000000
--- a/DataQuality/GoodRunsLists/cmt/requirements
+++ /dev/null
@@ -1,72 +0,0 @@
-package GoodRunsLists
-
-author Max Baak <mbaak@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-use AthenaBaseComps AthenaBaseComps-* Control
-use AthenaKernel AthenaKernel-* Control
-use AtlasROOT AtlasROOT-* External
-use GaudiInterface GaudiInterface-* External
-
-use xAODEventInfo xAODEventInfo-* Event/xAOD
-use AsgTools AsgTools-* Control/AthToolSupport
-
-use AsgAnalysisInterfaces AsgAnalysisInterfaces-* PhysicsAnalysis/Interfaces
-
-private
-use DetectorStatus DetectorStatus-* DetectorDescription/DetDescrCond
-use EventInfo EventInfo-* Event
-use PathResolver PathResolver-* Tools
-use StoreGate StoreGate-* Control
-end_private
-
-# Inform cmake of the required ROOT and xml components (invisible to CMT)
-apply_pattern cmake_add_command command="find_package( ROOT COMPONENTS XMLIO XMLParser )"
-apply_pattern cmake_add_command command="find_package( xml )"
-
-## macros
-apply_tag ROOTBasicLibs
-apply_tag ROOTMathLibs
-
-# Create a named installed library
-library GoodRunsListsLib "../Root/*.cxx"
-apply_pattern named_installed_library library=GoodRunsListsLib
-
-# Create the CINT dictionary
-apply_pattern have_root_headers root_headers="TLumiBlockRange.h RegularFormula.h TGoodRunsListReader.h TGoodRunsListWriter.h DQHelperFunctions.h ../Root/LinkDef.h" \
- headers_lib=GoodRunsListsLib
-
-## Create a component library
-library GoodRunsLists *.cxx components/*.cxx
-macro_append GoodRunsLists_dependencies " GoodRunsListsLib"
-apply_pattern component_library
-
-## requirements file, scripts, jobOptions and python modules
-apply_pattern declare_scripts files="../scripts/define* ../scripts/create* ../scripts/merge* ../scripts/verify* ../scripts/overlap* ../scripts/diff*"
-apply_pattern declare_python_modules files="*.py"
-
-## install rtt configuration file
-macro GoodRunsLists_TestConfiguration "../test/GoodRunsLists_DefaultConfiguration.xml"
-apply_pattern declare_runtime extras = "../test/*.xml"
-
-private
-macro_append GoodRunsListsLib_cppflags " `xml2-config --cflags`"
-apply_tag ROOTCintexLibs
-## xml libraries
-macro_append GoodRunsListsLib_use_linkopts " -L$(ROOTSYS)/lib -lXMLIO -lXMLParser"
-macro_append GoodRunsListsLib_use_linkopts " -lxml2" slc4-gcc34 " /usr/lib/libxml2.so.2"
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-end_private
-
-private
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-apply_pattern lcgdict dict=GoodRunsLists selectionfile=selection.xml headerfiles="../GoodRunsLists/GoodRunsListsDict.h"
-end_private
-
-
-# Set up the unit test(s):
-use TestTools TestTools-* AtlasTest
-
-apply_pattern UnitTest_run unit_test=GRLSelectionTool
diff --git a/DataQuality/HanConfigGenerator/cmt/requirements b/DataQuality/HanConfigGenerator/cmt/requirements
deleted file mode 100755
index 131d71badc4..00000000000
--- a/DataQuality/HanConfigGenerator/cmt/requirements
+++ /dev/null
@@ -1,33 +0,0 @@
-package HanConfigGenerator
-
-# ============================================================================================
-public
-
-use AtlasPolicy AtlasPolicy-*
-
-# ============================================================================================
-private
-
-use AtlasROOT AtlasROOT-* External
-
-apply_tag ROOTGraphicsLibs
-# apply_tag ROOTCintexLibs
-# apply_tag ROOTGenVectorLibs
-# apply_tag ROOTMathLibs
-# apply_tag ROOTSTLDictLibs
-# apply_tag ROOTBasicLibs
-
-# ============================================================================================
-public
-
-# Specify the required ROOT components for cmake (transparent to CMT)
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS Graf Gpad)"
-
-application hcg "../src/hcg.cxx ../src/addnode.cxx
-
-
-
-
-
-
-
diff --git a/DataQuality/dqm_algorithms/workbench/Workbench.C b/DataQuality/dqm_algorithms/workbench/Workbench.C
index 1c0cfda2eaa..9fd2fcef43a 100644
--- a/DataQuality/dqm_algorithms/workbench/Workbench.C
+++ b/DataQuality/dqm_algorithms/workbench/Workbench.C
@@ -7,8 +7,6 @@ void Workbench()
{
gSystem->Load( "libdqm_core.so" );
gSystem->Load( "libdqm_dummy.so" );
- gSystem->Load( "libCintex.so" );
- Cintex::Enable();
gSystem->Load( "libdqm_tools.so" );
gSystem->Load( "libdqm_algorithms.so" );
gROOT->ProcessLine( ".include .." );
diff --git a/Generators/EvgenProdTools/python/LogicalExpressionFilter.py b/Generators/EvgenProdTools/python/LogicalExpressionFilter.py
index 02ca5959fc5..d5cdb5b0570 100644
--- a/Generators/EvgenProdTools/python/LogicalExpressionFilter.py
+++ b/Generators/EvgenProdTools/python/LogicalExpressionFilter.py
@@ -77,8 +77,8 @@ class LogicalExpressionFilter( PyAthena.Alg ):
error = 'could not retrieve IAlgManager/ApplicationMgr'
self.msg.error (error)
raise RuntimeError (error)
- import PyCintex
- _alg = PyCintex.libPyROOT.MakeNullPointer("IAlgorithm")
+ import cppyy
+ _alg = cppyy.libPyROOT.MakeNullPointer("IAlgorithm")
if algmgr.createAlgorithm(filterType,filterName,_alg).isFailure() or not _alg:
self.msg.error ('could not create alg: ' + filterTypeAndName)
raise RuntimeError ('could not create alg: ' + filterTypeAndName)
diff --git a/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py b/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py
index 0b3d8e892d0..20ee2f2565a 100644
--- a/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py
+++ b/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py
@@ -10,17 +10,6 @@ class _Conf:
useOnlineTHistSvc = True # set via TrigServices/OfflineTHistSvc.py
athenaXT = False # set below in _setupCommonServices
-
-def _setupRoot6IfNeeded():
- import cppyy
- try:
- # try to touch ROOT5-only attribute (success means we have ROOT5)
- cppyy.Cintex.Debug
- except AttributeError:
- # ROOT 6
- from PyUtils.Helpers import ROOT6Setup
- ROOT6Setup()
-
def _eventLoopMgr(svcMgr):
if hasattr(svcMgr, 'HltEventLoopMgr'): return svcMgr.HltEventLoopMgr
return None
@@ -54,8 +43,9 @@ def _setupCommonServices():
_Conf.athenaXT = False
log.debug("Configuration for online running")
- # setup ROOT6 if needed
- _setupRoot6IfNeeded()
+ # setup ROOT6
+ from PyUtils.Helpers import ROOT6Setup
+ ROOT6Setup()
# StoreGateSvc
svcMgr.StoreGateSvc.ActivateHistory = False
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelNtupleTracks.h b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelNtupleTracks.h
index 147a3735620..bcdc27ad930 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelNtupleTracks.h
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelNtupleTracks.h
@@ -19,10 +19,6 @@
#include <TROOT.h>
#include <TChain.h>
-#if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0)
-#include "Cintex/Cintex.h"
-#endif
-
class PixelNtupleTracks {
public :
@@ -341,10 +337,6 @@ class PixelNtupleTracks {
#ifdef PixelNtupleTracks_cxx
PixelNtupleTracks::PixelNtupleTracks(std::string input,std::string collection){
-
-#if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0)
- ROOT::Cintex::Cintex::Enable();
-#endif
TChain *mychain = 0;
if(input != "" ){
mychain = new TChain(collection.c_str());
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/cmt/requirements b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/cmt/requirements
deleted file mode 100755
index d73f72d8710..00000000000
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/cmt/requirements
+++ /dev/null
@@ -1,96 +0,0 @@
-#################################################
-package PixelCalibAlgs
-
-author Attilio Andreazza
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaBaseComps AthenaBaseComps-* Control
-use GaudiInterface GaudiInterface-* External
-use AtlasROOT AtlasROOT-* External
-use AtlasCLHEP AtlasCLHEP-* External
-use InDetPrepRawData InDetPrepRawData-* InnerDetector/InDetRecEvent
-
-private
-
-use AtlasCORAL AtlasCORAL-* External
-use PathResolver PathResolver-* Tools
-use CoralDB CoralDB-* Database
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use Identifier Identifier-* DetectorDescription
-use DetDescrConditions DetDescrConditions-* DetectorDescription/DetDescrCond
-use InDetIdentifier InDetIdentifier-* InnerDetector/InDetDetDescr
-use InDetReadoutGeometry InDetReadoutGeometry-* InnerDetector/InDetDetDescr
-use PixelConditionsServices PixelConditionsServices-* InnerDetector/InDetConditions
-use PixelConditionsData PixelConditionsData-* InnerDetector/InDetConditions
-use InDetRawData InDetRawData-* InnerDetector/InDetRawEvent
-use EventInfo EventInfo-* Event
-use InDetConditionsSummaryService InDetConditionsSummaryService-* InnerDetector/InDetConditions
-use AtlasCLHEP AtlasCLHEP-* External
-use PixelGeoModel PixelGeoModel-* InnerDetector/InDetDetDescr
-
-public
-
-# Specify the required ROOT components to cmake (transparent to CMT)
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS Matrix Gpad Graf)"
-
-library PixelCalibAlgs -x="PixelRIOs" -x="G4" -x="DepletionDepth" -x="LorentzAngle" -x="Offline" -x="Residual" -x="ChargeInterpolation" *.cxx -s=components *.cxx
-library PixelOfflineCalib -k="PixelRIOs" -k="G4" -k="DepletionDepth" -k="LorentzAngle" -k="Offline" -k="Residual" -k="ChargeInterpolation" -k="ClusterOnTrack" *.cxx
-application doPixelOfflineCalib ../Application/doPixelOfflineCalib.cxx
-application doPixelOfflineCalibG4 ../Application/doPixelOfflineCalibG4.cxx
-application PlotChargeSharingConstants ../Application/PlotChargeSharingConstants.cxx
-application PlotPixelClusterOnTrackErrors ../Application/PlotPixelClusterOnTrackErrors.cxx
-application updateNoiseMaps ../Application/updateNoiseMaps.C
-application updateDeadMaps ../Application/updateDeadMaps.C
-application createDeadModuleList ../Application/createDeadModuleList.C
-application makeInactiveModuleList ../Application/makeInactiveModuleList.C
-application hackNoiseMapsForStudyCP ../Application/hackNoiseMapsForStudyCP.C
-
-apply_pattern named_component_library library=PixelCalibAlgs
-apply_pattern named_installed_library library=PixelOfflineCalib
-apply_pattern application_alias application=doPixelOfflineCalib
-apply_pattern application_alias application=doPixelOfflineCalibG4
-apply_pattern application_alias application=PlotChargeSharingConstants
-apply_pattern application_alias application=PlotPixelClusterOnTrackErrors
-apply_pattern application_alias application=updateNoiseMaps
-apply_pattern application_alias application=updateDeadMaps
-apply_pattern application_alias application=createDeadModuleList
-apply_pattern application_alias application=makeInactiveModuleList
-apply_pattern application_alias application=hackNoiseMapsForStudyCP
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_runtime files="*.txt *.sh *.dat"
-
-#################################################
-
-private
-
-apply_tag ROOTCintexLibs
-apply_tag ROOTGenVectorLibs
-apply_tag ROOTMathLibs
-apply_tag ROOTGraphicsLibs
-apply_tag ROOTSTLDictLibs
-apply_tag ROOTBasicLibs
-
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-macro_append doPixelOfflineCaliblinkopts " -lPixelOfflineCalib"
-macro_append doPixelOfflineCalibG4linkopts " -lPixelOfflineCalib"
-macro_append PlotChargeSharingConstantslinkopts " -lPixelOfflineCalib"
-macro_append PlotPixelClusterOnTrackErrorslinkopts " -lPixelOfflineCalib"
-macro_append updateNoiseMapslinkopts " -lPixelCalibAlgs"
-macro_append updateDeadMapslinkopts " -lPixelCalibAlgs"
-macro_append createDeadModuleListlinkopts " -lPixelCalibAlgs"
-macro_append makeInactiveModuleListlinkopts " -lPixelCalibAlgs"
-#macro_append ROOT_linkopts " -lMatrix -lGpad -lGraf" # -lCintex"
-#macro_append ROOT_linkopts $(rootCintexLibs)
-macro_append doPixelOfflineCalib_dependencies " PixelOfflineCalib"
-macro_append doPixelOfflineCalibG4_dependencies " PixelOfflineCalib"
-macro_append PlotChargeSharingConstants_dependencies " PixelOfflineCalib"
-macro_append PlotPixelClusterOnTrackErrors_dependencies " PixelOfflineCalib"
-macro_append updateNoiseMaps_dependencies " PixelCalibAlgs"
-macro_append updateDeadMaps_dependencies " PixelCalibAlgs"
-macro_append createDeadModuleList_dependencies " PixelCalibAlgs"
-macro_append makeInactiveModuleList_dependencies " PixelCalibAlgs"
-# are these two needed? no code dependence exists!
-macro_append PixelCalibAlgs_dependencies " PixelOfflineCalib"
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelRIOs.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelRIOs.cxx
index aaf6b36cfeb..4c0905a13a7 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelRIOs.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelRIOs.cxx
@@ -18,10 +18,6 @@
#include "PixelCalibAlgs/PixelChargeInterpolationValidation.h"
#include "PixelConditionsData/PixelChargeInterpolationParameters.h"
-#if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0)
-#include "Cintex/Cintex.h"
-#endif
-
namespace PixelCalib{
@@ -61,11 +57,6 @@ PixelRIOs::PixelRIOs(std::string starting_tag,
m_StartingTag(starting_tag),
m_FinalTag(final_tag)
{
-
-#if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0)
- ROOT::Cintex::Cintex::Enable();
-#endif
-
m_timer = new TStopwatch;
m_timer->Start();
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/dumpVersion.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/dumpVersion.py
index 1a4d29f6e6d..2619e16f3ca 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/dumpVersion.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/dumpVersion.py
@@ -23,7 +23,6 @@ sys.argv = sys.argv[:1] + ['-b'] + sys.argv[1:]
import ROOT
# Turn off X11 requirement in ROOT
sys.argv.remove('-b')
-import PyCintex
import AthenaROOTAccess.transientTree
from optparse import OptionParser
diff --git a/InnerDetector/InDetValidation/PixelRTT/cmt/requirements b/InnerDetector/InDetValidation/PixelRTT/cmt/requirements
deleted file mode 100755
index 89a84c8d1e8..00000000000
--- a/InnerDetector/InDetValidation/PixelRTT/cmt/requirements
+++ /dev/null
@@ -1,34 +0,0 @@
-#################################################
-package PixelRTT
-
-author Simone.Montesano@cern.ch
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-use PixelCalibAlgs PixelCalibAlgs-* InnerDetector/InDetCalibAlgs
-use AtlasROOT AtlasROOT-* External
-
-private
-
-use PixelConditionsData PixelConditionsData-* InnerDetector/InDetConditions
-use PathResolver PathResolver-* Tools
-
-public
-
-library PixelValidation *.cxx
-application doPixelValidation ../Application/doPixelValidation.cxx
-
-#macro PixelRTT_TestConfiguration "../test/PixelRTT_TestConfiguration.xml"
-apply_pattern named_installed_library library=PixelValidation
-apply_pattern application_alias application=doPixelValidation
-apply_pattern declare_runtime extras="../test/*.*"
-apply_pattern declare_joboptions files="*.py"
-
-
-private
-macro_append doPixelValidationlinkopts " -lPixelValidation -lPixelOfflineCalib"
-apply_tag ROOTCintexLibs
-apply_tag ROOTMathLibs
-apply_tag ROOTGraphicsLibs
-macro_append doPixelValidation_dependencies " PixelValidation"
diff --git a/LumiBlock/LumiBlockComps/python/LumiQuery.py b/LumiBlock/LumiBlockComps/python/LumiQuery.py
index 5c3b41aef93..2fb0681810d 100644
--- a/LumiBlock/LumiBlockComps/python/LumiQuery.py
+++ b/LumiBlock/LumiBlockComps/python/LumiQuery.py
@@ -48,7 +48,6 @@ def ListFromFile(filename="FewEventsLumi.pool.root", label = "LumiBlockCollectio
"""
import ROOT
- import PyCintex
a = ROOT.TFile.Open(filename)
global LumiRangeList
LumiRangeList = []
diff --git a/LumiBlock/LumiCalc/CMakeLists.txt b/LumiBlock/LumiCalc/CMakeLists.txt
index 858e763e076..5d64a418ad6 100644
--- a/LumiBlock/LumiCalc/CMakeLists.txt
+++ b/LumiBlock/LumiCalc/CMakeLists.txt
@@ -27,8 +27,6 @@ find_package( COOL COMPONENTS CoolKernel )
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
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( LumiBlockCoolQuery
src/CoolQuery.cxx
diff --git a/LumiBlock/LumiCalc/cmt/requirements b/LumiBlock/LumiCalc/cmt/requirements
deleted file mode 100755
index 349c172d112..00000000000
--- a/LumiBlock/LumiCalc/cmt/requirements
+++ /dev/null
@@ -1,39 +0,0 @@
-package LumiCalc
-
-author EricTorrence <Eric.Torrence@cern.ch>
-manager EricTorrence <Eric.Torrence@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-use AthenaKernel AthenaKernel-* Control
-use AtlasCOOL AtlasCOOL-* External
-use AtlasCORAL AtlasCORAL-* External
-use AtlasROOT AtlasROOT-* External
-use LumiBlockData LumiBlockData-* LumiBlock
-use GoodRunsLists GoodRunsLists-* DataQuality
-use xAODLuminosity xAODLuminosity-* Event/xAOD
-
-private
-use CoraCool CoraCool-* Database -no_auto_imports
-use CoolConvUtilities CoolConvUtilities-* Database -no_auto_imports
-use DBDataModel DBDataModel-* Database/AthenaPOOL
-use DataModelRoot DataModelRoot-* Control
-use AtlasPOOL AtlasPOOL-* External
-
-public
-
-# Create a named installed library
-library LumiBlockCoolQuery CoolQuery.cxx LumiBlockRangeContainerConverter.cxx LumiCalculator.cxx ReplicaSorter.cxx LumiBlockCollectionConverter.cxx
-#apply_pattern component_library
-apply_pattern named_installed_library library=LumiBlockCoolQuery
-
-# Create a binary executable
-application iLumiCalc iLumiCalc.cxx cmdline.cxx CoolQuery.cxx LumiBlockRangeContainerConverter.cxx LumiCalculator.cxx ReplicaSorter.cxx
-macro_append iLumiCalc_dependencies " LumiBlockCoolQuery"
-apply_tag ROOTCintexLibs
-
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_scripts files="*.py *.C"
-
-
-
diff --git a/LumiBlock/LumiCalc/src/iLumiCalc.cxx b/LumiBlock/LumiCalc/src/iLumiCalc.cxx
index eb6533854c2..fb92ee5f003 100644
--- a/LumiBlock/LumiCalc/src/iLumiCalc.cxx
+++ b/LumiBlock/LumiCalc/src/iLumiCalc.cxx
@@ -25,9 +25,6 @@ int main(int argc, char * argv[]){
if (argc == 1)print_usage();
- // enable cintex for proper stl functioning in combo with ROOT
- RootType::EnableCintex();
-
// schedule for time info
TStopwatch timer;
timer.Start();
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraNtuple/cmt/requirements b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraNtuple/cmt/requirements
deleted file mode 100644
index feb02126ae6..00000000000
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraNtuple/cmt/requirements
+++ /dev/null
@@ -1,43 +0,0 @@
-package MuonCalibExtraNtuple
-author Zdenko van Kesteren <zkestere@nikhef.nl>
-author Jochem Snuverink <jsnuverink@nikhef.nl>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasROOT AtlasROOT-* External
-
-use CalibNtupleReader CalibNtupleReader-* MuonSpectrometer/MuonCalib/MuonCalibStandAlone
-
-#use CalibNtupleUtils CalibNtupleUtils-* MuonSpectrometer/MuonCalib/MuonCalibStandAlone
-
-#use TrkEventPrimitives TrkEventPrimitives-* Tracking/TrkEvent
-
-
-private
-
-use MuonCalibExtraTreeEvent MuonCalibExtraTreeEvent-* MuonSpectrometer/MuonCalib/MuonCalibExtraTree
-#use MdtCalibFitters MdtCalibFitters-* MuonSpectrometer/MuonCalib/MdtCalib
-#use MuonCalibStl MuonCalibStl-* MuonSpectrometer/MuonCalib/MuonCalibUtils
-use AtlasCLHEP AtlasCLHEP-* External
-use MuonCalibEventBase MuonCalibEventBase-* MuonSpectrometer/MuonCalib
-use MuonCalibIdentifier MuonCalibIdentifier-* MuonSpectrometer/MuonCalib
-
-
-#use MuonHoughPatternEvent MuonHoughPatternEvent-* MuonSpectrometer/MuonReconstruction/MuonRecEvent
-
-
-public
-
-library MuonCalibExtraNtuple ../src/*.cxx
-
-apply_pattern installed_library
-
-macro_append AnalyseExtraTreeNtuple_dependencies " MuonCalibExtraNtuple "
-macro_append AnalyseTwoExtraTreeNtuples_dependencies " MuonCalibExtraNtuple "
-
-private
-apply_tag ROOTMathLibs
-apply_tag ROOTGraphicsLibs
-#macro_append ROOT_linkopts " -lReflex -lCintex"
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/cmt/requirements b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/cmt/requirements
deleted file mode 100644
index cebfbf11e40..00000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/cmt/requirements
+++ /dev/null
@@ -1,33 +0,0 @@
-package MuonLayerHough
-
-
-author Niels van Eldik <niels.van.eldik@cern.ch>
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-use CxxUtils CxxUtils-* Control
-use MuonIdHelpers MuonIdHelpers-* MuonSpectrometer
-
-# Specify the required ROOT components for cmake (transparent for CMT)
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS Gpad Graf)"
-
-library MuonLayerHough ../src/*.cxx
-
-apply_pattern installed_library
-
-macro_append MainLayerAnalysis_dependencies " MuonLayerHough "
-application MainLayerAnalysis ../exe/MainLayerAnalysis.cxx
-
-
-private
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-apply_tag ROOTMathLibs
-apply_tag ROOTGraphicsLibs
-
-use AtlasROOT AtlasROOT-* External
-
-#macro_append MuonLayerHough_linkopts "-lCintex"
-
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
diff --git a/Reconstruction/MissingETPerformance/share/MyFilter.py b/Reconstruction/MissingETPerformance/share/MyFilter.py
index 3ddb3f48976..4b510146879 100644
--- a/Reconstruction/MissingETPerformance/share/MyFilter.py
+++ b/Reconstruction/MissingETPerformance/share/MyFilter.py
@@ -28,7 +28,6 @@ class METFilter( PyAthena.Alg ):
def initialize(self):
## Import needed modules
import ROOT
- import PyCintex
## Get the StoreGate service
self.storeGateSvc = PyAthena.py_svc('StoreGateSvc')
@@ -84,7 +83,6 @@ class EventFilter( PyAthena.Alg ):
def initialize(self):
## Import needed modules
import ROOT
- import PyCintex
## Get the StoreGate service
self.storeGateSvc = PyAthena.py_svc('StoreGateSvc')
diff --git a/Reconstruction/RecAlgs/src/JobInfo.cxx b/Reconstruction/RecAlgs/src/JobInfo.cxx
index 335135c9dd8..49e9107ea79 100755
--- a/Reconstruction/RecAlgs/src/JobInfo.cxx
+++ b/Reconstruction/RecAlgs/src/JobInfo.cxx
@@ -5,31 +5,12 @@
#include "JobInfo.h"
-#include "TROOT.h"
-#if ROOT_VERSION_CODE < ROOT_VERSION(6,0,0)
-#include "Cintex/Cintex.h"
-#include "Api.h"
-#include "G__ci.h"
-#include "Class.h"
-#endif
//================ Constructor =================================================
-#if ROOT_VERSION_CODE < ROOT_VERSION(6,0,0)
-namespace G__functionscope {
- extern int sm_tagdefining;
-}
-#endif
-
JobInfo::JobInfo(const std::string& name, ISvcLocator* pSvcLocator)
:
AthAlgorithm(name,pSvcLocator),
-#if ROOT_VERSION_CODE < ROOT_VERSION(6,0,0)
- m_events(0),
- m_last_entries(0),
- m_max_entries(G__functionscope::sm_tagdefining),
- m_no_warnings(true),
-#endif
m_printFATAL(false)
{
declareProperty("PrintFATAL", m_printFATAL,"flag to decide if a FATAL should be printed - protection for Tier0");
@@ -37,32 +18,5 @@ JobInfo::JobInfo(const std::string& name, ISvcLocator* pSvcLocator)
StatusCode JobInfo::execute()
{
-#if ROOT_VERSION_CODE < ROOT_VERSION(6,0,0)
- int nc=Cint::G__ClassInfo::GetNumClasses();
- if ( m_events < 2 || nc != m_last_entries )
- {
- ATH_MSG_INFO("root's CINTDictionaryArray G__struct : " << nc << " entries are in use");
- ATH_MSG_INFO(" probably around " << m_max_entries << " entries are available (unreliable - use with care !");
- if ( m_no_warnings and nc > 0.9 * m_max_entries )
- {
- ATH_MSG_WARNING("CINTDictionary : over 90% filled !!");
- m_no_warnings=false;
- }
- // will be printed at most twice (m_last_entries will be equal to nc)
- if ( nc >= m_max_entries )
- {
- if ( m_printFATAL )
- ATH_MSG_FATAL("root's CINTDictionaryArray G__struct : too many entries !! You might experience strange crashes !!");
- else
- ATH_MSG_WARNING("root's CINTDictionaryArray G__struct : too many entries !! You might experience strange crashes !!");
- }
-
- if(msgLvl(MSG::DEBUG))
- for ( int i=m_last_entries; i < nc; ++i )
- ATH_MSG_DEBUG("class " << i << " " << Cint::G__ClassInfo(i).Fullname() );
- m_last_entries=nc;
- }
- ++m_events;
-#endif
return StatusCode::SUCCESS;
}
diff --git a/Reconstruction/RecAlgs/src/JobInfo.h b/Reconstruction/RecAlgs/src/JobInfo.h
index 32221acf407..3e3bb376421 100755
--- a/Reconstruction/RecAlgs/src/JobInfo.h
+++ b/Reconstruction/RecAlgs/src/JobInfo.h
@@ -40,16 +40,6 @@ class JobInfo : public AthAlgorithm
private:
-#if ROOT_VERSION_CODE < ROOT_VERSION(6,0,0)
- int m_events;
-
- int m_last_entries;
-
- int m_max_entries;
-
- bool m_no_warnings;
-#endif
-
bool m_printFATAL;
};
diff --git a/Reconstruction/RecoAlgs/IsolationAlgs/share/CustomTrackIsoGetter.py b/Reconstruction/RecoAlgs/IsolationAlgs/share/CustomTrackIsoGetter.py
index eb7d8eac367..dc3173a906b 100644
--- a/Reconstruction/RecoAlgs/IsolationAlgs/share/CustomTrackIsoGetter.py
+++ b/Reconstruction/RecoAlgs/IsolationAlgs/share/CustomTrackIsoGetter.py
@@ -2,9 +2,9 @@ from AthenaCommon.AppMgr import ToolSvc
from AthenaCommon.AlgSequence import AlgSequence
from RecExConfig.RecFlags import rec
-import ROOT, PyCintex
-PyCintex.loadDictionary('xAODCoreRflxDict')
-PyCintex.loadDictionary('xAODPrimitivesDict')
+import ROOT, cppyy
+cppyy.loadDictionary('xAODCoreRflxDict')
+cppyy.loadDictionary('xAODPrimitivesDict')
isoPar = ROOT.xAOD.Iso
ptconeList = [[isoPar.ptcone40,isoPar.ptcone30,isoPar.ptcone20]]
diff --git a/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerBuilderFactories.py b/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerBuilderFactories.py
index 31802881e7b..6d2d473d342 100644
--- a/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerBuilderFactories.py
+++ b/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerBuilderFactories.py
@@ -21,10 +21,6 @@ class ConfigureEgammaCaloRings( object ):
self.NRings = [8, 64, 8, 8, 4, 4, 4]
self.CellMaxDEtaDist = .2
self.CellMaxDPhiDist = .2
- try:
- import cppyy
- except ImportError:
- import PyCintex as cppyy
from ROOT import CaloCell_ID
# Changes in the layers may break the algorithm because it may not be able to
# recognize whether a layer is correspondent to EM1, EM2 and so on. If it is
diff --git a/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerSelectorsBuilders.py b/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerSelectorsBuilders.py
index 7310fd8d9ec..63f4fd815c9 100644
--- a/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerSelectorsBuilders.py
+++ b/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerSelectorsBuilders.py
@@ -15,10 +15,7 @@ from CaloRingerAlgs.CaloRingerFlags import caloRingerFlags
mlog = logging.getLogger( 'CaloRingerSelectorsBuilders.py' )
mlog.info("Entering")
-try:
- import cppyy
-except ImportError:
- import PyCintex as cppyy
+import cppyy
try:
cppyy.loadDictionary('RingerSelectorToolsDict')
except RuntimeError, e:
diff --git a/Reconstruction/RecoTools/IsolationTool/share/AthTest_IsolationTool.py b/Reconstruction/RecoTools/IsolationTool/share/AthTest_IsolationTool.py
index 9e12db28558..150dd91f855 100644
--- a/Reconstruction/RecoTools/IsolationTool/share/AthTest_IsolationTool.py
+++ b/Reconstruction/RecoTools/IsolationTool/share/AthTest_IsolationTool.py
@@ -34,9 +34,9 @@ CaloIsoTool.saveOnlyRequestedCorrections = True
# CaloIsoTool.OutputLevel = 2
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]
@@ -54,4 +54,4 @@ algseq.myIsolationToolTest.Prefix = deco_prefix
algseq.myIsolationToolTest.TargetContainer = 'Muons'
algseq.myIsolationToolTest.OutputLevel = 2
-theApp.EvtMax=10
\ No newline at end of file
+theApp.EvtMax=10
diff --git a/Reconstruction/egamma/egammaPerformance/share/egammaPerformance_hist.C b/Reconstruction/egamma/egammaPerformance/share/egammaPerformance_hist.C
index ad68be63833..315c3913fb8 100755
--- a/Reconstruction/egamma/egammaPerformance/share/egammaPerformance_hist.C
+++ b/Reconstruction/egamma/egammaPerformance/share/egammaPerformance_hist.C
@@ -23,7 +23,6 @@ public:
Hists(char* ntupFileName, char* histFileName)
{
cout<<"Hists construction"<<endl;
- //Cintex::Enable();
m_file = new TFile(ntupFileName);
m_tree = (TTree*) m_file->Get("CollectionTree");
m_hlist = new TObjArray(0);
diff --git a/Reconstruction/egamma/egammaValidation/python/egammaRTT_create.py b/Reconstruction/egamma/egammaValidation/python/egammaRTT_create.py
index 3136249fcf6..486ecd35c88 100644
--- a/Reconstruction/egamma/egammaValidation/python/egammaRTT_create.py
+++ b/Reconstruction/egamma/egammaValidation/python/egammaRTT_create.py
@@ -2,13 +2,10 @@
import user
import ROOT
-import PyCintex
-
def execute(g,electron = True, photon = True, expert = False) :
from ROOT import TObjArray
-
print "::: Creating File ::: "
if(expert) :
file = ROOT.TFile("expert.root","RECREATE")
diff --git a/Reconstruction/egamma/egammaValidation/share/egammaRTTInit.py b/Reconstruction/egamma/egammaValidation/share/egammaRTTInit.py
index c739cb355e4..dd94bf22133 100644
--- a/Reconstruction/egamma/egammaValidation/share/egammaRTTInit.py
+++ b/Reconstruction/egamma/egammaValidation/share/egammaRTTInit.py
@@ -7,7 +7,6 @@
import user
import ROOT
-import PyCintex
import AthenaROOTAccess.transientTree
print "args:",sys.argv
diff --git a/Reconstruction/egamma/egammaValidation/share/egammaValidation_hist.C b/Reconstruction/egamma/egammaValidation/share/egammaValidation_hist.C
index 8cd7e35550d..06e4538dd90 100755
--- a/Reconstruction/egamma/egammaValidation/share/egammaValidation_hist.C
+++ b/Reconstruction/egamma/egammaValidation/share/egammaValidation_hist.C
@@ -16,7 +16,6 @@ public:
Hists(char* ntupFileName, char* histFileName)
{
cout<<"Hists construction"<<endl;
- //Cintex::Enable();
m_file = new TFile(ntupFileName);
m_tree = (TTree*) m_file->Get("CollectionTree");
m_hlist = new TObjArray(0);
diff --git a/Tools/PyJobTransformsCore/python/ValidateRootFile.py b/Tools/PyJobTransformsCore/python/ValidateRootFile.py
index a86175dfc54..c207ce451d6 100755
--- a/Tools/PyJobTransformsCore/python/ValidateRootFile.py
+++ b/Tools/PyJobTransformsCore/python/ValidateRootFile.py
@@ -17,7 +17,6 @@ def checkPFCorruption(filename,verbose=False):
ROOT = RootUtils.import_root()
from ROOT import TFile,TTree
- import PyCintex
try:
f=TFile.Open(filename)
diff --git a/graphics/AtlantisJava/share/InteractiveServer.py b/graphics/AtlantisJava/share/InteractiveServer.py
index 18ce6fafe4f..1b1adeb2a9c 100755
--- a/graphics/AtlantisJava/share/InteractiveServer.py
+++ b/graphics/AtlantisJava/share/InteractiveServer.py
@@ -48,14 +48,7 @@
import os, sys, math, traceback, random, time, StringIO, getopt, md5, base64
import SocketServer
from SimpleXMLRPCServer import SimpleXMLRPCServer,SimpleXMLRPCRequestHandler
-try:
- import pylcgdict
-except:
- print "not using pylcgdict"
-try:
- import PyCintex as pylcgdict
-except:
- print "not using PyCintex"
+import cppyy
class AsyncXMLRPCServer(SocketServer.ThreadingMixIn, SimpleXMLRPCServer): pass
@@ -244,7 +237,7 @@ class InteractiveServer:
print "callVertexFit(tracksId = '%s')" % tracksId
- pylcgdict.loadDictionary('SealSTLDict')
+ cppyy.loadDictionary('SealSTLDict')
g.std.vector(int)
vi = g.std.vector(int)(0)
@@ -391,14 +384,14 @@ class InteractiveServer:
# theApp.toolsvc().retrieve('ToolSvc.VxWrapperTool')._itool
self.vxTool = \
theApp.toolsvc().create('VxWrapperTool','VxWrapperTool',
- pylcgdict.Pointer(g.IInterface)(0))._itool
+ cppyy.Pointer(g.IInterface)(0))._itool
print "Getting JiveXML AlgTool (ToolSvc.EventData2XML)"
# self.visTool = \
# theApp.toolsvc().retrieve('ToolSvc.EventData2XML')._itool
self.visTool = \
theApp.toolsvc().create('EventData2XML','EventData2XML',
- pylcgdict.Pointer(g.IInterface)(0))._itool
+ cppyy.Pointer(g.IInterface)(0))._itool
# createAlgTools() ------------------------------------------------------
--
GitLab