From 08fbc0bf4c71b3f253f14c3603ea486c3b1eb8e9 Mon Sep 17 00:00:00 2001
From: schaffer <R.D.Schaffer@cern.ch>
Date: Sun, 24 May 2020 14:35:04 +0200
Subject: [PATCH] moving some return 0 to return nullptr
---
.../src/TRT_SegmentToTrackTool.cxx | 16 ++---
.../src/MuonTrackExtrapolationTool.cxx | 28 ++++----
.../src/MooTrackBuilder.cxx | 66 +++++++++----------
.../src/MuidCaloTrackStateOnSurface.cxx | 44 ++++++-------
.../src/MuonCombinedFitTagTool.cxx | 4 +-
5 files changed, 79 insertions(+), 79 deletions(-)
diff --git a/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/TRT_SegmentToTrackTool.cxx b/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/TRT_SegmentToTrackTool.cxx
index 653fef22953..3afdb7a5689 100644
--- a/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/TRT_SegmentToTrackTool.cxx
+++ b/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/TRT_SegmentToTrackTool.cxx
@@ -156,7 +156,7 @@ namespace InDet {
//
if (!tS.fitQuality()) {
ATH_MSG_DEBUG ("Segment has no fit quality ! Discard...");
- return 0;
+ return nullptr;
}
const Trk::FitQuality* fq = tS.fitQuality()->clone();
@@ -178,7 +178,7 @@ namespace InDet {
// clean up
delete fq; fq = 0;
delete ep; ep = 0;
- return 0;
+ return nullptr;
}
// --- create new track state on surface vector
@@ -203,7 +203,7 @@ namespace InDet {
delete ntsos; ntsos = 0;
delete segPar; segPar = 0;
delete fq; fq = 0;
- return 0;
+ return nullptr;
}
// now create a perigee TSOS
@@ -343,7 +343,7 @@ namespace InDet {
ATH_MSG_DEBUG ("Could not produce perigee");
delete newTrack; newTrack = 0;
delete segPar; segPar = 0;
- return 0;
+ return nullptr;
}
// keep some values
@@ -458,7 +458,7 @@ namespace InDet {
const AtlasFieldCacheCondObj* fieldCondObj{*readHandle};
if (fieldCondObj == nullptr) {
ATH_MSG_ERROR("segToTrack: Failed to retrieve AtlasFieldCacheCondObj with key " << m_fieldCacheCondObjInputKey.key());
- return 0;
+ return nullptr;
}
fieldCondObj->getInitializedCache (fieldCache);
@@ -541,7 +541,7 @@ namespace InDet {
if(!fitTrack){
ATH_MSG_DEBUG ("Refit of TRT track segment failed!");
- return 0;
+ return nullptr;
}
//
@@ -561,7 +561,7 @@ namespace InDet {
if (!perTrack || !perTrack->covariance() ){
ATH_MSG_ERROR ("Cast of perigee fails, should never happen !");
- return 0;
+ return nullptr;
}else {
ATH_MSG_VERBOSE ("Perigee after refit with fudges to make it converge : " << (*perTrack) );
@@ -616,7 +616,7 @@ namespace InDet {
const AmgSymMatrix(5)& CM = *perTrack->covariance();
if( CM(1,1)==0.||CM(3,3)==0. ) {
ATH_MSG_DEBUG ("Hacked perigee covariance is CRAP, reject track");
- delete fitTrack; return 0;
+ delete fitTrack; return nullptr;
} else {
ATH_MSG_VERBOSE ("Perigee after fit with scaled covariance matrix : " << *perTrack);
}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackExtrapolationTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackExtrapolationTool.cxx
index 501920bf2cd..d28e275676e 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackExtrapolationTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackExtrapolationTool.cxx
@@ -65,15 +65,15 @@ namespace Muon {
const Trk::TrackParameters* MuonTrackExtrapolationTool::extrapolateToMuonEntryRecord( const Trk::TrackParameters& pars,
Trk::ParticleHypothesis particleHypo ) const {
- if( m_muonExtrapolator.empty() ) return 0;
+ if( m_muonExtrapolator.empty() ) return nullptr;
if( !m_trackingGeometrySvc->trackingGeometry() ){
ATH_MSG_WARNING(" " << m_trackingGeometrySvc << " has no valid trackingGeometry pointer" );
- return 0;
+ return nullptr;
}
const Trk::TrackingVolume* msEntrance = m_trackingGeometrySvc->trackingGeometry()->trackingVolume(m_msEntranceName.c_str());
if( !msEntrance ) {
ATH_MSG_WARNING(" MS entrance not found" );
- return 0;
+ return nullptr;
}
Trk::PropDirection dir = Trk::oppositeMomentum;
@@ -99,7 +99,7 @@ namespace Muon {
const Trk::TrackParameters* MuonTrackExtrapolationTool::extrapolateToIP( const Trk::TrackParameters& pars, Trk::ParticleHypothesis particleHypo ) const {
- if( m_atlasExtrapolator.empty() ) return 0;
+ if( m_atlasExtrapolator.empty() ) return nullptr;
// temporary hack to avoid crashes in Muid.
Amg::Vector3D refPos(0.1,0.1,0.1);
@@ -137,10 +137,10 @@ namespace Muon {
const Trk::TrackingVolume* msEntrance = m_trackingGeometrySvc->trackingGeometry()->trackingVolume(m_msEntranceName.c_str());
if( !msEntrance ) {
ATH_MSG_WARNING("Failed to obtain muon entry volume");
- return 0;
+ return nullptr;
}
const Trk::Perigee* pp = track.perigeeParameters();
- if( !pp ) return 0;
+ if( !pp ) return nullptr;
const Trk::TrackParameters* closestPars = pp;
const Trk::TrackParameters* closestMeasPars = pp->covariance() ? pp : 0;
@@ -317,8 +317,8 @@ namespace Muon {
Trk::Track* MuonTrackExtrapolationTool::extrapolate( const Trk::Track& track ) const {
- if( m_muonExtrapolator.empty() ) return 0;
- // if straightline track and the field is on return 0
+ if( m_muonExtrapolator.empty() ) return nullptr;
+ // if straightline track and the field is on return nullptr
bool isSL = m_edmHelperSvc->isSLTrack(track);
if( isSL ) { // check isSL first to limit access overhead
MagField::AtlasFieldCache fieldCache;
@@ -329,21 +329,21 @@ namespace Muon {
if (fieldCondObj == nullptr) {
ATH_MSG_ERROR("SCTSiLorentzAngleCondAlg : Failed to retrieve AtlasFieldCacheCondObj with key " << m_fieldCacheCondObjInputKey.key());
- return 0;
+ return nullptr;
}
fieldCondObj->getInitializedCache (fieldCache);
if( fieldCache.toroidOn() ) {
- return 0;
+ return nullptr;
}
}
const Trk::Perigee* pp = track.perigeeParameters();
- if( !pp ) return 0;
+ if( !pp ) return nullptr;
const Trk::TrackParameters* firstPars = findClosestParametersToMuonEntry(track);
if( !firstPars ){
ATH_MSG_WARNING("failed to find closest parameters to muon entry ");
- return 0;
+ return nullptr;
}
// extrapolate to muon entry record
@@ -365,7 +365,7 @@ namespace Muon {
// check mometum, this should always work for high pt track but low momentum track could get stuck
if( firstPars->momentum().mag() < 7000. ) ATH_MSG_DEBUG("lower energy muon lost during extrapolation ");
else ATH_MSG_WARNING("failed to extrapolate parameters to muon entry and perigee ");
- return 0;
+ return nullptr;
}
// sanity check for cosmics, if we are at the IP we should not
@@ -390,7 +390,7 @@ namespace Muon {
// double check
if( !perigee ){
ATH_MSG_WARNING(" failed to create perigee ");
- return 0;
+ return nullptr;
}
// direction of perigee
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackBuilder.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackBuilder.cxx
index ea83d424456..fb748109272 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackBuilder.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackBuilder.cxx
@@ -83,7 +83,7 @@ namespace Muon {
if (fieldCondObj == nullptr) {
ATH_MSG_ERROR("SCTSiLorentzAngleCondAlg : Failed to retrieve AtlasFieldCacheCondObj with key " << m_fieldCacheCondObjInputKey.key());
- return 0;
+ return nullptr;
}
fieldCondObj->getInitializedCache (fieldCache);
if( !fieldCache.toroidOn() ) return m_slFitter->refit(track);
@@ -100,7 +100,7 @@ namespace Muon {
Trk::Track* finalTrack = m_hitRecoverTool->recover(track.track());
if( !finalTrack ) {
ATH_MSG_WARNING(" final track lost, this should not happen " );
- return 0;
+ return nullptr;
}
ATH_MSG_VERBOSE("refine: after recovery " << std::endl
<< m_printer->print(*finalTrack) << std::endl
@@ -161,7 +161,7 @@ namespace Muon {
// try to get track
Trk::Track* track = combine( seg1, seg2, externalPhiHits );
- if( !track ) return 0;
+ if( !track ) return nullptr;
// create MuonSegment
MuonSegment* seg = m_trackToSegmentTool->convert(*track);
@@ -178,12 +178,12 @@ namespace Muon {
Trk::Track* MooTrackBuilder::combine( const MuonSegment& seg1, const MuonSegment& seg2, const PrepVec* externalPhiHits ) const {
// convert segments
MuPatSegment* segInfo1 = m_candidateHandler->createSegInfo(seg1);
- if( !segInfo1 ) return 0;
+ if( !segInfo1 ) return nullptr;
MuPatSegment* segInfo2 = m_candidateHandler->createSegInfo(seg2);
if( !segInfo2 ) {
delete segInfo1;
- return 0;
+ return nullptr;
}
// call fit()
@@ -200,7 +200,7 @@ namespace Muon {
// try to get track
Trk::Track* track = combine( firstCandidate, secondCandidate, externalPhiHits );
- if( !track ) return 0;
+ if( !track ) return nullptr;
// create MuonSegment
MuonSegment* seg = m_trackToSegmentTool->convert(*track);
@@ -222,7 +222,7 @@ namespace Muon {
if (m_doTimeOutChecks && Athena::Timeout::instance().reached() ) {
ATH_MSG_DEBUG("Timeout reached. Aborting sequence." );
++m_nTimedOut;
- return 0;
+ return nullptr;
}
@@ -269,7 +269,7 @@ namespace Muon {
esit != candidate->excludedSegments().end(); ++esit ) {
if(*esit == segment) {
ATH_MSG_DEBUG(" Rejected segment based on exclusion list" );
- return 0;
+ return nullptr;
}
}
}
@@ -311,7 +311,7 @@ namespace Muon {
// if all segments are already part of an existing track, don't perform the fit
if( foundSegments.size() == segments.size() ){
ATH_MSG_DEBUG("Combination already part of an existing track");
- return 0;
+ return nullptr;
}
// if all segments but one are already part of an existing track, check the exclusion list
@@ -331,13 +331,13 @@ namespace Muon {
if( unassociatedSegments.size() != 1 ) {
ATH_MSG_DEBUG("Inconsistent result from set difference: size result " << unassociatedSegments.size()
<< " candidate " << segments.size() << " found " << foundSegments.size() );
- return 0;
+ return nullptr;
}
// check that the result is indeed part of the original set
if( !segments.count(unassociatedSegments.front()) ){
ATH_MSG_DEBUG("Segment point not part of the original set, aborting!");
- return 0;
+ return nullptr;
}
// now check whether the segment is part of the excluded segments
@@ -346,7 +346,7 @@ namespace Muon {
unassociatedSegments.front() );
if( pos != candidate->excludedSegments().end() ){
ATH_MSG_DEBUG("Segment found in exclusion list, not performing fit");
- return 0;
+ return nullptr;
}
}
}
@@ -363,7 +363,7 @@ namespace Muon {
if (fieldCondObj == nullptr) {
ATH_MSG_ERROR("SCTSiLorentzAngleCondAlg : Failed to retrieve AtlasFieldCacheCondObj with key " << m_fieldCacheCondObjInputKey.key());
- return 0;
+ return nullptr;
}
fieldCondObj->getInitializedCache (fieldCache);
@@ -376,12 +376,12 @@ namespace Muon {
const PrepVec* externalPhiHits ) const {
// convert segments
MuPatTrack* candidate = m_candidateHandler->createCandidate(new Trk::Track(track));
- if( !candidate ) return 0;
+ if( !candidate ) return nullptr;
MuPatSegment* segInfo = m_candidateHandler->createSegInfo(seg);
if( !segInfo ) {
delete candidate;
- return 0;
+ return nullptr;
}
// call fit()
@@ -398,12 +398,12 @@ namespace Muon {
const PrepVec* externalPhiHits ) const {
// convert segments
MuPatTrack* candidate = m_candidateHandler->createCandidate(new Trk::Track(track));
- if( !candidate ) return 0;
+ if( !candidate ) return nullptr;
MuPatSegment* segInfo = m_candidateHandler->createSegInfo(seg);
if( !segInfo ) {
delete candidate;
- return 0;
+ return nullptr;
}
// call fit()
@@ -432,7 +432,7 @@ namespace Muon {
const DataVector<const Trk::TrackStateOnSurface>* states = track.trackStateOnSurfaces();
if( !states ){
ATH_MSG_DEBUG(" track without states! " );
- return 0;
+ return nullptr;
}
// loop over TSOSs
@@ -476,7 +476,7 @@ namespace Muon {
// return clone of parameters
if( closestParameters ) return closestParameters->clone();
- return 0;
+ return nullptr;
}
@@ -503,7 +503,7 @@ namespace Muon {
const PrepVec* patternPhiHits ) const {
// convert track
MuPatTrack* can = m_candidateHandler->createCandidate(new Trk::Track(track));
- if( !can ) return 0;
+ if( !can ) return nullptr;
std::vector<Trk::Track*>* tracks = combineWithSegmentFinding(*can,pars,chIds,patternPhiHits);
delete can;
@@ -526,19 +526,19 @@ namespace Muon {
// get chamber Id of segment
std::set<Identifier> chIds = m_edmHelperSvc->chamberIds(seg);
- if( chIds.empty() ) return 0;
+ if( chIds.empty() ) return nullptr;
// for now do not redo segment making for CSCs
if( m_idHelperSvc->isCsc( *chIds.begin() ) ){
if( m_candidateMatchingTool->match(candidate,segInfo,true) ) {
Trk::Track* newtrack = m_fitter->fit(candidate,segInfo,externalPhiHits);
- if( !newtrack ) return 0;
+ if( !newtrack ) return nullptr;
std::vector<Trk::Track*>* newTracks = new std::vector<Trk::Track*>;
newTracks->push_back(newtrack);
return newTracks;
}else{
- return 0;
+ return nullptr;
}
}
@@ -551,7 +551,7 @@ namespace Muon {
if( !closestPars ) {
ATH_MSG_WARNING( " unable to find closest TrackParameters " );
- return 0;
+ return nullptr;
}
ATH_MSG_VERBOSE(" closest parameter " << m_printer->print(*closestPars) );
@@ -565,7 +565,7 @@ namespace Muon {
if( !exPars ) {
ATH_MSG_WARNING( " Propagation failed!! " );
- return 0;
+ return nullptr;
}
ATH_MSG_VERBOSE(" extrapolated parameter " << m_printer->print(*exPars) );
@@ -645,11 +645,11 @@ namespace Muon {
const std::set<Identifier>& chIds,
const PrepVec* externalPhiHits ) const {
- if( chIds.empty() ) return 0;
+ if( chIds.empty() ) return nullptr;
if( !m_idHelperSvc->isMdt(*chIds.begin()) ) {
ATH_MSG_WARNING("combineWithSegmentFinding called with CSC hits!! retuning zero pointer");
- return 0;
+ return nullptr;
}
// redo segment finding
@@ -658,11 +658,11 @@ namespace Muon {
// check whether we got segments
if( !segments ) {
ATH_MSG_DEBUG(" failed to find new segments " );
- return 0;
+ return nullptr;
}
if( segments->empty() ){
ATH_MSG_DEBUG(" got empty vector!! " );
- return 0;
+ return nullptr;
}
unsigned int nseg=segments->size();
@@ -724,7 +724,7 @@ namespace Muon {
if( !newTracks || newTracks->empty() ){
delete newTracks;
- return 0;
+ return nullptr;
}
ATH_MSG_DEBUG(" found new tracks for segment " << newTracks->size() );
@@ -738,7 +738,7 @@ namespace Muon {
const DataVector<const Trk::TrackStateOnSurface>* states = track.trackStateOnSurfaces();
if( !states ){
ATH_MSG_DEBUG(" track without states, discarding track " );
- return 0;
+ return nullptr;
}
if( msgLvl(MSG::DEBUG) ) {
msg(MSG::DEBUG) << MSG::DEBUG << " recalibrating hits on track " << std::endl
@@ -1057,7 +1057,7 @@ namespace Muon {
std::vector<MuPatTrack*>* MooTrackBuilder::find( MuPatCandidateBase& candidate, const std::vector<MuPatSegment*>& segVec ) const {
// check whether we have segments
- if( segVec.empty() ) return 0;
+ if( segVec.empty() ) return nullptr;
std::vector<MuPatTrack*>* candidates = new std::vector<MuPatTrack*>();
std::set<MuPatSegment*> usedSegments;
@@ -1561,7 +1561,7 @@ namespace Muon {
}
// did we find any?
- if( !foundSplitTracks ) return 0;
+ if( !foundSplitTracks ) return nullptr;
// loop over the new track vector and create a new TrackCollection
TrackCollection* newTracks = new TrackCollection();
newTracks->reserve(goodTracks.size());
diff --git a/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/MuidCaloTrackStateOnSurface.cxx b/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/MuidCaloTrackStateOnSurface.cxx
index 1598e58278c..89bbe88a79f 100755
--- a/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/MuidCaloTrackStateOnSurface.cxx
+++ b/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/MuidCaloTrackStateOnSurface.cxx
@@ -160,7 +160,7 @@ MuidCaloTrackStateOnSurface::caloTSOS(const Trk::TrackParameters& parameters) co
if (fieldCondObj == nullptr) {
ATH_MSG_ERROR("SCTSiLorentzAngleCondAlg : Failed to retrieve AtlasFieldCacheCondObj with key " << m_fieldCacheCondObjInputKey.key());
- return 0;
+ return nullptr;
}
fieldCondObj->getInitializedCache (fieldCache);
@@ -444,7 +444,7 @@ MuidCaloTrackStateOnSurface::innerTSOS (const Trk::TrackParameters& parameters)
{
ATH_MSG_DEBUG( " innerTSOS: extrapolation fails " );
delete extrapolation;
- return 0;
+ return nullptr;
}
return m_caloMaterialParam->trackStateOnSurface(extrapolation);
@@ -458,7 +458,7 @@ MuidCaloTrackStateOnSurface::outerTSOS (const Trk::TrackParameters& parameters)
{
ATH_MSG_DEBUG( " outerTSOS: extrapolation fails " );
delete extrapolation;
- return 0;
+ return nullptr;
}
return m_caloMaterialParam->trackStateOnSurface(extrapolation);
@@ -474,7 +474,7 @@ MuidCaloTrackStateOnSurface::middleTSOS (const Trk::TrackParameters& middleParam
{
ATH_MSG_DEBUG( " middleTSOS: extrapolation fails " );
delete extrapolation;
- return 0;
+ return nullptr;
}
const Trk::TrackStateOnSurface* TSOS = 0;
@@ -523,7 +523,7 @@ MuidCaloTrackStateOnSurface::innerParameters (const Trk::TrackParameters& parame
oppositeDirection = Trk::alongMomentum;
}
}
- if (! surface) return 0;
+ if (! surface) return nullptr;
// extrapolate to calo surface (take care to get correct cylinder intersect)
unsigned extrapolations = 0;
@@ -546,14 +546,14 @@ MuidCaloTrackStateOnSurface::innerParameters (const Trk::TrackParameters& parame
false,
*m_magFieldProperties,
Trk::nonInteracting);
- if (! extrapolation) return 0;
+ if (! extrapolation) return nullptr;
// phi flip means track has crossed beam-axis (so quit)
double deltaPhi = std::abs(extrapolation->position().phi() - startingPhi);
if (deltaPhi > 0.5*M_PI && deltaPhi < 1.5*M_PI)
{
delete extrapolation;
- return 0;
+ return nullptr;
}
// also quit wrong rz-direction in endcap
@@ -565,7 +565,7 @@ MuidCaloTrackStateOnSurface::innerParameters (const Trk::TrackParameters& parame
{
ATH_MSG_VERBOSE( " wrong way in endcap " );
delete extrapolation;
- return 0;
+ return nullptr;
}
}
@@ -611,7 +611,7 @@ MuidCaloTrackStateOnSurface::innerParameters (const Trk::TrackParameters& parame
if (oldParameters == ¶meters)
{
ATH_MSG_VERBOSE( " innerParameters: extrap fails " );
- return 0;
+ return nullptr;
}
if (restart)
{
@@ -647,7 +647,7 @@ MuidCaloTrackStateOnSurface::innerParameters (const Trk::TrackParameters& parame
if (deltaPhi > 0.5*M_PI && deltaPhi < 1.5*M_PI)
{
delete extrapolation;
- return 0;
+ return nullptr;
}
ATH_MSG_VERBOSE( " innerParameters: success after "
@@ -690,7 +690,7 @@ MuidCaloTrackStateOnSurface::middleParameters (const Trk::TrackParameters& param
oppositeDirection = Trk::alongMomentum;
}
}
- if (! surface) return 0;
+ if (! surface) return nullptr;
// extrapolate to calo surface (take care to get correct cylinder intersect)
unsigned extrapolations = 0;
@@ -713,14 +713,14 @@ MuidCaloTrackStateOnSurface::middleParameters (const Trk::TrackParameters& param
false,
*m_magFieldProperties,
Trk::nonInteracting);
- if (! extrapolation) return 0;
+ if (! extrapolation) return nullptr;
// phi flip means track has crossed beam-axis (so quit)
double deltaPhi = std::abs(extrapolation->position().phi() - startingPhi);
if (deltaPhi > 0.5*M_PI && deltaPhi < 1.5*M_PI)
{
delete extrapolation;
- return 0;
+ return nullptr;
}
// also quit wrong rz-direction in endcap
@@ -732,7 +732,7 @@ MuidCaloTrackStateOnSurface::middleParameters (const Trk::TrackParameters& param
{
ATH_MSG_VERBOSE( " wrong way in endcap " );
delete extrapolation;
- return 0;
+ return nullptr;
}
}
@@ -778,7 +778,7 @@ MuidCaloTrackStateOnSurface::middleParameters (const Trk::TrackParameters& param
if (oldParameters == ¶meters)
{
ATH_MSG_VERBOSE( " middleParameters: extrap fails " );
- return 0;
+ return nullptr;
}
// arbitrary choice for oscillating solutions (i.e. following restart)
if (restart)
@@ -815,7 +815,7 @@ MuidCaloTrackStateOnSurface::middleParameters (const Trk::TrackParameters& param
if (deltaPhi > 0.5*M_PI && deltaPhi < 1.5*M_PI)
{
delete extrapolation;
- return 0;
+ return nullptr;
}
ATH_MSG_VERBOSE( " middleParameters: success after "
@@ -858,7 +858,7 @@ MuidCaloTrackStateOnSurface::outerParameters (const Trk::TrackParameters& parame
oppositeDirection = Trk::alongMomentum;
}
}
- if (! surface) return 0;
+ if (! surface) return nullptr;
// extrapolate to calo surface (take care to get correct cylinder intersect)
unsigned extrapolations = 0;
@@ -881,14 +881,14 @@ MuidCaloTrackStateOnSurface::outerParameters (const Trk::TrackParameters& parame
false,
*m_magFieldProperties,
Trk::nonInteracting);
- if (! extrapolation) return 0;
+ if (! extrapolation) return nullptr;
// phi flip means track has crossed beam-axis (so quit)
double deltaPhi = std::abs(extrapolation->position().phi() - startingPhi);
if (deltaPhi > 0.5*M_PI && deltaPhi < 1.5*M_PI)
{
delete extrapolation;
- return 0;
+ return nullptr;
}
// also quit wrong rz-direction in endcap
@@ -900,7 +900,7 @@ MuidCaloTrackStateOnSurface::outerParameters (const Trk::TrackParameters& parame
{
ATH_MSG_VERBOSE( " wrong way in endcap " );
delete extrapolation;
- return 0;
+ return nullptr;
}
}
@@ -946,7 +946,7 @@ MuidCaloTrackStateOnSurface::outerParameters (const Trk::TrackParameters& parame
if (oldParameters == ¶meters)
{
ATH_MSG_VERBOSE( " outerParameters: extrap fails " );
- return 0;
+ return nullptr;
}
// arbitrary choice for oscillating solutions (i.e. following restart)
if (restart)
@@ -983,7 +983,7 @@ MuidCaloTrackStateOnSurface::outerParameters (const Trk::TrackParameters& parame
if (deltaPhi > 0.5*M_PI && deltaPhi < 1.5*M_PI)
{
delete extrapolation;
- return 0;
+ return nullptr;
}
ATH_MSG_VERBOSE( " outerParameters: success after "
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.cxx
index 164476a1b0f..89c8a5734b9 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.cxx
@@ -312,7 +312,7 @@ namespace MuonCombined {
}
delete combinedTrack;
- return 0;
+ return nullptr;
}
@@ -391,7 +391,7 @@ namespace MuonCombined {
if (fieldCondObj == nullptr) {
ATH_MSG_ERROR("SCTSiLorentzAngleCondAlg : Failed to retrieve AtlasFieldCacheCondObj with key " << m_fieldCacheCondObjInputKey.key());
- return 0;
+ return nullptr;
}
fieldCondObj->getInitializedCache (fieldCache);
if (!fieldCache.toroidOn()) dorefit = false;
--
GitLab