Commit bec1c44b authored by Christos Anastopoulos's avatar Christos Anastopoulos
Browse files

clang-tidy fixes

parent 60799c40
......@@ -12,10 +12,10 @@
#include <memory>
typedef ElementLink<xAOD::TruthParticleContainer> TruthLink_t;
typedef ElementLink<xAOD::CaloClusterContainer> ClusterLink_t;
typedef ElementLink<xAOD::ElectronContainer> ElectronLink_t;
typedef ElementLink<xAOD::PhotonContainer> PhotonLink_t;
using TruthLink_t = ElementLink<xAOD::TruthParticleContainer>;
using ClusterLink_t = ElementLink<xAOD::CaloClusterContainer>;
using ElectronLink_t = ElementLink<xAOD::ElectronContainer>;
using PhotonLink_t = ElementLink<xAOD::PhotonContainer>;
egammaTruthAssociationAlg::egammaTruthAssociationAlg(const std::string& name,
ISvcLocator* pSvcLocator)
......
......@@ -174,7 +174,7 @@ EMClusterTool::setNewCluster(const EventContext& ctx,
ATH_MSG_DEBUG("egamma object does not have a cluster associated");
return;
}
typedef ElementLink<xAOD::CaloClusterContainer> ClusterLink_t;
using ClusterLink_t = ElementLink<xAOD::CaloClusterContainer>;
xAOD::CaloCluster* cluster = nullptr;
// Special Case for topo seeded photons.
......
......@@ -134,7 +134,7 @@ EMTrackMatchBuilder::trackExecute(
eg->setDeltaPhiLast(bestTrkMatch.deltaPhiLast);
// set the element Links
typedef ElementLink<xAOD::TrackParticleContainer> EL;
using EL = ElementLink<xAOD::TrackParticleContainer>;
std::vector<EL> trackParticleLinks;
trackParticleLinks.reserve(trkMatches.size());
const std::string key = EL(*trackPC, 0).dataID();
......
......@@ -58,7 +58,7 @@ Trk::CompetingRIOsOnTrack& Trk::CompetingRIOsOnTrack::operator=(const Trk::Compe
Trk::CompetingRIOsOnTrack& Trk::CompetingRIOsOnTrack::operator=(Trk::CompetingRIOsOnTrack&& compROT) {
if (this!=&compROT) {
Trk::MeasurementBase::operator=(std::move(compROT));
Trk::MeasurementBase::operator=(compROT);
delete m_assignProb;
m_assignProb = compROT.m_assignProb;
......
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
......@@ -61,7 +61,7 @@ namespace Trk {
* Set compatibility of a new pair of tracks
*/
void setCompatibilityOfTo(PairOfVxVertexOnJetAxis,float);
void setCompatibilityOfTo(const PairOfVxVertexOnJetAxis&,float);
/**
* Get pair of tracks with highest compatibility
......
......@@ -99,7 +99,7 @@ namespace Trk {
}
void VxClusteringTable::setCompatibilityOfTo(PairOfVxVertexOnJetAxis pairOfVertices,float compatibility) {
void VxClusteringTable::setCompatibilityOfTo(const PairOfVxVertexOnJetAxis& pairOfVertices,float compatibility) {
if (compatibility!=0) {
m_compatibilityPairOfVertices[compatibility]=pairOfVertices;
}
......
......@@ -763,8 +763,8 @@ Trk::DenseEnvironmentsAmbiguityProcessorTool::refitTracksFromB(const Trk::Track*
void
Trk::DenseEnvironmentsAmbiguityProcessorTool::dumpStat(MsgStream &out) const{
auto parseFileName=[](const std::string & fullname){
auto dotPosition = fullname.rfind(".");
auto slashPosition = fullname.rfind("/");
auto dotPosition = fullname.rfind('.');
auto slashPosition = fullname.rfind('/');
auto stringLength = dotPosition - slashPosition;
return fullname.substr(slashPosition, stringLength);
};
......
......@@ -280,7 +280,7 @@ Trk::DenseEnvironmentsAmbiguityScoreProcessorTool::overlappingTracks(const Track
std::vector< std::pair< const InDet::PixelCluster*, const Trk::Track* > > sorted;
sorted.reserve( setOfPixelClustersToTrackAssoc.size() );
for( const std::pair< const InDet::PixelCluster* const, const Trk::Track* > &pixelTrackItem : setOfPixelClustersToTrackAssoc ) {
sorted.push_back( pixelTrackItem );
sorted.emplace_back(pixelTrackItem );
}
std::sort( sorted.begin(), sorted.end(), [](const std::pair< const InDet::PixelCluster*, const Trk::Track* > &a,
const std::pair< const InDet::PixelCluster*, const Trk::Track* > &b) {
......@@ -312,8 +312,8 @@ void
Trk::DenseEnvironmentsAmbiguityScoreProcessorTool::dumpStat(MsgStream &out) const
{
auto parseFileName=[](const std::string & fullname){
auto dotPosition = fullname.rfind(".");
auto slashPosition = fullname.rfind("/");
auto dotPosition = fullname.rfind('.');
auto slashPosition = fullname.rfind('/');
auto stringLength = dotPosition - slashPosition;
return fullname.substr(slashPosition, stringLength);
};
......
......@@ -516,8 +516,8 @@ void Trk::SimpleAmbiguityProcessorTool::dumpTracks( const TrackCollection& track
void
Trk::SimpleAmbiguityProcessorTool::dumpStat(MsgStream &out) const {
auto parseFileName=[](const std::string & fullname){
auto dotPosition = fullname.rfind(".");
auto slashPosition = fullname.rfind("/");
auto dotPosition = fullname.rfind('.');
auto slashPosition = fullname.rfind('/');
auto stringLength = dotPosition - slashPosition;
return fullname.substr(slashPosition, stringLength);
};
......
......@@ -170,7 +170,7 @@ std::vector< const Trk::PrepRawData* >
Trk::PRD_AssociationTool::getPrdsOnTrack(const Maps& maps,
const Trk::Track& track) const
{
typedef std::vector<const PrepRawData*> PRDs_t;
using PRDs_t = std::vector<const PrepRawData *>;
// test caching
TrackPrepRawDataMap::const_iterator itvec = maps.m_trackPrepRawDataMap.find(&track);
......
......@@ -108,7 +108,7 @@ std::vector< const Trk::PrepRawData* >
Trk::PRDtoTrackMapTool::getPrdsOnTrack(Trk::PRDtoTrackMap &virt_prd_to_track_map,
const Trk::Track& track) const
{
typedef std::vector<const Trk::PrepRawData*> PRDs_t;
using PRDs_t = std::vector<const Trk::PrepRawData *>;
ensureType(virt_prd_to_track_map);
PRDtoTrackMap &prd_to_track_map = static_cast<PRDtoTrackMap&>(virt_prd_to_track_map);
......
/*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "RIO_OnTrackErrorScalingKit.h"
#include "MuonRIO_OnTrack/MuonEtaPhiRIO_OnTrackErrorScaling.h"
typedef char * CharPtr_t;
using CharPtr_t = char *;
class MuonEtaPhiRIO_OnTrackErrorScalingKit
: public RIO_OnTrackErrorScalingSpecialisedKit<MuonEtaPhiRIO_OnTrackErrorScaling>
{
......
......@@ -274,7 +274,7 @@ void DetailedTrackTruthBuilder::addTrack(DetailedTrackTruthCollection *output,
++trackStat[subdet];
typedef PRD_MultiTruthCollection::const_iterator iprdt;
using iprdt = PRD_MultiTruthCollection::const_iterator;
std::pair<iprdt, iprdt> range = orderedPRD_Truth[subdet]->equal_range(id);
int n=0;
......@@ -475,7 +475,7 @@ SubDetHitStatistics DetailedTrackTruthBuilder::countPRDsOnTruth(const TruthTraje
continue;
}
if( (*p)->pdg_id()==999 ) { continue; }
typedef PRD_InverseTruth::const_iterator iter;
using iter = PRD_InverseTruth::const_iterator;
std::pair<iter,iter> range = inverseTruth.equal_range(*p);
for(iter i = range.first; i != range.second; ++i) {
SubDetHitStatistics::SubDetType subdet = findSubDetType(i->second);
......
......@@ -62,9 +62,9 @@ std::unique_ptr<AmgSymMatrix(5)> cov5()
}
typedef std::vector<std::unique_ptr<Trk::Perigee> > PerigeeUVec_t;
using PerigeeUVec_t = std::vector<std::unique_ptr<Trk::Perigee> >;
typedef std::vector<std::unique_ptr<Trk::NeutralPerigee> > NeutralUVec_t;
using NeutralUVec_t = std::vector<std::unique_ptr<Trk::NeutralPerigee> >;
NeutralUVec_t makeNeutrals1()
{
Amg::Vector3D pos0 { 0, 0, 0 };
......@@ -127,7 +127,7 @@ void setDefiningParameters( xAOD::NeutralParticle& tp,
}
typedef std::vector<std::unique_ptr<xAOD::TrackParticle> > xAODTPUVec_t;
using xAODTPUVec_t = std::vector<std::unique_ptr<xAOD::TrackParticle> >;
xAODTPUVec_t makexAODTP (PerigeeUVec_t&& perigees)
{
xAODTPUVec_t tracks;
......@@ -143,7 +143,7 @@ xAODTPUVec_t makexAODTP (PerigeeUVec_t&& perigees)
}
typedef std::vector<std::unique_ptr<xAOD::NeutralParticle> > xAODNPUVec_t;
using xAODNPUVec_t = std::vector<std::unique_ptr<xAOD::NeutralParticle> >;
xAODNPUVec_t makexAODNP (NeutralUVec_t&& perigees)
{
xAODNPUVec_t tracks;
......@@ -525,7 +525,7 @@ std::unique_ptr<AmgSymMatrix(5)> cov5a()
}
typedef std::vector<std::unique_ptr<Trk::Perigee> > PerigeeUVec_t;
using PerigeeUVec_t = std::vector<std::unique_ptr<Trk::Perigee> >;
PerigeeUVec_t makePerigees2()
{
Amg::Vector3D pos1a { 10*mm, 0*mm, -5*mm };
......
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************************************************
......@@ -57,7 +57,7 @@ namespace Trk
const xAOD::Vertex * V0Tools::v0Link(const xAOD::Vertex * vxCandidate) const
{
const xAOD::Vertex* v0(0);
const xAOD::Vertex* v0(nullptr);
const static SG::AuxElement::Accessor< ElementLink< xAOD::VertexContainer > > acc( "V0Link" );
if ((acc(*vxCandidate)).isValid()) {
v0 = *(acc(*vxCandidate));
......@@ -67,7 +67,7 @@ namespace Trk
const xAOD::Vertex * V0Tools::kshortLink(const xAOD::Vertex * vxCandidate) const
{
const xAOD::Vertex* v0(0);
const xAOD::Vertex* v0(nullptr);
const static SG::AuxElement::Accessor< ElementLink< xAOD::VertexContainer > > acc( "KshortLink" );
if ((acc(*vxCandidate)).isValid()) {
v0 = *(acc(*vxCandidate));
......@@ -77,7 +77,7 @@ namespace Trk
const xAOD::Vertex * V0Tools::lambdaLink(const xAOD::Vertex * vxCandidate) const
{
const xAOD::Vertex* v0(0);
const xAOD::Vertex* v0(nullptr);
const static SG::AuxElement::Accessor< ElementLink< xAOD::VertexContainer > > acc( "LambdaLink" );
if ((acc(*vxCandidate)).isValid()) {
v0 = *(acc(*vxCandidate));
......@@ -87,7 +87,7 @@ namespace Trk
const xAOD::Vertex * V0Tools::lambdabarLink(const xAOD::Vertex * vxCandidate) const
{
const xAOD::Vertex* v0(0);
const xAOD::Vertex* v0(nullptr);
const static SG::AuxElement::Accessor< ElementLink< xAOD::VertexContainer > > acc( "LambdabarLink" );
if ((acc(*vxCandidate)).isValid()) {
v0 = *(acc(*vxCandidate));
......@@ -141,7 +141,7 @@ namespace Trk
}
double error = -999999.;
Amg::MatrixX* fullCov = convertCovMatrix(vxCandidate);
if (fullCov == 0) {
if (fullCov == nullptr) {
ATH_MSG_DEBUG("0 pointer for full covariance. Making-up one from the vertex and tracks covariances");
error = massErrorVxCandidate(vxCandidate,masses);
} else {
......@@ -173,7 +173,7 @@ namespace Trk
return -999999.;
}
Amg::MatrixX* fullCov = convertCovMatrix(vxCandidate);
if (fullCov == 0) return -999999.;
if (fullCov == nullptr) return -999999.;
unsigned int ndim = fullCov->rows();
double E=0., Px=0., Py=0., Pz=0.;
std::vector<double>phi(NTrk), theta(NTrk), qOverP(NTrk), charge(NTrk), e(NTrk);
......@@ -243,7 +243,7 @@ namespace Trk
xAOD::TrackParticle::FourMom_t totalMom;
Amg::MatrixX tmpDeriv(3,3); tmpDeriv.setZero();
Amg::MatrixX* fullCov = convertCovMatrix(vxCandidate);
if (fullCov == 0) return -999999.;
if (fullCov == nullptr) return -999999.;
for( unsigned int it=0; it<NTrk; it++){
if (masses[it] >= 0.) {
......@@ -651,7 +651,7 @@ namespace Trk
}
unsigned int ndim = 0;
if (fullCov == 0) {
if (fullCov == nullptr) {
ndim = 5*NTrk+3;
} else {
ndim = fullCov->rows();
......@@ -668,7 +668,7 @@ namespace Trk
D_vec(5*it+3,0) = dPTdtheta[it];
D_vec(5*it+4,0) = dPTdqOverP[it];
}
if (fullCov == 0) {
if (fullCov == nullptr) {
Amg::MatrixX V0_cov = makeV0Cov(vxCandidate);
PtErrSq = D_vec.transpose() * V0_cov * D_vec;
} else {
......@@ -693,11 +693,11 @@ namespace Trk
Amg::Vector3D V0Tools::pca(const xAOD::Vertex * vxCandidate, const xAOD::Vertex* vertex) const
{
assert(vxCandidate!=0);
if(0 == vxCandidate) {
if(nullptr == vxCandidate) {
Amg::Vector3D p; p.setZero();
return p;
}
Amg::Vector3D pv = vertex->position();
const Amg::Vector3D& pv = vertex->position();
Amg::Vector3D sv = vtx(vxCandidate);
Amg::Vector3D P = V0Momentum(vxCandidate);
double p2 = P.mag2();
......@@ -814,7 +814,7 @@ namespace Trk
}
unsigned int ndim = 0;
if (fullCov != 0) {
if (fullCov != nullptr) {
ndim = fullCov->rows();
} else {
ndim = 5*NTrk+3;
......@@ -838,7 +838,7 @@ namespace Trk
D_vec(5*NTrk+5) = da0dz0;
Amg::MatrixX W_mat(5*NTrk+6,5*NTrk+6); W_mat.setZero();
if (fullCov != 0) {
if (fullCov != nullptr) {
W_mat.block(0,0,ndim,ndim) = *fullCov;
} else {
Amg::MatrixX V0_cov = makeV0Cov(vxCandidate);
......@@ -941,7 +941,7 @@ namespace Trk
}
unsigned int ndim = 0;
if (fullCov != 0) {
if (fullCov != nullptr) {
ndim = fullCov->rows();
} else {
ndim = 5*NTrk+3;
......@@ -965,7 +965,7 @@ namespace Trk
D_vec(5*NTrk+5) = da0dz0;
Amg::MatrixX W_mat(5*NTrk+6,5*NTrk+6); W_mat.setZero();
if (fullCov != 0) {
if (fullCov != nullptr) {
W_mat.block(0,0,ndim,ndim) = *fullCov;
} else {
Amg::MatrixX V0_cov = makeV0Cov(vxCandidate);
......@@ -1057,7 +1057,7 @@ namespace Trk
double dLxydy0 = -dLxydy;
unsigned int ndim = 0;
if (fullCov != 0) {
if (fullCov != nullptr) {
ndim = fullCov->rows();
} else {
ndim = 5*NTrk+3;
......@@ -1081,7 +1081,7 @@ namespace Trk
D_vec(5*NTrk+5) = 0.;
Amg::MatrixX W_mat(5*NTrk+6,5*NTrk+6); W_mat.setZero();
if (fullCov != 0) {
if (fullCov != nullptr) {
W_mat.block(0,0,ndim,ndim) = *fullCov;
} else {
Amg::MatrixX V0_cov = makeV0Cov(vxCandidate);
......@@ -1180,7 +1180,7 @@ namespace Trk
double dLxyzdz0 = -dLxyzdz;
unsigned int ndim = 0;
if (fullCov != 0) {
if (fullCov != nullptr) {
ndim = fullCov->rows();
} else {
ndim = 5*NTrk+3;
......@@ -1204,7 +1204,7 @@ namespace Trk
D_vec(5*NTrk+5) = dLxyzdz0;
Amg::MatrixX W_mat(5*NTrk+6,5*NTrk+6); W_mat.setZero();
if (fullCov != 0) {
if (fullCov != nullptr) {
W_mat.block(0,0,ndim,ndim) = *fullCov;
} else {
Amg::MatrixX V0_cov = makeV0Cov(vxCandidate);
......@@ -1369,7 +1369,7 @@ namespace Trk
double dTaudy0 = -dTaudy;
unsigned int ndim = 0;
if (fullCov != 0) {
if (fullCov != nullptr) {
ndim = fullCov->rows();
} else {
ndim = 5*NTrk+3;
......@@ -1393,7 +1393,7 @@ namespace Trk
D_vec(5*NTrk+5) = 0.;
Amg::MatrixX W_mat(5*NTrk+6,5*NTrk+6); W_mat.setZero();
if (fullCov != 0) {
if (fullCov != nullptr) {
W_mat.block(0,0,ndim,ndim) = *fullCov;
} else {
Amg::MatrixX V0_cov = makeV0Cov(vxCandidate);
......@@ -1503,7 +1503,7 @@ namespace Trk
double dTaudy0 = -dTaudy;
unsigned int ndim = 0;
if (fullCov != 0) {
if (fullCov != nullptr) {
ndim = fullCov->rows();
} else {
ndim = 5*NTrk+3;
......@@ -1527,7 +1527,7 @@ namespace Trk
D_vec(5*NTrk+5) = 0.;
Amg::MatrixX W_mat(5*NTrk+6,5*NTrk+6); W_mat.setZero();
if (fullCov != 0) {
if (fullCov != nullptr) {
W_mat.block(0,0,ndim,ndim) = *fullCov;
} else {
Amg::MatrixX V0_cov = makeV0Cov(vxCandidate);
......@@ -1657,7 +1657,7 @@ namespace Trk
double dTaudz0 = -dTaudz;
unsigned int ndim = 0;
if (fullCov != 0) {
if (fullCov != nullptr) {
ndim = fullCov->rows();
} else {
ndim = 5*NTrk+3;
......@@ -1681,7 +1681,7 @@ namespace Trk
D_vec(5*NTrk+5) = dTaudz0;
Amg::MatrixX W_mat(5*NTrk+6,5*NTrk+6); W_mat.setZero();
if (fullCov != 0) {
if (fullCov != nullptr) {
W_mat.block(0,0,ndim,ndim) = *fullCov;
} else {
Amg::MatrixX V0_cov = makeV0Cov(vxCandidate);
......@@ -1775,7 +1775,7 @@ namespace Trk
double dTaudz0 = -dTaudz;
unsigned int ndim = 0;
if (fullCov != 0) {
if (fullCov != nullptr) {
ndim = fullCov->rows();
} else {
ndim = 5*NTrk+3;
......@@ -1799,7 +1799,7 @@ namespace Trk
D_vec(5*NTrk+5) = dTaudz0;
Amg::MatrixX W_mat(5*NTrk+6,5*NTrk+6); W_mat.setZero();
if (fullCov != 0) {
if (fullCov != nullptr) {
W_mat.block(0,0,ndim,ndim) = *fullCov;
} else {
Amg::MatrixX V0_cov = makeV0Cov(vxCandidate);
......@@ -1957,7 +1957,7 @@ namespace Trk
const xAOD::TrackParticle* V0Tools::positiveOrigTrack(const xAOD::Vertex * vxCandidate) const
{
const xAOD::TrackParticle* origTrk(0);
const xAOD::TrackParticle* origTrk(nullptr);
unsigned int NTrk = vxCandidate->vxTrackAtVertex().size();
if (NTrk != 2) return origTrk;
for( unsigned int it=0; it<NTrk; it++) {
......@@ -1968,7 +1968,7 @@ namespace Trk
const xAOD::TrackParticle* V0Tools::negativeOrigTrack(const xAOD::Vertex * vxCandidate) const
{
const xAOD::TrackParticle* origTrk(0);
const xAOD::TrackParticle* origTrk(nullptr);
unsigned int NTrk = vxCandidate->vxTrackAtVertex().size();
if (NTrk != 2) return origTrk;
for( unsigned int it=0; it<NTrk; it++) {
......@@ -2235,7 +2235,7 @@ namespace Trk
for( unsigned int it=0; it<NTrk; it++) {
if (masses[it] >= 0.) {
const xAOD::TrackParticle* TP = origTrack(vxCandidate,it);
if (TP == 0) return -999999.;
if (TP == nullptr) return -999999.;
px += TP->p4().Px();
py += TP->p4().Py();
pz += TP->p4().Pz();
......@@ -2266,9 +2266,9 @@ namespace Trk
for( unsigned int it=0; it<NTrk; it++) {
if (masses[it] >= 0.) {
const xAOD::TrackParticle* TP = origTrack(vxCandidate,it);
if (TP == 0) return -999999.;
if (TP == nullptr) return -999999.;
const Trk::TrackParameters* extrPer = m_extrapolator->extrapolate(*TP, perigeeSurface);
if (extrPer == 0) return -999999.;
if (extrPer == nullptr) return -999999.;
px += extrPer->momentum().x();
py += extrPer->momentum().y();
pz += extrPer->momentum().z();
......@@ -2300,9 +2300,9 @@ namespace Trk
for( unsigned int it=0; it<NTrk; it++) {
if (masses[it] >= 0.) {
const xAOD::TrackParticle* TP = origTrack(vxCandidate,it);
if (TP == 0) return -999999.;
if (TP == nullptr) return -999999.;
const Trk::TrackParameters* extrPer = m_extrapolator->extrapolate(*TP, perigeeSurface);
if (extrPer == 0) return -999999.;
if (extrPer == nullptr) return -999999.;
px += extrPer->momentum().x();
py += extrPer->momentum().y();
pz += extrPer->momentum().z();
......@@ -2338,7 +2338,7 @@ namespace Trk
for( unsigned int it=0; it<NTrk; it++) {
if (masses[it] >= 0.) {
const xAOD::TrackParticle* TP = origTrack(vxCandidate,it);
if (TP == 0) return -999999.;
if (TP == nullptr) return -999999.;
const xAOD::ParametersCovMatrix_t cov_tmp = TP->definingParametersCovMatrix();
V0_cor(5*it+2,5*it+2) = cov_tmp(2,2);
V0_cor(5*it+2,5*it+3) = cov_tmp(2,3);
......@@ -2428,9 +2428,9 @@ namespace Trk
for( unsigned int it=0; it<NTrk; it++) {
if (masses[it] >= 0.) {
const xAOD::TrackParticle* TP = origTrack(vxCandidate,it);
if (TP == 0) return -999999.;
if (TP == nullptr) return -999999.;
const Trk::TrackParameters* extrPer = m_extrapolator->extrapolate(*TP, perigeeSurface);
if (extrPer == 0) return -999999.;
if (extrPer == nullptr) return -999999.;
const AmgSymMatrix(5)* cov_tmp = extrPer->covariance();
V0_cor(5*it+2,5*it+2) = (*cov_tmp)(2,2);
V0_cor(5*it+2,5*it+3) = (*cov_tmp)(2,3);
......@@ -2558,7 +2558,7 @@ namespace Trk
double dTaudy0 = -dTaudy;
unsigned int ndim = 0;
if (fullCov != 0) {
if (fullCov != nullptr) {
ndim = fullCov->rows();
} else {
ndim = 5*NTrk+3;
......@@ -2586,7 +2586,7 @@ namespace Trk
D_mat(5*NTrk+4,0) = CONST*dTaudy0;
D_mat(5*NTrk+5,0) = 0.;
Amg::MatrixX W_mat(5*NTrk+6,5*NTrk+6); W_mat.setZero();
if (fullCov != 0) {
if (fullCov != nullptr) {
W_mat.block(0,0,ndim,ndim) = *fullCov;
} else {
Amg::MatrixX V0_cov = makeV0Cov(vxCandidate);
......@@ -2708,7 +2708,7 @@ namespace Trk
double dTaudy0 = -dTaudy;
unsigned int ndim = 0;
if (fullCov != 0) {
if (fullCov != nullptr) {
ndim = fullCov->rows();
} else {
ndim = 5*NTrk+3;
......@@ -2735,7 +2735,7 @@ namespace Trk
D_mat(5*NTrk+4,0) = CONST*dTaudy0;
D_mat(5*NTrk+5,0) = 0.;
Amg::MatrixX W_mat(5*NTrk+6,5*NTrk+6); W_mat.setZero();
if (fullCov != 0) {
if (fullCov != nullptr) {
W_mat.block(0,0,ndim,ndim) = *fullCov;
} else {
Amg::MatrixX V0_cov = makeV0Cov(vxCandidate);
......@@ -2781,7 +2781,7 @@ namespace Trk
} else if (matrix.size() == (5*NTrk+3)*(5*NTrk+3+1)/2) {
ndim = 5*NTrk+3;
} else {
return NULL;
return nullptr;
}
Amg::MatrixX* mtx = new Amg::MatrixX(ndim,ndim);
......
/*
* Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
*/
/**
* @file TrkVertexFitters/src/AdaptiveMultiVertexFitterTestAlg.cxx
......@@ -54,7 +54,7 @@ std::unique_ptr<AmgSymMatrix(5)> cov5a()
}
typedef std::vector<std::unique_ptr<Trk::Perigee> > PerigeeUVec_t;