Skip to content
Snippets Groups Projects
Commit a8093ee4 authored by Atlas-Software Librarian's avatar Atlas-Software Librarian Committed by Graeme Stewart
Browse files

'CMakeLists.txt' (IsolationAlgs-00-01-23)

	* Tagging IsolationAlgs-00-01-23.
	* src/IsolationBuilder.cxx: Another coverity warning.

2015-04-06  scott snyder  <snyder@bnl.gov>

	* Tagging IsolationAlgs-00-01-22.
	* src/IsolationBuilder.cxx: Fix coverity warnings.

2015-03-27  scott snyder  <snyder@bnl.gov>

	* Tagging IsolationAlgs-00-01-21.
	* PyCintex -> cppyy.

16-03-2015 Jean-Baptiste de Vivie
	* too much debug printout
	* tagging as IsolationAlgs-00-01-20
parent 54392f44
No related branches found
No related tags found
No related merge requests found
################################################################################
# Package: IsolationAlgs
################################################################################
# Declare the package name:
atlas_subdir( IsolationAlgs )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
GaudiKernel
PRIVATE
Calorimeter/CaloEvent
Control/AthContainers
Control/AthenaBaseComps
Event/xAOD/xAODEgamma
Event/xAOD/xAODMuon
Event/xAOD/xAODPrimitives
Reconstruction/RecoTools/RecoToolInterfaces )
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
# Component(s) in the package:
atlas_add_component( IsolationAlgs
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} GaudiKernel CaloEvent AthContainers AthenaBaseComps xAODEgamma xAODMuon xAODPrimitives RecoToolInterfaces )
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
...@@ -168,10 +168,10 @@ tit.TrackSelectionTool.maxZ0SinTheta = 3 ...@@ -168,10 +168,10 @@ tit.TrackSelectionTool.maxZ0SinTheta = 3
tit.TrackSelectionTool.minPt = 1000 tit.TrackSelectionTool.minPt = 1000
tit.TrackSelectionTool.CutLevel = "Loose" tit.TrackSelectionTool.CutLevel = "Loose"
import ROOT, PyCintex import ROOT, cppyy
# Need to be sure base dict is loaded first. # Need to be sure base dict is loaded first.
PyCintex.loadDictionary('xAODCoreRflxDict') cppyy.loadDictionary('xAODCoreRflxDict')
PyCintex.loadDictionary('xAODPrimitivesDict') cppyy.loadDictionary('xAODPrimitivesDict')
isoPar = ROOT.xAOD.Iso isoPar = ROOT.xAOD.Iso
# In fact the default isolations are the same for eg and muons : prepare the list here # In fact the default isolations are the same for eg and muons : prepare the list here
...@@ -236,7 +236,7 @@ class isoGetter ( Configured ) : ...@@ -236,7 +236,7 @@ class isoGetter ( Configured ) :
print traceback.format_exc() print traceback.format_exc()
return False return False
print self._isoBuilderHandle #print self._isoBuilderHandle
return True return True
def isoBuilderHandle(self): def isoBuilderHandle(self):
......
...@@ -160,10 +160,10 @@ tit.TrackSelectionTool.maxZ0SinTheta = 3 ...@@ -160,10 +160,10 @@ tit.TrackSelectionTool.maxZ0SinTheta = 3
tit.TrackSelectionTool.minPt = 1000 tit.TrackSelectionTool.minPt = 1000
tit.TrackSelectionTool.CutLevel = "TightPrimary" tit.TrackSelectionTool.CutLevel = "TightPrimary"
import ROOT, PyCintex import ROOT, cppyy
# Need to be sure base dict is loaded first. # Need to be sure base dict is loaded first.
PyCintex.loadDictionary('xAODCoreRflxDict') cppyy.loadDictionary('xAODCoreRflxDict')
PyCintex.loadDictionary('xAODPrimitivesDict') cppyy.loadDictionary('xAODPrimitivesDict')
isoPar = ROOT.xAOD.Iso isoPar = ROOT.xAOD.Iso
# In fact the default isolations are the same for eg and muons : prepare the list here # In fact the default isolations are the same for eg and muons : prepare the list here
......
...@@ -38,7 +38,8 @@ ...@@ -38,7 +38,8 @@
IsolationBuilder::IsolationBuilder( const std::string& name, IsolationBuilder::IsolationBuilder( const std::string& name,
ISvcLocator* pSvcLocator ) : ISvcLocator* pSvcLocator ) :
::AthAlgorithm( name, pSvcLocator ) ::AthAlgorithm( name, pSvcLocator ),
m_cellColl (nullptr)
{ {
// //
// Property declaration // Property declaration
...@@ -77,7 +78,8 @@ StatusCode IsolationBuilder::initialize() ...@@ -77,7 +78,8 @@ StatusCode IsolationBuilder::initialize()
for (unsigned int ii = 0; ii < nI; ii++) { for (unsigned int ii = 0; ii < nI; ii++) {
std::vector<xAOD::Iso::IsolationType> isoTypes; std::vector<xAOD::Iso::IsolationType> isoTypes;
std::vector<SG::AuxElement::Decorator<float>*> Deco; std::vector<SG::AuxElement::Decorator<float>*> Deco;
xAOD::Iso::IsolationFlavour isoFlav; xAOD::Iso::IsolationFlavour isoFlav =
xAOD::Iso::numIsolationFlavours;
for (unsigned int jj = 0; jj < m_egisoInts[ii].size(); jj++) { for (unsigned int jj = 0; jj < m_egisoInts[ii].size(); jj++) {
int egIso = int(m_egisoInts[ii][jj]+0.5); int egIso = int(m_egisoInts[ii][jj]+0.5);
xAOD::Iso::IsolationType isoType = static_cast<xAOD::Iso::IsolationType>(egIso); xAOD::Iso::IsolationType isoType = static_cast<xAOD::Iso::IsolationType>(egIso);
...@@ -133,7 +135,8 @@ StatusCode IsolationBuilder::initialize() ...@@ -133,7 +135,8 @@ StatusCode IsolationBuilder::initialize()
for (unsigned int ii = 0; ii < nI; ii++) { for (unsigned int ii = 0; ii < nI; ii++) {
std::vector<xAOD::Iso::IsolationType> isoTypes; std::vector<xAOD::Iso::IsolationType> isoTypes;
std::vector<SG::AuxElement::Decorator<float>*> Deco; std::vector<SG::AuxElement::Decorator<float>*> Deco;
xAOD::Iso::IsolationFlavour isoFlav; xAOD::Iso::IsolationFlavour isoFlav =
xAOD::Iso::numIsolationFlavours;
for (unsigned int jj = 0; jj < m_muisoInts[ii].size(); jj++) { for (unsigned int jj = 0; jj < m_muisoInts[ii].size(); jj++) {
int muIso = int(m_muisoInts[ii][jj]+0.5); int muIso = int(m_muisoInts[ii][jj]+0.5);
xAOD::Iso::IsolationType isoType = static_cast<xAOD::Iso::IsolationType>(muIso); xAOD::Iso::IsolationType isoType = static_cast<xAOD::Iso::IsolationType>(muIso);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment