Skip to content
Snippets Groups Projects
Commit 7325d76c authored by scott snyder's avatar scott snyder
Browse files

BTagging: Fix null pointer dereferences.

Fix a couple potential null pointer references caught by the
undefined behavior sanitizer.
parent 778ad596
No related branches found
No related tags found
No related merge requests found
......@@ -375,7 +375,7 @@ namespace Analysis {
for (xAOD::JetContainer::const_iterator jetIter = jetContainer->begin(); jetIter != jetContainer->end(); ++jetIter, ++btagIter, ++infoSVIter) {
const xAOD::Jet& jetToTag = **jetIter;
const Trk::VxSecVertexInfo& myVertexInfo = **infoSVIter;
const Trk::VxSecVertexInfo* myVertexInfo = *infoSVIter;
const xAOD::TrackParticleContainer* theTrackParticleContainer = nullptr;
......@@ -422,7 +422,7 @@ namespace Analysis {
}
if (basename == "SV1") {
const Trk::VxSecVKalVertexInfo* myVertexInfoVKal = dynamic_cast<const Trk::VxSecVKalVertexInfo*>(&myVertexInfo);
const Trk::VxSecVKalVertexInfo* myVertexInfoVKal = dynamic_cast<const Trk::VxSecVKalVertexInfo*>(myVertexInfo);
ATH_MSG_DEBUG("#BTAG# Found valid VKalVertexInfo information: " << infoCont.key());
StatusCode sc = fillVkalVariables(**jetIter, *btagIter, myVertexInfoVKal, theTrackParticleContainer, basename);
if(sc.isFailure()){
......@@ -430,7 +430,7 @@ namespace Analysis {
return sc;
}
} else if (basename == "JetFitter") {
const Trk::VxJetFitterVertexInfo* myVertexInfoJetFitter = dynamic_cast<const Trk::VxJetFitterVertexInfo*>(&myVertexInfo);
const Trk::VxJetFitterVertexInfo* myVertexInfoJetFitter = dynamic_cast<const Trk::VxJetFitterVertexInfo*>(myVertexInfo);
ATH_MSG_DEBUG("#BTAG# Found valid VxJetFitterVertexInfo information: " << infoCont.key());
StatusCode sc = fillJFVariables(jetToTag, *btagIter, myVertexInfoJetFitter, theTrackParticleContainer, basename);
if(sc.isFailure()){
......
......@@ -177,7 +177,7 @@ namespace Analysis {
Trk::VxSecVertexInfoContainer::const_iterator infoSVIter = h_VxSecVertexInfoName->begin();
for (xAOD::JetContainer::const_iterator jetIter = h_JetCollectionName->begin(); jetIter != h_JetCollectionName->end(); ++jetIter, ++infoSVIter) {
const xAOD::Jet& jetToTag = **jetIter;
const Trk::VxSecVertexInfo& myVertexInfo = **infoSVIter;
const Trk::VxSecVertexInfo* myVertexInfo = *infoSVIter;
const xAOD::TrackParticleContainer* theTrackParticleContainer = 0;
//Get it from decor jet
......@@ -205,7 +205,7 @@ namespace Analysis {
inputIParticles.push_back(*inputTrackParticle);
}
if (const Trk::VxSecVKalVertexInfo* myVertexInfoVKal = dynamic_cast<const Trk::VxSecVKalVertexInfo*>(&myVertexInfo)) {
if (const Trk::VxSecVKalVertexInfo* myVertexInfoVKal = dynamic_cast<const Trk::VxSecVKalVertexInfo*>(myVertexInfo)) {
ATH_MSG_DEBUG("#BTAG# Found VKalVertexInfo information");
if(basename.find("MSV") == 0){
StatusCode sc = m_MSVvarFactory->createMSVContainer(jetToTag, myVertexInfoVKal, &(*h_BTagSVCollectionName), PrimaryVtx);
......@@ -224,7 +224,7 @@ namespace Analysis {
return sc;
}
}
} else if (const Trk::VxJetFitterVertexInfo* myVertexInfoJetFitter = dynamic_cast<const Trk::VxJetFitterVertexInfo*>(&myVertexInfo)) {
} else if (const Trk::VxJetFitterVertexInfo* myVertexInfoJetFitter = dynamic_cast<const Trk::VxJetFitterVertexInfo*>(myVertexInfo)) {
ATH_MSG_DEBUG("#BTAG# Found VxJetFitterVertexInfo information");
SG::WriteDecorHandle<xAOD::JetContainer,std::vector<ElementLink< xAOD::BTagVertexContainer> > > h_jetSVLinkName(m_jetSVLinkName);
std::vector< ElementLink< xAOD::BTagVertexContainer > > JFVtxLinks;
......
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