diff --git a/Calorimeter/CaloCondBlobAlgs/python/CaloCondTools.py b/Calorimeter/CaloCondBlobAlgs/python/CaloCondTools.py
index 8c559f4cc89de42db7f4b0828cb5a574c99a8e7e..c0c95f9f58599393e13a429e5961db4e399b665a 100644
--- a/Calorimeter/CaloCondBlobAlgs/python/CaloCondTools.py
+++ b/Calorimeter/CaloCondBlobAlgs/python/CaloCondTools.py
@@ -8,10 +8,10 @@
Python helper module for managing COOL DB connections and CaloCondBlobs.
"""
-import PyCintex
+import cppyy
from PyCool import cool
import time, types, re
-g = PyCintex.gbl
+g = cppyy.gbl
#=== get a logger
diff --git a/Calorimeter/CaloCondBlobAlgs/share/CaloCondBlobAlgs_fillNoiseFromASCII.py b/Calorimeter/CaloCondBlobAlgs/share/CaloCondBlobAlgs_fillNoiseFromASCII.py
index d63d569a9c985b0bc5d265df9ac21a7c19de99b1..8ab8457e0d63cda0bdc6760ff38d01ff8ec345f8 100755
--- a/Calorimeter/CaloCondBlobAlgs/share/CaloCondBlobAlgs_fillNoiseFromASCII.py
+++ b/Calorimeter/CaloCondBlobAlgs/share/CaloCondBlobAlgs_fillNoiseFromASCII.py
@@ -2,7 +2,7 @@
# CaloCondBlobAlgs_fillNoiseFromASCII
# Nils Gollub <nils.gollub@cern.ch>, 2008-01-11
-import PyCintex
+import cppyy
from PyCool import cool
from CaloCondBlobAlgs import CaloCondTools, CaloCondLogger
@@ -31,8 +31,8 @@ comment = "Default cell noise values from Guillaume"
#===
#==================================================
#=== set shortcut
-g = PyCintex.gbl
-PyCintex.makeClass('std::vector<float>')
+g = cppyy.gbl
+cppyy.makeClass('std::vector<float>')
#=== get a logger
log = CaloCondLogger.getLogger("CaloNoiseWriter")
diff --git a/Calorimeter/CaloCondBlobAlgs/share/CaloCondBlobAlgs_fillPedestalFromASCII.py b/Calorimeter/CaloCondBlobAlgs/share/CaloCondBlobAlgs_fillPedestalFromASCII.py
index b3d3ea0d08ea9926329270eb12d02c04aed99dcf..ce3daeb025577dbb64531ce3513e37220eae812b 100755
--- a/Calorimeter/CaloCondBlobAlgs/share/CaloCondBlobAlgs_fillPedestalFromASCII.py
+++ b/Calorimeter/CaloCondBlobAlgs/share/CaloCondBlobAlgs_fillPedestalFromASCII.py
@@ -2,7 +2,7 @@
# CaloCondBlobAlgs_fillPedestalFromASCII
# Nils Gollub <nils.gollub@cern.ch>, 2008-01-11
-import PyCintex
+import cppyy
from PyCool import cool
from CaloCondBlobAlgs import CaloCondTools, CaloCondLogger
@@ -31,8 +31,8 @@ comment = "to fill pedestal shifts"
#===
#==================================================
#=== set shortcut
-g = PyCintex.gbl
-PyCintex.makeClass('std::vector<float>')
+g = cppyy.gbl
+cppyy.makeClass('std::vector<float>')
#=== get a logger
log = CaloCondLogger.getLogger("CaloNoiseWriter")
diff --git a/Calorimeter/CaloCondPhysAlgs/python/CaloBlobWriter.py b/Calorimeter/CaloCondPhysAlgs/python/CaloBlobWriter.py
index fbc9feca7a8008350d74b0b7cebe5ec5d279cf3a..958b0331f6daf07180a25ce9d17a2c91e12f8886 100644
--- a/Calorimeter/CaloCondPhysAlgs/python/CaloBlobWriter.py
+++ b/Calorimeter/CaloCondPhysAlgs/python/CaloBlobWriter.py
@@ -2,7 +2,6 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
import ROOT
-import PyCintex
from PyCool import cool
import os
#from CaloCondBlobAlgs import CaloCondTools, CaloCondLogger
@@ -11,8 +10,6 @@ def CaloCondBlobWriter(spec,valuePairs,defaultValue):
vec=getattr(ROOT,'vector<float>')
vecvec=getattr(ROOT,'vector<vector<float> >')
- #g = PyCintex.gbl
- #PyCintex.makeClass('std::vector<float>')
#Build the defintion vector (1 value per gain)
gainDefVec = vec()#g.std.vector('float')()
diff --git a/Calorimeter/CaloCondPhysAlgs/share/CaloNoise_fillDB.py b/Calorimeter/CaloCondPhysAlgs/share/CaloNoise_fillDB.py
index 1433c9c3adf77cb31363632bfc3c7b0ae581b678..611140da64d9f8fc12b1d1fc2178ddb907d5d9d1 100755
--- a/Calorimeter/CaloCondPhysAlgs/share/CaloNoise_fillDB.py
+++ b/Calorimeter/CaloCondPhysAlgs/share/CaloNoise_fillDB.py
@@ -61,7 +61,6 @@ import ROOT
import cppyy
from PyCool import cool
from CaloCondBlobAlgs import CaloCondTools, CaloCondLogger
-#PyCintex.loadDict("STLAddRflx")
#==================================================
#===
@@ -89,8 +88,6 @@ comment = "Updated noise values"
#===
#==================================================
#=== set shortcut
-#PyCintex.makeClass('std::vector<float>')
-#PyCintex.loadDict("STLAddRflx")
cppyy.loadDictionary("STLAddRflx")
#=== get a logger
@@ -126,7 +123,6 @@ try:
#==================================================
#=== default a and b to be used for each gain
gainDefVec = ROOT.std.vector('float')()
- #gainDefVec = PyCintex.gbl.std.vector('float')()
gainDefVec.push_back(0.) # a
gainDefVec.push_back(0.) # b
#=== three gains per channel for LAr
diff --git a/Calorimeter/CaloCondPhysAlgs/share/CaloPedestal_fillDB.py b/Calorimeter/CaloCondPhysAlgs/share/CaloPedestal_fillDB.py
index 3b04f6f51c51ec912f21fe4374e9923434d350f3..c04cea818ae0fc09fbbd1864e5bc6ff69b4df472 100755
--- a/Calorimeter/CaloCondPhysAlgs/share/CaloPedestal_fillDB.py
+++ b/Calorimeter/CaloCondPhysAlgs/share/CaloPedestal_fillDB.py
@@ -18,7 +18,7 @@ lbkUntil = sys.argv[4]
print "runUntil ", runUntil, lbkUntil
-import PyCintex
+import cppyy
from PyCool import cool
from CaloCondBlobAlgs import CaloCondTools, CaloCondLogger
@@ -51,8 +51,8 @@ comment = "Updated pedestal shift values"
#===
#==================================================
#=== set shortcut
-g = PyCintex.gbl
-PyCintex.makeClass('std::vector<float>')
+g = cppyy.gbl
+cppyy.makeClass('std::vector<float>')
#=== get a logger
log = CaloCondLogger.getLogger("CaloNoiseWriter")
diff --git a/Calorimeter/CaloCondPhysAlgs/share/CaloTime_fillDB.py b/Calorimeter/CaloCondPhysAlgs/share/CaloTime_fillDB.py
index b369d2abeb8dedc257897b6678ddce9b209ec154..a146c7576f286ab003e687d39b90e7ef4fbb0c9e 100755
--- a/Calorimeter/CaloCondPhysAlgs/share/CaloTime_fillDB.py
+++ b/Calorimeter/CaloCondPhysAlgs/share/CaloTime_fillDB.py
@@ -20,7 +20,7 @@ lbkUntil = sys.argv[4]
print "runSince ", runSince, lbkSince
print "runUntil ", runUntil, lbkUntil
-import PyCintex
+import cppyy
from PyCool import cool
from CaloCondBlobAlgs import CaloCondTools, CaloCondLogger
@@ -61,8 +61,8 @@ comment = "Updated time constant values"
#===
#==================================================
#=== set shortcut
-g = PyCintex.gbl
-PyCintex.makeClass('std::vector<float>')
+g = cppyy.gbl
+cppyy.makeClass('std::vector<float>')
#=== get a logger
log = CaloCondLogger.getLogger("CaloTimeConsWriter")
diff --git a/Calorimeter/CaloExample/CaloTests/share/CaloTests_HistoComparison.py b/Calorimeter/CaloExample/CaloTests/share/CaloTests_HistoComparison.py
index 4a88f0906395608538e1acdd3cbe97547729915f..cf7dcc466cfc4cf5d9b40fea9bc68210c1e33a70 100644
--- a/Calorimeter/CaloExample/CaloTests/share/CaloTests_HistoComparison.py
+++ b/Calorimeter/CaloExample/CaloTests/share/CaloTests_HistoComparison.py
@@ -2,8 +2,6 @@
import os,commands,sys,logging
import ROOT
-import PyCintex
-#PyCintex.Enable()
class myHist:
def __init__(self,histName,histComment,histBins,histMinX,histMaxX,histFormula,histCondForm):
diff --git a/Calorimeter/CaloExample/CaloTests/share/CaloTests_Truth.py b/Calorimeter/CaloExample/CaloTests/share/CaloTests_Truth.py
index 948035e92a34feb670d41c5e532e27c21f56cb30..ad2577b3c5f5fe10c0a677d003e81731aeeecadd 100644
--- a/Calorimeter/CaloExample/CaloTests/share/CaloTests_Truth.py
+++ b/Calorimeter/CaloExample/CaloTests/share/CaloTests_Truth.py
@@ -3,8 +3,6 @@
import os,commands,sys,logging
import ROOT
import time,math,cmath
-#import PyCintex
-#PyCintex.Enable()
class CaloTests_Truth:
def __init__(self,log,logLevel):
diff --git a/Calorimeter/CaloExample/CaloTests/share/DrawHists.py b/Calorimeter/CaloExample/CaloTests/share/DrawHists.py
index 55bcc18a74f05da7f59ce5cdb86be6a98378cc0d..d9bb9e5f63a7faa41291113436f1ab8eeb6de973 100755
--- a/Calorimeter/CaloExample/CaloTests/share/DrawHists.py
+++ b/Calorimeter/CaloExample/CaloTests/share/DrawHists.py
@@ -2,8 +2,6 @@
import os,commands,sys,logging
import ROOT
-import PyCintex
-#PyCintex.Enable()
class myHist:
def __init__(self,histName,histComment,histBins,histMinX,histMaxX,histFormula,histCondForm):
diff --git a/Calorimeter/CaloExample/CaloTests/share/HistoComparison.py b/Calorimeter/CaloExample/CaloTests/share/HistoComparison.py
index 1b70a020b53087db80935af137bfcf697ee0ee5a..1fe7632dde3a78eb324691a29681c1cb2924859b 100755
--- a/Calorimeter/CaloExample/CaloTests/share/HistoComparison.py
+++ b/Calorimeter/CaloExample/CaloTests/share/HistoComparison.py
@@ -2,8 +2,6 @@
import os,commands,sys,logging
import ROOT
-import PyCintex
-#PyCintex.Enable()
class myHist:
def __init__(self,histName,histComment,histBins,histMinX,histMaxX,histFormula,histCondForm):
diff --git a/Calorimeter/CaloExample/CaloTests/share/Truth.py b/Calorimeter/CaloExample/CaloTests/share/Truth.py
index b1e8b5035eff4bebbdd3c2671c03ed07987e3f6d..b45380558ba7458ca7c362bbd9420f5a5bfd572f 100755
--- a/Calorimeter/CaloExample/CaloTests/share/Truth.py
+++ b/Calorimeter/CaloExample/CaloTests/share/Truth.py
@@ -3,8 +3,6 @@
import os,commands,sys,logging
import ROOT
import time,math,cmath
-#import PyCintex
-#PyCintex.Enable()
class Truth:
def __init__(self,log,logLevel):
diff --git a/LArCalorimeter/LArBadChannelTool/python/LArBadChannelBrowserLib.py b/LArCalorimeter/LArBadChannelTool/python/LArBadChannelBrowserLib.py
index 09d8ff3d0cb01d4543e62b020db5afd14171813a..709ad6756b748d5fea7e099a963573fc0ac1e524 100644
--- a/LArCalorimeter/LArBadChannelTool/python/LArBadChannelBrowserLib.py
+++ b/LArCalorimeter/LArBadChannelTool/python/LArBadChannelBrowserLib.py
@@ -5,16 +5,12 @@ from AthenaPython.PyAthena import StatusCode
import AthenaPython.PyAthena as PyAthena
import sys,os
from PyCool import cool,coral
-
-import PyCintex as PyLCGDict
+import cppyy
import LArBadChannelBrowserTools
import LArDBFolderBrowser_BadChan
import LArDBFolderBrowser_MissingFEBs
-import PyCintex
-#PyCintex.loadDictionary("libBadChanDict")
-
STATUS_INIT="INIT"
STATUS_NEW="NEW"
STATUS_REMOVED="DEL"
@@ -75,13 +71,6 @@ class LArBadChannelBrowserAlg(PyAthena.Alg):
else:
self.msg.info('retrieved [%s]', self.msgSvc.name())
-
-# f=open("pycintex.txt","w")
-# f.write(str(PyCintex.getAllClasses()))
-# f.close()
-# print PyCintex.getAllClasses()
-
-
# -----------------------------------------------------------
# get database service and open database
self.msg.debug('retrieve database service...')
@@ -141,12 +130,12 @@ class LArBadChannelBrowserAlg(PyAthena.Alg):
# -----------------------------------------------------------
# Create an objec instance for all interfaced python classes
- LArBadChannelDBTools=PyCintex.makeNamespace('LArBadChannelDBTools')
+ LArBadChannelDBTools=cppyy.makeNamespace('LArBadChannelDBTools')
self.nspace_LArBadChannelDBTools=LArBadChannelDBTools()
- self.class_LArBadChannel=PyCintex.makeClass('LArBadChannel')
- self.class_HWIdentifier=PyCintex.makeClass('HWIdentifier')
- self.class_LArBadChanBitPacking=PyCintex.makeClass("LArBadChanBitPacking")
+ self.class_LArBadChannel=cppyy.makeClass('LArBadChannel')
+ self.class_HWIdentifier=cppyy.makeClass('HWIdentifier')
+ self.class_LArBadChanBitPacking=cppyy.makeClass("LArBadChanBitPacking")
if self.folderId==BAD_CHANNEL:
self.dbBrowserBadChan=LArDBFolderBrowser_BadChan.LArDBFolderBrowser_BadChan(self.nspace_LArBadChannelDBTools,
diff --git a/LArCalorimeter/LArBadChannelTool/python/LArDBFolderBrowser_BadChan.py b/LArCalorimeter/LArBadChannelTool/python/LArDBFolderBrowser_BadChan.py
index a924454d679415bdd82b87c426d88144b332b9de..05e9cd2c6f3d1e3ba0fe2cbaea092ad0952b725b 100644
--- a/LArCalorimeter/LArBadChannelTool/python/LArDBFolderBrowser_BadChan.py
+++ b/LArCalorimeter/LArBadChannelTool/python/LArDBFolderBrowser_BadChan.py
@@ -9,12 +9,9 @@ from PyCool import cool,coral
from GaudiKernel.Constants import *
import logging
-import PyCintex as PyLCGDict
-
import LArBadChannelBrowserTools
-import PyCintex
-#PyCintex.loadDictionary("libBadChanDict")
+import cppyy
STATUS_INIT="INIT"
STATUS_NEW="NEW"
@@ -257,7 +254,7 @@ class LArDBFolderBrowser_BadChan():
def BadChan_GetCoolChannelNameFromHWIdentifier(self,sHWid):
""" Get channel name from HW identifier (only for text menu purpose)"""
- self.class_LArBadChannelState=PyCintex.makeClass('LArBadChannelState')
+ self.class_LArBadChannelState=cppyy.makeClass('LArBadChannelState')
inst_larBadChannelState=self.class_LArBadChannelState()
sChannelName=""
@@ -608,7 +605,7 @@ class LArDBFolderBrowser_BadChan():
listKeys.sort()
# Create LArBadChannel object for defined BadChanEntry vector and coolChan
- self.class_LArBadChannelState=PyCintex.makeClass('LArBadChannelState')
+ self.class_LArBadChannelState=cppyy.makeClass('LArBadChannelState')
inst_larBadChannelState=self.class_LArBadChannelState()
# Loop over cool channels
@@ -616,7 +613,7 @@ class LArDBFolderBrowser_BadChan():
bNewDBCreated=False
for coolChan in listKeys:
- vect_BadChanEntry=PyCintex.gbl.std.vector('std::pair<HWIdentifier,LArBadChannel>')()
+ vect_BadChanEntry=cppyy.gbl.std.vector('std::pair<HWIdentifier,LArBadChannel>')()
listHWidKeys=[x for x in self.dict_vectBadChanEntry[coolChan].keys()]
listHWidKeys.sort()
@@ -637,7 +634,7 @@ class LArDBFolderBrowser_BadChan():
obj_HWid.set(sHWid)
larBadChannel=self.class_LArBadChannel(badChan_word)
- pair_BadChanEntry=PyCintex.gbl.pair('HWIdentifier,LArBadChannel')(obj_HWid, larBadChannel)
+ pair_BadChanEntry=cppyy.gbl.pair('HWIdentifier,LArBadChannel')(obj_HWid, larBadChannel)
vect_BadChanEntry.push_back(pair_BadChanEntry)
# if correction were made => store BadChanEntry vector
@@ -649,8 +646,8 @@ class LArDBFolderBrowser_BadChan():
continue
# Create object based on new LArBadChannelState (via LArBadChannelDBTools python interface)
- attrListSpec=PyCintex.gbl.coral.AttributeListSpecification()
- athenaAttrList=PyCintex.gbl.AthenaAttributeList()
+ attrListSpec=cppyy.gbl.coral.AttributeListSpecification()
+ athenaAttrList=cppyy.gbl.AthenaAttributeList()
attrListSpec=self.nspace_LArBadChannelDBTools.createCoolSpec()
athenaAttrList=self.nspace_LArBadChannelDBTools.createPayload(inst_larBadChannelState.coolChannel(coolChan), attrListSpec)
diff --git a/LArCalorimeter/LArBadChannelTool/python/LArDBFolderBrowser_MissingFEBs.py b/LArCalorimeter/LArBadChannelTool/python/LArDBFolderBrowser_MissingFEBs.py
index 4f9a4b6a8e8c2284890f54a3266c38ef87ac2b44..b74e267399efdbce80a2b111d94d17ec63c667dd 100644
--- a/LArCalorimeter/LArBadChannelTool/python/LArDBFolderBrowser_MissingFEBs.py
+++ b/LArCalorimeter/LArBadChannelTool/python/LArDBFolderBrowser_MissingFEBs.py
@@ -7,12 +7,9 @@ import sys
import os
from PyCool import cool,coral
-import PyCintex as PyLCGDict
-
import LArBadChannelBrowserTools
-import PyCintex
-#PyCintex.loadDictionary("libBadChanDict")
+import cppyy
STATUS_INIT="INIT"
STATUS_NEW="NEW"
@@ -305,7 +302,7 @@ class LArDBFolderBrowser_MissingFEBs():
bStoreNewCoolChannels=False
bNewDBCreated=False
- vect_MissingFebHWid=PyCintex.gbl.std.vector('HWIdentifier')()
+ vect_MissingFebHWid=cppyy.gbl.std.vector('HWIdentifier')()
coolChan=0
listHWidKeys=[x for x in self.dict_vectMissingFebHWid[coolChan].keys()]
@@ -336,8 +333,8 @@ class LArDBFolderBrowser_MissingFEBs():
return
# Create object based on new LArBadChannelState (via LArBadChannelDBTools python interface)
- attrListSpec=PyCintex.gbl.coral.AttributeListSpecification()
- athenaAttrList=PyCintex.gbl.AthenaAttributeList()
+ attrListSpec=cppyy.gbl.coral.AttributeListSpecification()
+ athenaAttrList=cppyy.gbl.AthenaAttributeList()
attrListSpec=self.nspace_LArBadChannelDBTools.createCoolSpec()
athenaAttrList=self.nspace_LArBadChannelDBTools.createFebPayload(vect_MissingFebHWid)
diff --git a/LArCalorimeter/LArCafJobs/src/LArSamplesMerge.cxx b/LArCalorimeter/LArCafJobs/src/LArSamplesMerge.cxx
index 5e50f74dc667027aee8601bb27b88b8f25b3aa97..d5cdfa85bbc8930870942092ca4e50823db25483 100644
--- a/LArCalorimeter/LArCafJobs/src/LArSamplesMerge.cxx
+++ b/LArCalorimeter/LArCafJobs/src/LArSamplesMerge.cxx
@@ -1,3 +1,4 @@
+
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
@@ -13,10 +14,6 @@
#include "TApplication.h"
#include "TSystem.h"
-#if ROOT_VERSION_CODE < ROOT_VERSION(6,0,0)
-#include "Cintex/Cintex.h"
-#endif
-
using namespace LArSamples;
int main(int argc, char** argv) {
@@ -29,10 +26,6 @@ int main(int argc, char** argv) {
TROOT root ("root", "root");
-#if ROOT_VERSION_CODE < ROOT_VERSION(6,0,0)
- ROOT::Cintex::Cintex::Enable();
- #endif
-
gSystem->Load("libLArCafJobsDict.so");
std::vector<TString> inFileNames;
diff --git a/LArCalorimeter/LArExample/LArConditionsCommon/python/LArCellConditionsAlg.py b/LArCalorimeter/LArExample/LArConditionsCommon/python/LArCellConditionsAlg.py
index 07034b745707635fcb94af912dc51d3f79392591..221b3aa7e7228e6c614bcbb1249137bd85345a5f 100644
--- a/LArCalorimeter/LArExample/LArConditionsCommon/python/LArCellConditionsAlg.py
+++ b/LArCalorimeter/LArExample/LArConditionsCommon/python/LArCellConditionsAlg.py
@@ -15,7 +15,6 @@ __doc__ = " An athena-like algorithm to interactivly convert LAr Identifiers and
from AthenaPython.PyAthena import StatusCode
import AthenaPython.PyAthena as PyAthena
-#import PyCintex as PyLCGDict
import cppyy
from ROOT import HWIdentifier, Identifier, Identifier32, IdentifierHash, LArBadChannel
@@ -88,13 +87,6 @@ class LArCellConditionsAlg(PyAthena.Alg):
else:
self.msg.info('retrieved [%s]', self.msgSvc.name())
-
-# f=open("pycintex.txt","w")
-# f.write(str(PyCintex.getAllClasses()))
-# f.close()
-# print PyCintex.getAllClasses()
-
-
# Get DetectorStore...
from StoreGateBindings.Bindings import StoreGate
self._detStore = StoreGate.pointer("DetectorStore")
diff --git a/LArCalorimeter/LArExample/LArConditionsCommon/share/DumpLArCondData_Config.py b/LArCalorimeter/LArExample/LArConditionsCommon/share/DumpLArCondData_Config.py
index 37eaae17be2f941e479bfc1efc3fb17973ae7c9c..5df93e2ae2baf83420df0b131bdd9e270571e8ee 100755
--- a/LArCalorimeter/LArExample/LArConditionsCommon/share/DumpLArCondData_Config.py
+++ b/LArCalorimeter/LArExample/LArConditionsCommon/share/DumpLArCondData_Config.py
@@ -51,7 +51,6 @@ include( "LArCondAthenaPool/LArCondAthenaPool_joboptions.py" )
#--------------------------------------------------------------
# Py related.
#--------------------------------------------------------------
-import PyCintex
# interactive Athena
from PyKernel import PyKernel
# this must be the last one, since proxy classes are patched by this
diff --git a/LArCalorimeter/LArG4TB/H6G4Sim/python/h6prod_getxy.py b/LArCalorimeter/LArG4TB/H6G4Sim/python/h6prod_getxy.py
index d91f0d4b683565b727b5587f4f0807c28788274a..9ed56f48d55071d6c42612f08c1a910c10dc720b 100644
--- a/LArCalorimeter/LArG4TB/H6G4Sim/python/h6prod_getxy.py
+++ b/LArCalorimeter/LArG4TB/H6G4Sim/python/h6prod_getxy.py
@@ -3,7 +3,6 @@
import os, sys, string
from math import sqrt
import ROOT
-import PyCintex
from array import array
from math import sqrt
diff --git a/LArCalorimeter/LArRawConditions/python/LArConditionsContainer.py b/LArCalorimeter/LArRawConditions/python/LArConditionsContainer.py
index 2f93e82b550a095a54850dbfaee625ca88e01ae0..80ba53a72290fa1c1ef555da890a4f57f5bfe478 100755
--- a/LArCalorimeter/LArRawConditions/python/LArConditionsContainer.py
+++ b/LArCalorimeter/LArRawConditions/python/LArConditionsContainer.py
@@ -17,7 +17,7 @@
# conditions
#
-import PyCintex as PyLCGDict
+import cppyy
def conditionsIter(self, gain) :
sequential = self.begin(gain)
@@ -57,7 +57,7 @@ class LArConditionsContainer(object) :
# t is either the class name or the class itself
if type(t) is str :
self.typeName = t
- t = PyLCGDict.makeClass(t)
+ t = cppyy.makeClass(t)
else :
self.typeName = t.type.__name__
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/share/pyCIStiming/aux_functions.py b/TileCalorimeter/TileCalib/TileCalibAlgs/share/pyCIStiming/aux_functions.py
index 2224029dc31ab11422cc3a834f5127b4f01891df..466d2f890dbfa1c8e1191258cd8cb8cfdf0306f6 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/share/pyCIStiming/aux_functions.py
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/share/pyCIStiming/aux_functions.py
@@ -27,8 +27,6 @@ def checkPMTValid(ros, pmt):
def checkChannelValid(ros, mod, chan):
- #util = PyCintex.gbl.TileCalibUtils()
-
ros += 1
# ROS Format:
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/share/pyCIStiming/calc_mb_corr.py b/TileCalorimeter/TileCalib/TileCalibAlgs/share/pyCIStiming/calc_mb_corr.py
index 652661ad7147df2ec1fb103fc9332a5411ca3f17..7beb040748ef28a8faf5ff1d7560b59582ecd821 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/share/pyCIStiming/calc_mb_corr.py
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/share/pyCIStiming/calc_mb_corr.py
@@ -1,10 +1,8 @@
#!/bin/env python
# Author: Michael Miller <miller@uchicago.edu>
-
import os, struct, sys
import ROOT
-import PyCintex
from aux_functions import *
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobObjs/python/Classes.py b/TileCalorimeter/TileCalib/TileCalibBlobObjs/python/Classes.py
index eb6d750e54683513d593de343d3fbfba34456488..2882e1e82a1e105e3106767d9da76d1e5847b59f 100644
--- a/TileCalorimeter/TileCalib/TileCalibBlobObjs/python/Classes.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobObjs/python/Classes.py
@@ -1,19 +1,16 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-try:
- import PyCintex
-except:
- import cppyy as PyCintex
+import cppyy
-TileCalibUtils = PyCintex.gbl.TileCalibUtils
-TileCalibDrawerCmt = PyCintex.gbl.TileCalibDrawerCmt
-TileCalibDrawerFlt = PyCintex.gbl.TileCalibDrawerFlt
-TileCalibDrawerBch = PyCintex.gbl.TileCalibDrawerBch
-TileCalibDrawerOfc = PyCintex.gbl.TileCalibDrawerOfc
-TileCalibDrawerInt = PyCintex.gbl.TileCalibDrawerInt
-TileCalibType = PyCintex.gbl.TileCalibType
+TileCalibUtils = cppyy.gbl.TileCalibUtils
+TileCalibDrawerCmt = cppyy.gbl.TileCalibDrawerCmt
+TileCalibDrawerFlt = cppyy.gbl.TileCalibDrawerFlt
+TileCalibDrawerBch = cppyy.gbl.TileCalibDrawerBch
+TileCalibDrawerOfc = cppyy.gbl.TileCalibDrawerOfc
+TileCalibDrawerInt = cppyy.gbl.TileCalibDrawerInt
+TileCalibType = cppyy.gbl.TileCalibType
-TileBchDecoder = PyCintex.gbl.TileBchDecoder
-TileBchWords = PyCintex.gbl.TileBchWords
-TileBchPrbs = PyCintex.gbl.TileBchPrbs
-TileBchStatus = PyCintex.gbl.TileBchStatus
+TileBchDecoder = cppyy.gbl.TileBchDecoder
+TileBchWords = cppyy.gbl.TileBchWords
+TileBchPrbs = cppyy.gbl.TileBchPrbs
+TileBchStatus = cppyy.gbl.TileBchStatus
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileBchTools.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileBchTools.py
index 667bcc7d98ce0fc894b3cd8739248b956bb511fb..93259057ffe3c7d412cf4f68604055635babb567 100644
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileBchTools.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileBchTools.py
@@ -14,14 +14,7 @@ Python module for managing TileCal ADC status words.
"""
-#import PyCintex
-try:
- # ROOT5
- import PyCintex
-except:
- # ROOT6
- import cppyy as PyCintex
- sys.modules['PyCintex'] = PyCintex
+import cppyy
from TileCalibBlobObjs.Classes import *
from TileCalibBlobPython import TileCalibTools
@@ -432,14 +425,14 @@ class TileBchMgr(TileCalibLogger):
self.log().info("... comment: \'%s\'" % comment )
#=== default for drawer initialization
- loGainDefVec = PyCintex.gbl.std.vector('unsigned int')()
+ loGainDefVec = cppyy.gbl.std.vector('unsigned int')()
loGainDefVec.push_back(0)
- hiGainDefVec = PyCintex.gbl.std.vector('unsigned int')()
+ hiGainDefVec = cppyy.gbl.std.vector('unsigned int')()
hiGainDefVec.push_back(0)
- comChnDefVec = PyCintex.gbl.std.vector('unsigned int')()
+ comChnDefVec = cppyy.gbl.std.vector('unsigned int')()
comChnDefVec.push_back(0)
- PyCintex.makeClass('std::vector<unsigned int>')
- defVec = PyCintex.gbl.std.vector('std::vector<unsigned int>')()
+ cppyy.makeClass('std::vector<unsigned int>')
+ defVec = cppyy.gbl.std.vector('std::vector<unsigned int>')()
defVec.push_back(loGainDefVec)
defVec.push_back(hiGainDefVec)
defVec.push_back(comChnDefVec)
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCalibDefaultWriter.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCalibDefaultWriter.py
index e782e4d253c25aa34bd107b0b352f34a9c742507..140a2a1fdcfc986723f6059316a7a24e5668222e 100644
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCalibDefaultWriter.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCalibDefaultWriter.py
@@ -24,14 +24,7 @@ self.__tilePrefixOfl1
"""
-#import PyCintex
-try:
- # ROOT5
- import PyCintex
-except:
- # ROOT6
- import cppyy as PyCintex
- sys.modules['PyCintex'] = PyCintex
+import cppyy
from TileCalibBlobPython import TileCalibTools
from TileCalibBlobPython.TileCalibTools import MINRUN, MINLBK, MAXRUN, MAXLBK, LASPARTCHAN
@@ -70,8 +63,8 @@ class TileCalibDefaultWriter(TileCalibLogger):
self.__tilePrefixOfl = TileCalibTools.getTilePrefix(True,True)
self.__tilePrefixOnl = TileCalibTools.getTilePrefix(False)
#=== force the creation of template classes
- PyCintex.makeClass('std::vector<float>')
- PyCintex.makeClass('std::vector<unsigned int>')
+ cppyy.makeClass('std::vector<float>')
+ cppyy.makeClass('std::vector<unsigned int>')
except Exception, e:
self.log().critical( e )
@@ -83,11 +76,11 @@ class TileCalibDefaultWriter(TileCalibLogger):
(loGainDef,hiGainDef,tag) )
#=== fill LIN (linear) folders first
- loGainDefVec = PyCintex.gbl.std.vector('float')()
+ loGainDefVec = cppyy.gbl.std.vector('float')()
loGainDefVec.push_back(loGainDef)
- hiGainDefVec = PyCintex.gbl.std.vector('float')()
+ hiGainDefVec = cppyy.gbl.std.vector('float')()
hiGainDefVec.push_back(hiGainDef)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(loGainDefVec)
defVec.push_back(hiGainDefVec)
@@ -105,7 +98,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
blobWriter = TileCalibTools.TileBlobWriter(self.__db,folder,'Flt',multiVers)
#=== initialize all channels
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = blobWriter.zeroBlob(ros,drawer)
@@ -120,7 +113,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
#=== fill NLN (non-linear) folders with unit corretion
#=== Note: first insert all x values, then all y values
#=== LUT for all channels and gains must have the same length
- lut = PyCintex.gbl.std.vector('float')()
+ lut = cppyy.gbl.std.vector('float')()
lut.push_back(0.) # x1
lut.push_back(1.) # y1
defVec.clear()
@@ -152,9 +145,9 @@ class TileCalibDefaultWriter(TileCalibLogger):
self.log().info( "*** Writing Las default (1.) with tag %s" % tag )
#=== write linear (LIN) folders online and offline
- lasDef = PyCintex.gbl.std.vector('float')()
+ lasDef = cppyy.gbl.std.vector('float')()
lasDef.push_back(1.)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(lasDef)
#=== write both to offline and online folders
@@ -167,7 +160,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
blobWriter = TileCalibTools.TileBlobWriter(self.__db,folder,'Flt',multiVers)
#=== initialize all channels
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = blobWriter.zeroBlob(ros,drawer)
@@ -180,7 +173,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
blobWriter.register((MINRUN,MINLBK),(MAXRUN,MAXLBK),folderTag)
#=== fill NLN (non-linear) folders with unit corretion
- lut = PyCintex.gbl.std.vector('float')()
+ lut = cppyy.gbl.std.vector('float')()
lut.push_back(0.) # x1
lut.push_back(1.) # y1
defVec.clear()
@@ -195,7 +188,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
blobWriter = TileCalibTools.TileBlobWriter(self.__db,folder,'Flt',multiVers)
#=== initialize all channels
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = blobWriter.zeroBlob(ros,drawer)
@@ -215,13 +208,13 @@ class TileCalibDefaultWriter(TileCalibLogger):
fibFolder = self.__tilePrefixOfl+"CALIB/LAS/FIBER"
#=== write fiber folder
- lasDef = PyCintex.gbl.std.vector('float')()
+ lasDef = cppyy.gbl.std.vector('float')()
lasDef.push_back(1.)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(lasDef)
blobWriter = TileCalibTools.TileBlobWriter(self.__db,fibFolder,'Flt')
#=== initialize all channels
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = blobWriter.zeroBlob(ros,drawer)
@@ -502,7 +495,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
print "EBC",mod+1, " outer MBTS = ",special[(4,mod,0)]
#=== store 4 values per channel
- default = PyCintex.gbl.std.vector('float')()
+ default = cppyy.gbl.std.vector('float')()
if Simulation:
default.push_back( 1.) # cesium constant
default.push_back( 1.) # laser slope
@@ -513,7 +506,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
default.push_back( -1.) # laser slope
default.push_back( 0.) # reference HV
default.push_back( 20.) # reference temperature (same for all channels)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(default)
#=== write both to offline and online folders
@@ -525,7 +518,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
blobWriter = TileCalibTools.TileBlobWriter(self.__db,folder,'Flt',multiVers)
#=== initialize all channels
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = blobWriter.zeroBlob(ros,drawer)
@@ -654,12 +647,12 @@ class TileCalibDefaultWriter(TileCalibLogger):
special[(4,mod,47)] = ces_mbts_outer
#=== store 4 values per channel
- default = PyCintex.gbl.std.vector('float')()
+ default = cppyy.gbl.std.vector('float')()
default.push_back( 1.) # cesium constant
default.push_back( 1.) # laser slope
default.push_back(700.) # reference HV
default.push_back( 20.) # reference temperature (same for all channels)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(default)
#=== write both to offline and online folders
@@ -669,7 +662,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
blobWriterOnl = TileCalibTools.TileBlobWriter(self.__db,folderOnl,'Flt',False)
#=== initialize all channels
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
fltOfl = blobWriterOfl.zeroBlob(ros,drawer)
@@ -763,9 +756,9 @@ class TileCalibDefaultWriter(TileCalibLogger):
self.log().info( "*** Writing Emscale with particle/Cesium factors with tag %s" % (tag,) )
#=== write linear (LIN) folder
- emsDef = PyCintex.gbl.std.vector('float')()
+ emsDef = cppyy.gbl.std.vector('float')()
emsDef.push_back(emscale)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(emsDef)
folders = [ self.__tilePrefixOfl+"CALIB/EMS",
@@ -776,7 +769,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
blobWriter = TileCalibTools.TileBlobWriter(self.__db,folder,'Flt',multiVers)
#=== initialize all channels
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = blobWriter.zeroBlob(ros,drawer)
@@ -826,9 +819,9 @@ class TileCalibDefaultWriter(TileCalibLogger):
self.log().info( "*** Writing Emscale default (%.2f) with tag %s" % ((emscale * 1000.),tag) )
#=== write linear (LIN) folder
- emsDef = PyCintex.gbl.std.vector('float')()
+ emsDef = cppyy.gbl.std.vector('float')()
emsDef.push_back(emscale)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(emsDef)
folders = [ self.__tilePrefixOfl+"CALIB/EMS",
@@ -838,7 +831,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
multiVers=('OFL' in folder)
blobWriter = TileCalibTools.TileBlobWriter(self.__db,folder,'Flt',multiVers)
#=== initialize all channels
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = blobWriter.zeroBlob(ros,drawer)
@@ -877,10 +870,10 @@ class TileCalibDefaultWriter(TileCalibLogger):
ngain = 6
nperg = 8
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
for i in xrange(ngain):
- defaultGain = PyCintex.gbl.std.vector('float')()
+ defaultGain = cppyy.gbl.std.vector('float')()
for v in dv[i]:
defaultGain.push_back(v)
defVec.push_back(defaultGain)
@@ -891,7 +884,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
writer = TileCalibTools.TileBlobWriter(self.__db,folder,'Flt')
writer.setComment(self.__author,"Integrator gain defaults")
#=== initialize all channels and write global default
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = writer.zeroBlob(ros,drawer)
@@ -911,14 +904,14 @@ class TileCalibDefaultWriter(TileCalibLogger):
parser = TileCalibTools.TileASCIIParser(pathDef+"TileTcfib.dat","Tfib")
folder = self.__tilePrefixOfl+"TIME/CELLFIBERLENGTH"
- default = PyCintex.gbl.std.vector('float')()
+ default = cppyy.gbl.std.vector('float')()
default.push_back(0.)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(default)
try:
blobWriter = TileCalibTools.TileBlobWriter(self.__db,folder,'Flt')
#=== initialize all channels
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = blobWriter.zeroBlob(ros,drawer)
@@ -960,14 +953,14 @@ class TileCalibDefaultWriter(TileCalibLogger):
self.log().info( "*** Writing Tclas defaults using tag %s" % tag )
folder = self.__tilePrefixOfl+"TIME/CHANNELOFFSET/LAS"
- default = PyCintex.gbl.std.vector('float')()
+ default = cppyy.gbl.std.vector('float')()
default.push_back(0.)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(default)
try:
blobWriter = TileCalibTools.TileBlobWriter(self.__db,folder,'Flt')
#=== initialize all channels
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = blobWriter.zeroBlob(ros,drawer)
@@ -986,14 +979,14 @@ class TileCalibDefaultWriter(TileCalibLogger):
self.log().info( "*** Writing Tdlas defaults using tag %s" % tag )
folder = self.__tilePrefixOfl+"TIME/DRAWEROFFSET/LAS"
- default = PyCintex.gbl.std.vector('float')()
+ default = cppyy.gbl.std.vector('float')()
default.push_back(0.)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(default)
try:
blobWriter = TileCalibTools.TileBlobWriter(self.__db,folder,'Flt')
#=== initialize only one channel per drawer
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = blobWriter.zeroBlob(ros,drawer)
@@ -1013,14 +1006,14 @@ class TileCalibDefaultWriter(TileCalibLogger):
parser = TileCalibTools.TileASCIIParser(pathDef+"Tile.tctof","Tctof")
folder = self.__tilePrefixOfl+"TIME/TIMEOFFLIGHT"
- default = PyCintex.gbl.std.vector('float')()
+ default = cppyy.gbl.std.vector('float')()
default.push_back(0.)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(default)
try:
blobWriter = TileCalibTools.TileBlobWriter(self.__db,folder,'Flt')
#=== initialize all channels and write global default
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = blobWriter.zeroBlob(ros,drawer)
@@ -1065,11 +1058,11 @@ class TileCalibDefaultWriter(TileCalibLogger):
(loGainDef,hiGainDef,tag) )
#=== fill folders
- loGainDefVec = PyCintex.gbl.std.vector('float')()
+ loGainDefVec = cppyy.gbl.std.vector('float')()
loGainDefVec.push_back(loGainDef)
- hiGainDefVec = PyCintex.gbl.std.vector('float')()
+ hiGainDefVec = cppyy.gbl.std.vector('float')()
hiGainDefVec.push_back(hiGainDef)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(loGainDefVec)
defVec.push_back(hiGainDefVec)
@@ -1083,7 +1076,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
multiVers=('OFL' in folder)
blobWriter = TileCalibTools.TileBlobWriter(self.__db,folder,'Flt',multiVers)
#=== initialize all channels
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = blobWriter.zeroBlob(ros,drawer)
@@ -1104,21 +1097,21 @@ class TileCalibDefaultWriter(TileCalibLogger):
(loGainDef,hiGainDef,tag) )
#=== common noise defaults
- defaultLo = PyCintex.gbl.std.vector('float')()
+ defaultLo = cppyy.gbl.std.vector('float')()
defaultLo.push_back( 40.) # pedestal value
defaultLo.push_back(loGainDef) # pedestal rms (high frequency noise)
defaultLo.push_back( 0.) # (low frequency noise)
defaultLo.push_back(loGainDef) # sigma 1 of HFN
defaultLo.push_back( 0.) # sigma 2 of HFN
defaultLo.push_back( 0.) # HFN2/HFN1 ratio
- defaultHi = PyCintex.gbl.std.vector('float')()
+ defaultHi = cppyy.gbl.std.vector('float')()
defaultHi.push_back( 40.) # pedestal value
defaultHi.push_back(hiGainDef) # pedestal rms (high frequency noise)
defaultHi.push_back( 0.) # (low frequency noise)
defaultHi.push_back(hiGainDef) # sigma 1 of HFN
defaultHi.push_back( 0.) # sigma 2 of HFN
defaultHi.push_back( 0.) # HFN2/HFN1 ratio
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(defaultLo)
defVec.push_back(defaultHi)
@@ -1130,7 +1123,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
multiVers=('OFL' in folder)
blobWriter = TileCalibTools.TileBlobWriter(self.__db,folder,'Flt',multiVers)
#=== initialize all channels
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = blobWriter.zeroBlob(ros,drawer)
@@ -1150,14 +1143,14 @@ class TileCalibDefaultWriter(TileCalibLogger):
(loGainDef,hiGainDef,tag) )
#=== common noise defaults
- defaultLo = PyCintex.gbl.std.vector('float')()
+ defaultLo = cppyy.gbl.std.vector('float')()
defaultLo.push_back(loGainDef) # el. noise
defaultLo.push_back(0.) # pileup noise
- defaultHi = PyCintex.gbl.std.vector('float')()
+ defaultHi = cppyy.gbl.std.vector('float')()
defaultHi.push_back(hiGainDef) # el. noise
defaultHi.push_back(0.) # pileup noise
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(defaultLo)
defVec.push_back(defaultHi)
@@ -1169,7 +1162,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
multiVers=('OFL' in folder)
blobWriter = TileCalibTools.TileBlobWriter(self.__db,folder,'Flt',multiVers)
#=== initialize all channels
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = blobWriter.zeroBlob(ros,drawer)
@@ -1203,7 +1196,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
multiVers=('OFL' in folder)
blobWriter = TileCalibTools.TileBlobWriter(self.__db,folder,'Flt',multiVers)
#=== initialize all channels
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = blobWriter.zeroBlob(ros,drawer)
@@ -1211,7 +1204,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
#=== initialize all channels in the drawer
- defaultLo = PyCintex.gbl.std.vector('float')()
+ defaultLo = cppyy.gbl.std.vector('float')()
defaultLo.push_back(0.) # pedestal value
defaultLo.push_back(0.) # pedestal rms (high frequency noise)
defaultLo.push_back(0.) # (low frequency noise)
@@ -1219,7 +1212,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
defaultLo.push_back(0.) # sigma2 of high frequency noise
defaultLo.push_back(0.) # HFN2/HFN1 normalization
- defaultHi = PyCintex.gbl.std.vector('float')()
+ defaultHi = cppyy.gbl.std.vector('float')()
defaultHi.push_back(0.) # pedestal value
defaultHi.push_back(0.) # pedestal rms (high frequency noise)
defaultHi.push_back(0.) # (low frequency noise)
@@ -1227,7 +1220,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
defaultHi.push_back(0.) # sigma2 of high frequency noise)
defaultHi.push_back(0.) # HFN2/HFN1 normalization
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(defaultLo)
defVec.push_back(defaultHi)
@@ -1268,16 +1261,16 @@ class TileCalibDefaultWriter(TileCalibLogger):
folder = self.__tilePrefixOfl+"NOISE/AUTOCR"
#=== common noise defaults
- default = PyCintex.gbl.std.vector('float')()
+ default = cppyy.gbl.std.vector('float')()
for i in xrange(6):
default.push_back(0.)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(default)
try:
blobWriter = TileCalibTools.TileBlobWriter(self.__db,folder,'Flt')
#=== initialize all channels
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = blobWriter.zeroBlob(ros,drawer)
@@ -1295,9 +1288,9 @@ class TileCalibDefaultWriter(TileCalibLogger):
self.log().info( "*** Writing BadChannel defaults using tag %s" % tag )
- default = PyCintex.gbl.std.vector('unsigned int')()
+ default = cppyy.gbl.std.vector('unsigned int')()
default.push_back(0)
- defVec = PyCintex.gbl.std.vector('std::vector<unsigned int>')()
+ defVec = cppyy.gbl.std.vector('std::vector<unsigned int>')()
defVec.push_back(default)
#=== fill offline folder
@@ -1309,12 +1302,12 @@ class TileCalibDefaultWriter(TileCalibLogger):
multiVers=('OFL' in folder)
blobWriter = TileCalibTools.TileBlobWriter(self.__db,folder,'Bch',multiVers)
#=== initialize all channels
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
bch = blobWriter.zeroBlob(ros,drawer)
bch = blobWriter.getDrawer(0, 0)
- bch.init(defVec,1,PyCintex.gbl.TileBchDecoder.BitPat_ofl01 if multiVers else TileBchDecoder.BitPat_onl01)
+ bch.init(defVec,1,cppyy.gbl.TileBchDecoder.BitPat_ofl01 if multiVers else TileBchDecoder.BitPat_onl01)
blobWriter.setComment(self.__author,"no bad channels")
folderTag = TileCalibUtils.getFullTag(folder, tag) if multiVers else ""
@@ -1386,20 +1379,20 @@ class TileCalibDefaultWriter(TileCalibLogger):
defFile.close()
#=== build default pulseshape vectors for db
- defaultLo = PyCintex.gbl.std.vector('float')()
+ defaultLo = cppyy.gbl.std.vector('float')()
for x in xlo: defaultLo.push_back(x)
for y in ylo: defaultLo.push_back(y)
- defaultHi = PyCintex.gbl.std.vector('float')()
+ defaultHi = cppyy.gbl.std.vector('float')()
for x in xhi: defaultHi.push_back(x)
for y in yhi: defaultHi.push_back(y)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(defaultLo)
defVec.push_back(defaultHi)
try:
folder = self.__tilePrefixOfl+"PULSESHAPE/"+source
blobWriter = TileCalibTools.TileBlobWriter(self.__db,folder,'Flt')
#=== initialize all channels
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = blobWriter.zeroBlob(ros,drawer)
@@ -1453,16 +1446,16 @@ class TileCalibDefaultWriter(TileCalibLogger):
defFile.close()
#=== build default pulseshape vectors for db
- defaultPls = PyCintex.gbl.std.vector('float')()
+ defaultPls = cppyy.gbl.std.vector('float')()
for phase in phases: defaultPls.push_back(phase)
for amplitude in amplitudes: defaultPls.push_back(amplitude)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(defaultPls)
try:
folder = self.__tilePrefixOfl + "PULSESHAPE/" + folder_name
blobWriter = TileCalibTools.TileBlobWriter(self.__db, folder, 'Flt')
#=== initialize all channels
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = blobWriter.zeroBlob(ros,drawer)
@@ -1495,11 +1488,11 @@ class TileCalibDefaultWriter(TileCalibLogger):
folder = self.__tilePrefixOnl+"MUID"
#=== common TileMuId defaults
- default = PyCintex.gbl.std.vector('float')()
+ default = cppyy.gbl.std.vector('float')()
for i in xrange(20):
default.push_back(150.)
default.push_back(5000.)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(default)
defVec.push_back(default)
@@ -1508,7 +1501,7 @@ class TileCalibDefaultWriter(TileCalibLogger):
writer.setComment(self.__author,"TileMuId default values")
#=== initialize all channels and write global default
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = writer.zeroBlob(ros,drawer)
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCalibTools.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCalibTools.py
index d87097d2074dba2500b9ae0add9cb75a48936870..0e5bbdcd1068510df58c5ee5a3374f6b11daee92 100644
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCalibTools.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCalibTools.py
@@ -18,21 +18,14 @@ import cx_Oracle
from PyCool import cool
import time, types, re, sys, os
import urllib2
-#import PyCintex
-try:
- # ROOT5
- import PyCintex
-except:
- # ROOT6
- import cppyy as PyCintex
- sys.modules['PyCintex'] = PyCintex
-
-PyCintex.makeClass('std::vector<float>')
-PyCintex.makeClass('std::vector<std::vector<float> >')
-PyCintex.makeClass('std::vector<int>')
-PyCintex.makeClass('std::vector<std::vector<int> >')
-PyCintex.makeClass('std::vector<unsigned int>')
-PyCintex.makeClass('std::vector<std::vector<unsigned int> >')
+import cppyy
+
+cppyy.makeClass('std::vector<float>')
+cppyy.makeClass('std::vector<std::vector<float> >')
+cppyy.makeClass('std::vector<int>')
+cppyy.makeClass('std::vector<std::vector<int> >')
+cppyy.makeClass('std::vector<unsigned int>')
+cppyy.makeClass('std::vector<std::vector<unsigned int> >')
from TileCalibBlobObjs.Classes import *
@@ -456,11 +449,11 @@ class TileBlobWriter(TileCalibLogger):
#=== create default vectors based on calibDrawerType
self.__calibDrawerType = calibDrawerType
if calibDrawerType=='Flt':
- PyCintex.makeClass('std::vector<float>')
- self.__defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ cppyy.makeClass('std::vector<float>')
+ self.__defVec = cppyy.gbl.std.vector('std::vector<float>')()
elif calibDrawerType=='Bch' or calibDrawerType=='Int':
- PyCintex.makeClass('std::vector<unsigned int>')
- self.__defVec = PyCintex.gbl.std.vector('std::vector<unsigned int>')()
+ cppyy.makeClass('std::vector<unsigned int>')
+ self.__defVec = cppyy.gbl.std.vector('std::vector<unsigned int>')()
else:
raise Exception("Unknown calibDrawerType: %s" % calibDrawerType)
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadCellNoiseFromCool.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadCellNoiseFromCool.py
index b88def9dc9455431de477079510c19598a6d0577..ed64989b8953c42c768956760c2992c86ce105ee 100755
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadCellNoiseFromCool.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadCellNoiseFromCool.py
@@ -83,14 +83,7 @@ for o, a in opts:
tile=(chan==48)
-#import PyCintex
-try:
- # ROOT5
- import PyCintex
-except:
- # ROOT6
- import cppyy as PyCintex
- sys.modules['PyCintex'] = PyCintex
+import cppyy
from CaloCondBlobAlgs import CaloCondTools, CaloCondLogger
from TileCalibBlobPython import TileCalibTools
@@ -165,7 +158,7 @@ obj = folder.findObject( iov, chan, folderTag )
blob = obj.payload()[0]
#=== create CaloCondBlobFlt
-blobFlt = PyCintex.gbl.CaloCondBlobFlt.getInstance(blob)
+blobFlt = cppyy.gbl.CaloCondBlobFlt.getInstance(blob)
#=== retrieve data from the blob
#cell = 0 # 0..5183 - Tile hash
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadCellNoiseFromCoolCompare.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadCellNoiseFromCoolCompare.py
index 8ffa92d2c4574e10f8529d7871b1e3e3619a5e21..938ea7f26b688a6cf2890baa62adc7208e552785 100755
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadCellNoiseFromCoolCompare.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadCellNoiseFromCoolCompare.py
@@ -120,14 +120,7 @@ if schema2=="none":
tile=(chan==48)
-#import PyCintex
-try:
- # ROOT5
- import PyCintex
-except:
- # ROOT6
- import cppyy as PyCintex
- sys.modules['PyCintex'] = PyCintex
+import cppyy
from CaloCondBlobAlgs import CaloCondTools, CaloCondLogger
from TileCalibBlobPython import TileCalibTools
@@ -265,8 +258,8 @@ blob = obj.payload()[0]
blob2 = obj2.payload()[0]
#=== create CaloCondBlobFlt
-blobFlt = PyCintex.gbl.CaloCondBlobFlt.getInstance(blob)
-blobFlt2 = PyCintex.gbl.CaloCondBlobFlt.getInstance(blob2)
+blobFlt = cppyy.gbl.CaloCondBlobFlt.getInstance(blob)
+blobFlt2 = cppyy.gbl.CaloCondBlobFlt.getInstance(blob2)
#=== retrieve data from the blob
#cell = 0 # 0..5183 - Tile hash
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadTripsProbsFromCool.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadTripsProbsFromCool.py
index 1007ed01833ddfaf74e5d2fe4cdd5b59cf9638cd..85b5cd64ffe4e8304a45abd2548569b3181c2d37 100755
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadTripsProbsFromCool.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadTripsProbsFromCool.py
@@ -72,7 +72,8 @@ log.info("Initializing folder %s with tag %s" % (folderPath, folderTag))
blobReader = TileCalibTools.TileBlobReader(db, folderPath, folderTag)
-util = PyCintex.gbl.TileCalibUtils()
+import cppyy
+util = cppyy.gbl.TileCalibUtils()
tripsCalibDrawer = blobReader.getDrawer(util.trips_ros(), util.trips_drawer(), (run,lumi))
if tripsCalibDrawer.getNChans() != util.max_ros() \
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeAutoCrFromASCII.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeAutoCrFromASCII.py
index 9930861df9650daee6d2e91c5da40587c046cd48..1fb6649acf43b1132ec40cf33c041a4df820001d 100755
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeAutoCrFromASCII.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeAutoCrFromASCII.py
@@ -4,14 +4,7 @@
# modified: Lukas Pribyl <lukas.pribyl@cern.ch>, 2008-06-27
# modified: Yuri Smirnov <iouri.smirnov@cern.ch>, 2014-12-14
-#import PyCintex
-try:
- # ROOT5
- import PyCintex
-except:
- # ROOT6
- import cppyy as PyCintex
- sys.modules['PyCintex'] = PyCintex
+import cppyy
from TileCalibBlobPython import TileCalibTools
from TileCalibBlobObjs.Classes import *
@@ -35,10 +28,10 @@ def fillAutoCr(filePed, tag, since,
folderTag = TileCalibUtils.getFullTag(folder, tag)
#=== common noise autocr defaults (no correlation)
- default = PyCintex.gbl.std.vector('float')()
+ default = cppyy.gbl.std.vector('float')()
for i in xrange(6):
default.push_back(0.)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(default)
defVec.push_back(default)
@@ -50,7 +43,7 @@ def fillAutoCr(filePed, tag, since,
parser = TileCalibTools.TileASCIIParser(filePed,"AutoCr");
#=== initialize all channels and write global default
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = writer.zeroBlob(ros,drawer)
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeIntegratorFromASCII.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeIntegratorFromASCII.py
index d5573bf139243341c0e9a2d6400bf3b48630a2cb..df39299dfb232db2a29b3686871d46580de3dda4 100755
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeIntegratorFromASCII.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeIntegratorFromASCII.py
@@ -3,14 +3,7 @@
# Lukas Pribyl <lukas.pribyl@cern.ch>, 2008-12-05
# change: Yuri Smirnov <iouri.smirnov@cern.ch>, 2014-12-24
-#import PyCintex
-try:
- # ROOT5
- import PyCintex
-except:
- # ROOT6
- import cppyy as PyCintex
- sys.modules['PyCintex'] = PyCintex
+import cppyy
from TileCalibBlobPython import TileCalibTools
from TileCalibBlobObjs.Classes import *
@@ -51,10 +44,10 @@ def fillIntegrator(fileInt, tag, since,
ngain = 6
nperg = 8
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
for i in xrange(ngain):
- defaultGain = PyCintex.gbl.std.vector('float')()
+ defaultGain = cppyy.gbl.std.vector('float')()
for v in dv[i]:
defaultGain.push_back(v)
defVec.push_back(defaultGain)
@@ -66,7 +59,7 @@ def fillIntegrator(fileInt, tag, since,
writer.setComment(os.getlogin(),"Jalal's values with non-zero defaults, 2008-12-05")
parser = TileCalibTools.TileASCIIParser(fileInt,"IntGain");
#=== initialize all channels and write global default
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = writer.zeroBlob(ros,drawer)
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeOfc.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeOfc.py
index 70d6f956d9b94833e0ca579934249595bff2ba69..dd435e672d23588b8a70c40644d076056b038f92 100755
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeOfc.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeOfc.py
@@ -3,14 +3,7 @@
# Nils Gollub <nils.gollub@cern.ch>, 2007-11-19
# change: Yuri Smirnov <iouri.smirnov@cern.ch>, 2014-12-24
-#import PyCintex
-try:
- # ROOT5
- import PyCintex
-except:
- # ROOT6
- import cppyy as PyCintex
- sys.modules['PyCintex'] = PyCintex
+import cppyy
from PyCool import cool, coral
from TileCalibBlobPython import TileCalibTools, TileCalibLogger
@@ -46,7 +39,7 @@ comment = "OFC weights (7 samples) imported from TileDSPofc v4r1p4"
#===
#==================================================
#=== set shortcut
-g = PyCintex.gbl
+g = cppyy.gbl
#=== get a logger
log = TileCalibLogger.getLogger("WriteOfc")
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writePedFromASCII.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writePedFromASCII.py
index d1e24a582565665d1b53495d718ed153ae9c663d..cd3abc52d9574ecc172dcb4b9169c611f05a9ed7 100755
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writePedFromASCII.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writePedFromASCII.py
@@ -4,15 +4,7 @@
# modified: Lukas Pribyl <lukas.pribyl@cern.ch>, 2008-06-27
# modified: Yuri Smirnov <iouri.smirnov@cern.ch>, 2014-12-24
-import os
-#import PyCintex
-try:
- # ROOT5
- import PyCintex
-except:
- # ROOT6
- import cppyy as PyCintex
- sys.modules['PyCintex'] = PyCintex
+import cppyy
from TileCalibBlobPython import TileCalibTools
from TileCalibBlobObjs.Classes import *
@@ -38,21 +30,21 @@ def fillPed(filePed, tag, comment, since,
pedDef = [30.,50.]
loGainDef = 0.8
hiGainDef = 1.6
- defaultLo = PyCintex.gbl.std.vector('float')()
+ defaultLo = cppyy.gbl.std.vector('float')()
defaultLo.push_back(pedDef[0]) # pedestal mean value
defaultLo.push_back(loGainDef) # pedestal rms
defaultLo.push_back(0.0) # pedestal low frequency noise
defaultLo.push_back(loGainDef) # pedestal HFN1
defaultLo.push_back(0.0) # pedestal HFN2
defaultLo.push_back(0.0) # pedestal HFN2/HFN1 ratio
- defaultHi = PyCintex.gbl.std.vector('float')()
+ defaultHi = cppyy.gbl.std.vector('float')()
defaultHi.push_back(pedDef[1]) # pedestal mean value
defaultHi.push_back(hiGainDef) # pedestal rms
defaultHi.push_back(0.0) # pedestal low frequency noise
defaultHi.push_back(hiGainDef) # pedestal HFN1
defaultHi.push_back(0.0) # pedestal HFN2
defaultHi.push_back(0.0) # pedestal HFN2/HFN1 ratio
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(defaultLo)
defVec.push_back(defaultHi)
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeTileMuIdFromASCII.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeTileMuIdFromASCII.py
index d8f3ef92408b370944348e3c9600cbcee340e8c7..d84ff6da1c85d0e28da491a508e48b831d9a7175 100755
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeTileMuIdFromASCII.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeTileMuIdFromASCII.py
@@ -3,14 +3,7 @@
# Lukas Pribyl <lukas.pribyl@cern.ch>, 2009-04-29
# change: Yuri Smirnov <iouri.smirnov@cern.ch>, 2014-12-24
-#import PyCintex
-try:
- # ROOT5
- import PyCintex
-except:
- # ROOT6
- import cppyy as PyCintex
- sys.modules['PyCintex'] = PyCintex
+import cppyy
from TileCalibBlobPython import TileCalibTools
from TileCalibBlobObjs.Classes import *
@@ -31,11 +24,11 @@ def fillTileMuId(file, since,
folder = TileCalibTools.getTilePrefix(False)+"MUID"
#=== common TileMuId defaults
- default = PyCintex.gbl.std.vector('float')()
+ default = cppyy.gbl.std.vector('float')()
for i in xrange(20):
default.push_back(150.)
default.push_back(5000.)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(default)
defVec.push_back(default)
@@ -47,7 +40,7 @@ def fillTileMuId(file, since,
parser = TileCalibTools.TileASCIIParser(file,"TileMuId");
#=== initialize all channels and write global default
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
for ros in xrange(util.max_ros()):
for drawer in xrange(util.getMaxDrawer(ros)):
flt = writer.zeroBlob(ros,drawer)
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeTimingFromASCII.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeTimingFromASCII.py
index c90b9a0507ae34089efa0cc5534d97b184632e99..5efff19d77f3a06df1d2d78ecd2d0bd4ff3f8218 100755
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeTimingFromASCII.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeTimingFromASCII.py
@@ -3,14 +3,7 @@
# Nils Gollub <nils.gollub@cern.ch>, 2007-11-26
# change: Yuri Smirnov <iouri.smirnov@cern.ch>, 2014-12-24
-#import PyCintex
-try:
- # ROOT5
- import PyCintex
-except:
- # ROOT6
- import cppyy as PyCintex
- sys.modules['PyCintex'] = PyCintex
+import cppyy
from TileCalibBlobPython import TileCalibTools
from TileCalibBlobObjs.Classes import *
@@ -32,7 +25,7 @@ def fillTimingTc(fileTclas, tag, since,
#=== create default: one number
#--- per ADC for Tclas
- default = PyCintex.gbl.std.vector('float')()
+ default = cppyy.gbl.std.vector('float')()
default.push_back(0.)
#=====================================================
@@ -41,7 +34,7 @@ def fillTimingTc(fileTclas, tag, since,
tclasWriter = TileCalibTools.TileBlobWriter(db,folderTclas,'Flt')
tclasWriter.setComment(os.getlogin(),fileTclas)
parserTclas = TileCalibTools.TileASCIIParser(fileTclas,"Tclas");
- defTclas = PyCintex.gbl.std.vector('std::vector<float>')()
+ defTclas = cppyy.gbl.std.vector('std::vector<float>')()
defTclas.push_back(default) # low gain
defTclas.push_back(default) # high gain
#=== initialize defaults
@@ -86,7 +79,7 @@ def fillTimingTd(fileTdlas, tag, since,
#=== create default: one number
#--- per drawer for Tdlas
- default = PyCintex.gbl.std.vector('float')()
+ default = cppyy.gbl.std.vector('float')()
default.push_back(0.)
#=====================================================
@@ -95,7 +88,7 @@ def fillTimingTd(fileTdlas, tag, since,
tdlasWriter = TileCalibTools.TileBlobWriter(db,folderTdlas,'Flt')
tdlasWriter.setComment(os.getlogin(),fileTdlas)
parserTdlas = TileCalibTools.TileASCIIParser(fileTdlas,"Tdlas");
- defTdlas = PyCintex.gbl.std.vector('std::vector<float>')()
+ defTdlas = cppyy.gbl.std.vector('std::vector<float>')()
defTdlas.push_back(default)
#=== initialize defaults
ros = 0
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeTripsProbsFromASCII.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeTripsProbsFromASCII.py
index 304b667b7f698d7f80d0d4c9476496f5811028d4..62b71cf2f9b2b31acc8ce96150f9de7c2b280705 100755
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeTripsProbsFromASCII.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/TileCalibBlobPython_writeTripsProbsFromASCII.py
@@ -45,14 +45,7 @@ for o, a in opts:
assert False, "unhandled option"
-#import PyCintex
-try:
- # ROOT5
- import PyCintex
-except:
- # ROOT6
- import cppyy as PyCintex
- sys.modules['PyCintex'] = PyCintex
+import cppyy
from TileCalibBlobPython import TileCalibTools
from TileCalibBlobObjs.Classes import *
@@ -72,13 +65,13 @@ def fillTripsProbs(fileTrips, folderPath, tag, since
#=== get full folder tag
folderTag = TileCalibUtils.getFullTag(folderPath, tag)
- util = PyCintex.gbl.TileCalibUtils()
+ util = cppyy.gbl.TileCalibUtils()
- default = PyCintex.gbl.std.vector('unsigned int')()
+ default = cppyy.gbl.std.vector('unsigned int')()
for i in xrange(util.max_drawer() + 1):
default.push_back( 0 )
- defVec = PyCintex.gbl.std.vector('std::vector<unsigned int>')()
+ defVec = cppyy.gbl.std.vector('std::vector<unsigned int>')()
defVec.push_back(default)
#=====================================================
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/WriteCalibToCool.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/WriteCalibToCool.py
index 2a425974c4ba1a7d4b68b36c6811a667ea321a5d..73fa9d4b51e7d780b2abb2f8acc605c0e3facefc 100755
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/WriteCalibToCool.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/WriteCalibToCool.py
@@ -146,14 +146,7 @@ elif tag=='UPD5' and outfolderPath!=folderPath:
if outtag is None:
outtag = tag
-#import PyCintex
-try:
- # ROOT5
- import PyCintex
-except:
- # ROOT6
- import cppyy as PyCintex
- sys.modules['PyCintex'] = PyCintex
+import cppyy
from TileCalibBlobPython import TileCalibTools
from TileCalibBlobObjs.Classes import *
@@ -235,11 +228,11 @@ else:
if len(txtFile)>0:
#=== create default: one number per ADC
- default = PyCintex.gbl.std.vector('float')()
+ default = cppyy.gbl.std.vector('float')()
for n in xrange(nval):
default.push_back(0.)
- defConst = PyCintex.gbl.std.vector('std::vector<float>')()
+ defConst = cppyy.gbl.std.vector('std::vector<float>')()
for ng in xrange(ngain):
defConst.push_back(default) # low/high gain
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/WriteCellNoiseToCool.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/WriteCellNoiseToCool.py
index e6f5a3f02ceda27b756718539eed9c4a8f8300f8..3fcce17b979b006f51f92bed5e20b761d7c60855 100755
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/WriteCellNoiseToCool.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/WriteCellNoiseToCool.py
@@ -156,14 +156,7 @@ else:
# COOLOFL_TILE/OFLP200 COOLOFL_TILE/COMP200 COOLOFL_TILE/CONDBR2
-#import PyCintex
-try:
- # ROOT5
- import PyCintex
-except:
- # ROOT6
- import cppyy as PyCintex
- sys.modules['PyCintex'] = PyCintex
+import cppyy
from CaloCondBlobAlgs import CaloCondTools
from TileCalibBlobPython import TileCalibTools
@@ -394,10 +387,10 @@ for iov in iovList:
print "output db: ncell: %d ngain %d nval %d" % (ncell, ngain, nval)
- GainDefVec = PyCintex.gbl.std.vector('float')()
+ GainDefVec = cppyy.gbl.std.vector('float')()
for val in xrange(nval):
GainDefVec.push_back(0.0)
- defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+ defVec = cppyy.gbl.std.vector('std::vector<float>')()
for gain in xrange(ngain):
defVec.push_back(GainDefVec)
blobW = writer.getCells(chan)
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/integrator_ascii2db.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/integrator_ascii2db.py
index 63b14ef981eb1490a36e0ed758b3e04cd2969858..d932606ece106f96b4c8735c88c3dd0043dfe692 100755
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/integrator_ascii2db.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/integrator_ascii2db.py
@@ -38,15 +38,7 @@ while len(sys.argv)>0:
log.error("File \"%s\" does not exist, ignoring input!" % arg)
-#import PyCintex
-try:
- # ROOT5
- import PyCintex
-except:
- # ROOT6
- import cppyy as PyCintex
- sys.modules['PyCintex'] = PyCintex
-
+import cppyy
from TileCalibBlobPython import TileCalibTools
#=== open the database
@@ -56,7 +48,7 @@ db = TileCalibTools.openDb('SQLITE', 'CONDBR2', 'UPDATE')
blobWriter = TileCalibTools.TileBlobWriter(db,"/TILE/ONL01/INTEGRATOR",True,False)
#=== declare default vector
-default = PyCintex.gbl.std.vector('float')()
+default = cppyy.gbl.std.vector('float')()
default.push_back(0.) # gain 0
default.push_back(0.) # sigma(gain) 1
default.push_back(0.) # chi2 2
@@ -65,7 +57,7 @@ default.push_back(0.) # pedestal 4
default.push_back(0.) # sigma(pedestal) 5
default.push_back(0.) # rms 6
default.push_back(0.) # sigma(rms) 7
-defVec = PyCintex.gbl.std.vector('std::vector<float>')()
+defVec = cppyy.gbl.std.vector('std::vector<float>')()
defVec.push_back(default) # gain 1
defVec.push_back(default) # gain 2
defVec.push_back(default) # gain 3
diff --git a/TileCalorimeter/TileIdentifier/python/Classes.py b/TileCalorimeter/TileIdentifier/python/Classes.py
index 72f0849de1b9b455ea6f9df022deff542cc458f0..08f3dce2459aa01782276aa9094dfddad5fd74c3 100644
--- a/TileCalorimeter/TileIdentifier/python/Classes.py
+++ b/TileCalorimeter/TileIdentifier/python/Classes.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-import PyCintex
+import cppyy
-TileHWID = PyCintex.gbl.TileHWID
-TileFragHash = PyCintex.gbl.TileFragHash
+TileHWID = cppyy.gbl.TileHWID
+TileFragHash = cppyy.gbl.TileFragHash