From c78764fb2a67914c4b57c189c5b89ebb75404032 Mon Sep 17 00:00:00 2001 From: policheh Date: Fri, 4 Feb 2011 15:35:48 +0000 Subject: [PATCH] Coverity fixes. --- PHOS/AliPHOSEvalRecPoint.cxx | 2 +- PHOS/AliPHOSPIDv0.cxx | 2 ++ PHOS/AliPHOSSDigitizer.cxx | 18 ++++++++++++++---- PHOS/AliPHOSTrackSegmentMakerv2.cxx | 13 ++++++++----- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/PHOS/AliPHOSEvalRecPoint.cxx b/PHOS/AliPHOSEvalRecPoint.cxx index d97708a28e9..fae088df97d 100644 --- a/PHOS/AliPHOSEvalRecPoint.cxx +++ b/PHOS/AliPHOSEvalRecPoint.cxx @@ -233,7 +233,7 @@ void AliPHOSEvalRecPoint::Init() // initialization AliPHOSClusterizer* clusterizer = GetClusterizer(); if(!clusterizer) { - Fatal("Init", "Cannot get clusterizer") ; + AliFatal("Cannot get clusterizer") ; } TClonesArray* digits = AliPHOSLoader::GetPHOSLoader(fEventFolderName)->Digits(); diff --git a/PHOS/AliPHOSPIDv0.cxx b/PHOS/AliPHOSPIDv0.cxx index 16fc7c6e916..df3a2e165cc 100644 --- a/PHOS/AliPHOSPIDv0.cxx +++ b/PHOS/AliPHOSPIDv0.cxx @@ -239,6 +239,8 @@ void AliPHOSPIDv0::MakeRecParticles() AliPHOSEmcRecPoint * emc = 0 ; if(ts->GetEmcIndex()>=0) emc = (AliPHOSEmcRecPoint *) fEMCRecPoints->At(ts->GetEmcIndex()) ; + else + AliFatal(Form("ts->GetEmcIndex() return illegal index %d",ts->GetEmcIndex())); AliPHOSRecPoint * cpv = 0 ; if(ts->GetCpvIndex()>=0) diff --git a/PHOS/AliPHOSSDigitizer.cxx b/PHOS/AliPHOSSDigitizer.cxx index fccd8ea227b..5c595abcb29 100644 --- a/PHOS/AliPHOSSDigitizer.cxx +++ b/PHOS/AliPHOSSDigitizer.cxx @@ -256,7 +256,10 @@ void AliPHOSSDigitizer::Exec(Option_t *option) //Now make SDigits from hits, for PHOS it is the same, so just copy for ( i = 0 ; i < hits->GetEntries() ; i++ ) { + AliPHOSHit * hit = dynamic_cast(hits->At(i)) ; + if(!hit) AliFatal("Wrong conversion to AliPHOSHit gives a null pointer!"); + // Assign primary number only if contribution is significant if( hit->GetEnergy() > fPrimThreshold) @@ -277,7 +280,10 @@ void AliPHOSSDigitizer::Exec(Option_t *option) sdigits->Expand(nSdigits) ; for (i = 0 ; i < nSdigits ; i++) { - AliPHOSDigit * digit = dynamic_cast(sdigits->At(i)) ; + + AliPHOSDigit * digit = dynamic_cast(sdigits->At(i)) ; + if(!digit) AliFatal("Wrong dynamic cast to AliPHOSDigit gives a null pointer!"); + digit->SetIndexInList(i) ; } @@ -355,7 +361,7 @@ void AliPHOSSDigitizer::PrintSDigits(Option_t * option) // Prints list of digits produced in the current pass of AliPHOSDigitizer AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ; - AliPHOSLoader * phosLoader = dynamic_cast(rl->GetLoader("PHOSLoader")); + AliPHOSLoader * phosLoader = static_cast(rl->GetLoader("PHOSLoader")); // Get PHOS Geometry object AliPHOSGeometry *geom; @@ -375,8 +381,8 @@ void AliPHOSSDigitizer::PrintSDigits(Option_t * option) Int_t maxEmc = geom->GetNModules() * geom->GetNCristalsInModule() ; Int_t index ; for (index = 0 ; (index < sdigits->GetEntriesFast()) && - ((dynamic_cast (sdigits->At(index)))->GetId() <= maxEmc) ; index++) { - digit = dynamic_cast( sdigits->At(index) ) ; + ((static_cast (sdigits->At(index)))->GetId() <= maxEmc) ; index++) { + digit = static_cast( sdigits->At(index) ) ; // if(digit->GetNprimary() == 0) // continue; // printf("%6d %8d %6.5e %4d %2d :\n", // YVK @@ -416,6 +422,10 @@ void AliPHOSSDigitizer::Unload() const // Unloads the objects from the folder AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ; AliPHOSLoader * phosLoader = dynamic_cast(rl->GetLoader("PHOSLoader")); + + if(!phosLoader) + AliFatal("Wrong dynamic cast from AliRunLoader to AliPHOSLoader gives a null pointer!"); + phosLoader->UnloadHits() ; phosLoader->UnloadSDigits() ; } diff --git a/PHOS/AliPHOSTrackSegmentMakerv2.cxx b/PHOS/AliPHOSTrackSegmentMakerv2.cxx index 7df3d11d05f..fdb853158ea 100644 --- a/PHOS/AliPHOSTrackSegmentMakerv2.cxx +++ b/PHOS/AliPHOSTrackSegmentMakerv2.cxx @@ -172,7 +172,7 @@ void AliPHOSTrackSegmentMakerv2::FillOneModule() //First EMC clusters Int_t totalEmc = fEMCRecPoints->GetEntriesFast() ; for(fEmcFirst = fEmcLast; (fEmcLast < totalEmc) && - ((dynamic_cast(fEMCRecPoints->At(fEmcLast)))->GetPHOSMod() == fModule ); + ((static_cast(fEMCRecPoints->At(fEmcLast)))->GetPHOSMod() == fModule ); fEmcLast ++) ; //Now TPC tracks @@ -294,7 +294,7 @@ void AliPHOSTrackSegmentMakerv2::MakeLinks() Int_t iEmcRP; for(iEmcRP = fEmcFirst; iEmcRP < fEmcLast; iEmcRP++ ) { - emcclu = dynamic_cast(fEMCRecPoints->At(iEmcRP)) ; + emcclu = static_cast(fEMCRecPoints->At(iEmcRP)) ; TVector3 vecEmc ; emcclu->GetLocalPosition(vecEmc) ; Int_t mod=emcclu->GetPHOSMod() ; @@ -325,8 +325,11 @@ void AliPHOSTrackSegmentMakerv2::MakePairs() //Make arrays to mark clusters already chosen Int_t * emcExist = 0; + if(fEmcLast > fEmcFirst) emcExist = new Int_t[fEmcLast-fEmcFirst] ; + else + AliFatal(Form("fEmcLast > fEmcFirst: %d > %d is not true!",fEmcLast,fEmcFirst)); Int_t index; for(index = 0; index GetXZ(dx,dz) ; new ((* fTrackSegments)[fNTrackSegments]) - AliPHOSTrackSegment(dynamic_cast(fEMCRecPoints->At(linkUp->GetEmc())) , + AliPHOSTrackSegment(static_cast(fEMCRecPoints->At(linkUp->GetEmc())) , nullpointer, linkUp->GetTrack(),dx,dz) ; - (dynamic_cast(fTrackSegments->At(fNTrackSegments)))->SetIndexInList(fNTrackSegments); + (static_cast(fTrackSegments->At(fNTrackSegments)))->SetIndexInList(fNTrackSegments); fNTrackSegments++ ; emcExist[linkUp->GetEmc()-fEmcFirst] = -1 ; //Mark emc that Cpv was found //mark track as already used @@ -375,7 +378,7 @@ void AliPHOSTrackSegmentMakerv2::MakePairs() for(iEmcRP = 0; iEmcRP < fEmcLast-fEmcFirst ; iEmcRP++ ){ if(emcExist[iEmcRP] > 0 ){ new ((*fTrackSegments)[fNTrackSegments]) - AliPHOSTrackSegment(dynamic_cast(fEMCRecPoints->At(iEmcRP+fEmcFirst)), + AliPHOSTrackSegment(static_cast(fEMCRecPoints->At(iEmcRP+fEmcFirst)), nullpointer) ; (dynamic_cast(fTrackSegments->At(fNTrackSegments)))->SetIndexInList(fNTrackSegments); fNTrackSegments++; -- 2.39.3