Commit 8d147934 authored by Jochen Meyer's avatar Jochen Meyer Committed by Graeme Stewart
Browse files

coverity fix (xAODMuonCnv-00-01-17)

	* addressing coverity defect 28732
	* Tagging as xAODMuonCnv-00-01-17

2014-11-21 Edward.Moyse@cern.ch
	* JB's fix for isolation changes
	* Tagging as xAODMuonCnv-00-01-16
parent fa28860f
# $Id: ClusterCreator_jobOptions.py 297184 2013-10-03 11:18:41Z krasznaa $
# Set up the reading of the input AOD:
FNAME = "/home/emoyse/mc12_8TeV.147807.PowhegPythia8_AU2CT10_Zmumu.merge.AOD.e1169_s1469_s1470_r3658_r3549_tid01085597_00/AOD.01085597._000308.pool.root.1"
FNAME = "root://eosatlas//eos/atlas/atlasdatadisk/rucio/valid1/36/d9/AOD.01447493._000116.pool.root.1"
include( "AthenaPython/iread_file.py" )
# from RecExConfig.RecFlags import rec
# from AthenaCommon.BeamFlags import jobproperties
......@@ -12,69 +13,24 @@ include( "AthenaPython/iread_file.py" )
from AthenaCommon.AlgSequence import AlgSequence
theJob = AlgSequence()
from MuonCombinedRecExample.MuonCombinedKeys import MuonCombinedKeys as MuonCbKeys
#InDet
from xAODTrackParticleCnv.xAODTrackParticleCnvConf import xAODMaker__TrackParticleCnvAlg
alg = xAODMaker__TrackParticleCnvAlg()
theJob += alg
#SA
from xAODTrackParticleCnv.xAODTrackParticleCnvConf import xAODMaker__TrackParticleCnvAlg
alg1 = xAODMaker__TrackParticleCnvAlg("TrackParticleCnvAlg_ExtrapolatedMS")
alg1.AODContainerName = MuonCbKeys.ExtrapolatedMSParticles() #ExtrapolatedMuonSpectrometerParticles
alg1.xAODContainerName = "x"+MuonCbKeys.ExtrapolatedMSParticles()
alg1.OutputLevel = VERBOSE
theJob += alg1
# StatCombined
from xAODTrackParticleCnv.xAODTrackParticleCnvConf import xAODMaker__TrackParticleCnvAlg
alg3 = xAODMaker__TrackParticleCnvAlg("TrackParticleCnvAlg_StatCombined")
alg3.AODContainerName = MuonCbKeys.StatCombinedParticles() #xStatCombinedMuonParticles
alg3.xAODContainerName = "x"+MuonCbKeys.StatCombinedParticles()
alg3.OutputLevel = VERBOSE
theJob += alg3
# Combined
from xAODTrackParticleCnv.xAODTrackParticleCnvConf import xAODMaker__TrackParticleCnvAlg
alg4 = xAODMaker__TrackParticleCnvAlg("TrackParticleCnvAlg_CombinedFit")
alg4.AODContainerName = MuonCbKeys.CombinedFitParticles() #CombinedFitParticles
alg4.xAODContainerName = "x"+MuonCbKeys.CombinedFitParticles()
alg4.OutputLevel = VERBOSE
theJob += alg4
# ST
from xAODTrackParticleCnv.xAODTrackParticleCnvConf import xAODMaker__TrackParticleCnvAlg
alg5 = xAODMaker__TrackParticleCnvAlg("TrackParticleCnvAlg_SegmentTagTrackParticles")
alg5.AODContainerName = MuonCbKeys.SegmentTagTrackParticles() #SegmentTagTrackParticles
alg5.xAODContainerName = "x"+MuonCbKeys.SegmentTagTrackParticles()
alg5.OutputLevel = VERBOSE
theJob += alg5
#Muons
from xAODMuonCnv.xAODMuonCnvConf import xAODMaker__MuonCnvAlg
muonAlg = xAODMaker__MuonCnvAlg()
muonAlg.OutputLevel = VERBOSE
theJob += muonAlg
# This algorithm *must* always be last in the sequence:
from xAODCreatorAlgs.xAODCreatorAlgsConf import xAODMaker__EventFormatCreator
alg5 = xAODMaker__EventFormatCreator()
#alg5.OutputLevel = VERBOSE
theJob += alg5
# Create a POOL output file with the StoreGate contents:
from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
xaodStream = MSMgr.NewPoolStream( "StreamXAOD", "xAOD.pool.root" )
xaodStream = MSMgr.NewPoolStream( "StreamAOD", "xAOD.pool.root" )
# Set up its contents:
# xaodStream.AddItem( "xAOD::CaloClusterContainer_v1#*" )
# xaodStream.AddItem( "xAOD::CaloClusterAuxContainer_v1#*" )
xaodStream.AddItem( "xAOD::TrackParticleContainer_v1#*" )
xaodStream.AddItem( "xAOD::TrackParticleAuxContainer_v1#*" )
xaodStream.AddItem( "xAOD::TruthParticleContainer#*")
xaodStream.AddItem( "xAOD::TruthParticleAuxContainer#*")
xaodStream.AddItem( "xAOD::TrackParticleContainer#*" )
xaodStream.AddItem( "xAOD::TrackParticleAuxContainer#*" )
xaodStream.AddItem( "xAOD::MuonContainer_v1#*" )
xaodStream.AddItem( "xAOD::MuonAuxContainer_v1#*" )
xaodStream.AddMetaDataItem( "xAOD::EventFormat_v1#*" )
xaodStream.AddItem( "xAOD::MuonSegmentContainer_v1#*")
xaodStream.AddItem( "xAOD::MuonSegmentAuxContainer_v1#*")
xaodStream.AddItem( "xAOD::EventInfo_v1#*" )
xaodStream.AddItem( "xAOD::EventAuxInfo_v1#*" )
xaodStream.Print()
# Split all branches:
......
......@@ -157,22 +157,22 @@ namespace xAODMaker {
}
void MuonCnvAlg::setIsolations(const Analysis::Muon& aodmuon, xAOD::Muon& xaodmuon){
checkAndSetIsolation(MuonParameters::etcone10 , xAOD::Iso::etcone10 , aodmuon, xaodmuon);
//checkAndSetIsolation(MuonParameters::etcone10 , xAOD::Iso::etcone10 , aodmuon, xaodmuon);
checkAndSetIsolation(MuonParameters::etcone20 , xAOD::Iso::etcone20 , aodmuon, xaodmuon);
checkAndSetIsolation(MuonParameters::etcone30 , xAOD::Iso::etcone30 , aodmuon, xaodmuon);
checkAndSetIsolation(MuonParameters::etcone40 , xAOD::Iso::etcone40 , aodmuon, xaodmuon);
checkAndSetIsolation(MuonParameters::nucone10 , xAOD::Iso::nucone10 , aodmuon, xaodmuon);
checkAndSetIsolation(MuonParameters::nucone20 , xAOD::Iso::nucone20 , aodmuon, xaodmuon);
checkAndSetIsolation(MuonParameters::nucone30 , xAOD::Iso::nucone30 , aodmuon, xaodmuon);
checkAndSetIsolation(MuonParameters::nucone40 , xAOD::Iso::nucone40 , aodmuon, xaodmuon);
checkAndSetIsolation(MuonParameters::ptcone10 , xAOD::Iso::ptcone10 , aodmuon, xaodmuon);
//checkAndSetIsolation(MuonParameters::nucone10 , xAOD::Iso::nucone10 , aodmuon, xaodmuon);
//checkAndSetIsolation(MuonParameters::nucone20 , xAOD::Iso::nucone20 , aodmuon, xaodmuon);
//checkAndSetIsolation(MuonParameters::nucone30 , xAOD::Iso::nucone30 , aodmuon, xaodmuon);
//checkAndSetIsolation(MuonParameters::nucone40 , xAOD::Iso::nucone40 , aodmuon, xaodmuon);
//checkAndSetIsolation(MuonParameters::ptcone10 , xAOD::Iso::ptcone10 , aodmuon, xaodmuon);
checkAndSetIsolation(MuonParameters::ptcone20 , xAOD::Iso::ptcone20 , aodmuon, xaodmuon);
checkAndSetIsolation(MuonParameters::ptcone30 , xAOD::Iso::ptcone30 , aodmuon, xaodmuon);
checkAndSetIsolation(MuonParameters::ptcone40 , xAOD::Iso::ptcone40 , aodmuon, xaodmuon);
checkAndSetIsolation(MuonParameters::etconeNoEm10 , xAOD::Iso::etconeNoEm10 , aodmuon, xaodmuon);
checkAndSetIsolation(MuonParameters::etconeNoEm20 , xAOD::Iso::etconeNoEm20 , aodmuon, xaodmuon);
checkAndSetIsolation(MuonParameters::etconeNoEm30 , xAOD::Iso::etconeNoEm30 , aodmuon, xaodmuon);
checkAndSetIsolation(MuonParameters::etconeNoEm40 , xAOD::Iso::etconeNoEm40 , aodmuon, xaodmuon);
//checkAndSetIsolation(MuonParameters::etconeNoEm10 , xAOD::Iso::etconeNoEm10 , aodmuon, xaodmuon);
//checkAndSetIsolation(MuonParameters::etconeNoEm20 , xAOD::Iso::etconeNoEm20 , aodmuon, xaodmuon);
//checkAndSetIsolation(MuonParameters::etconeNoEm30 , xAOD::Iso::etconeNoEm30 , aodmuon, xaodmuon);
//checkAndSetIsolation(MuonParameters::etconeNoEm40 , xAOD::Iso::etconeNoEm40 , aodmuon, xaodmuon);
}
void MuonCnvAlg::checkAndSetIsolation(MuonParameters::ParamDef aodParameter,xAOD::Iso::IsolationType xaodParameter, const Analysis::Muon& aodmuon, xAOD::Muon& xaodmuon){
......
......@@ -62,10 +62,13 @@ namespace xAODMaker {
void setLinks(const Analysis::Muon& aodmuon, xAOD::Muon& xaodmuon) const;
void setMuonHitContent(const Analysis::Muon& aodmuon, xAOD::Muon& xaodmuon);
ElementLink<xAOD::TrackParticleContainer> getNewLink(const ElementLink<Rec::TrackParticleContainer>& oldLink, const std::string& name) const;
xAOD::Muon::Author convertAuthor(MuonParameters::Author aodAuthor); // conversion of author (release 17 to release 19)
std::string m_inDetTrackParticles; //!< Location/Key for xAOD::TrackParticles from ID.
std::string m_saTrackParticles ; //!< Location/Key for MS SA (extrap to beamline) xAOD::TrackParticles.
std::string m_cbTrackParticles ; //!< Location/Key for combined fit xAOD::TrackParticles.
std::string m_mgTrackParticles ; //!< Location/Key for MuGirl combined fit xAOD::TrackParticles; needed in conversion from release 17
// bool m_doConversionFromRel17; un-initilized variable that is actually never used, commenting out - coverity defect 28732
ToolHandle<xAOD::IMuonDressingTool> m_muonDressingTool;
}; // class MuonCnvAlg
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment