Coverity fixes

diff --git a/STEER/ESD/AliESDtrack.cxx b/STEER/ESD/AliESDtrack.cxx
index 1856677d953f6915026aeecb631200f40f2e81ab..8fe37bdd567df958a1bc657550654c0aa992832e 100644 (file)
--- a/STEER/ESD/AliESDtrack.cxx
+++ b/STEER/ESD/AliESDtrack.cxx
@@ -2721,3 +2721,15 @@ void AliESDtrack::ReleaseESDfriendTrackGently()
 void AliESDtrack::PrintTmp()
 {
 }
+
+void AliESDtrack::SetFriendTrack(const AliESDfriendTrack *t)
+{
+  //attach fr. track
+  if (fFriendTrack) {
+    AliClonesPool* poolFr = fgPools ? fgPools->GetPoolTrFriend() : 0;
+    if (poolFr) poolFr->MarkSlotFree(fFriendTrack);
+    else        delete fFriendTrack;
+    fFriendTrack = 0;
+  }
+  if (t) fFriendTrack=new AliESDfriendTrack(*t);
+}

diff --git a/STEER/ESD/AliESDtrack.h b/STEER/ESD/AliESDtrack.h
index 9f2aac37de061a38200fa2956e97eef718d06700..a82fc0d3bba69c0614ef8ed36e23ecb63f1047ae 100644 (file)
--- a/STEER/ESD/AliESDtrack.h
+++ b/STEER/ESD/AliESDtrack.h
@@ -55,9 +55,7 @@ public:
   virtual ~AliESDtrack();
   virtual void Copy(TObject &obj) const;
   const AliESDfriendTrack *GetFriendTrack() const {return fFriendTrack;}
-  void SetFriendTrack(const AliESDfriendTrack *t) {
-    delete fFriendTrack; fFriendTrack=new AliESDfriendTrack(*t);
-  }
+  void SetFriendTrack(const AliESDfriendTrack *t);
   void ReleaseESDfriendTrackGently();
   //  void ReleaseESDfriendTrack() {delete fFriendTrack; fFriendTrack=0;}
   void AddCalibObject(TObject * object);     // add calib object to the list

diff --git a/STEER/ESD/AliTrackPointArray.cxx b/STEER/ESD/AliTrackPointArray.cxx
index 84fca6fd86686c3c37e1808af1bd602593b22199..796e23807f1fc686e20cdef95cb9d5c3ca01784f 100644 (file)
--- a/STEER/ESD/AliTrackPointArray.cxx
+++ b/STEER/ESD/AliTrackPointArray.cxx
@@ -290,7 +290,7 @@ void AliTrackPointArray::Sort(Bool_t down)
     GetPoint(p1,i);       // and remember where point i was moved
     AddPoint(i,&p);
     AddPoint(index[i],&p1);
-    for (int j=i;j<=fNPoints;j++) {if (index[j]==i) index[j]=index[i]; break;}
+    for (int j=i;j<fNPoints;j++) if (index[j]==i) {index[j]=index[i]; break;}
   }
   fSorted=kTRUE;
 }

diff --git a/STEER/ESD/AliVertexerTracks.cxx b/STEER/ESD/AliVertexerTracks.cxx
index 54ec2156ef9019fb3adb53fb56795470edbd0fec..38898fbc62311cd61ce0147152edc36100870862 100644 (file)
--- a/STEER/ESD/AliVertexerTracks.cxx
+++ b/STEER/ESD/AliVertexerTracks.cxx
@@ -881,7 +881,7 @@ AliESDVertex* AliVertexerTracks::RemoveTracksFromVertex(AliESDVertex *inVtx,
   for(Int_t k=0; k<inVtx->GetNIndices(); k++) {
     Bool_t copyindex=kTRUE;
     for(Int_t l=0; l<ntrks; l++) {
-      if(inindices[k]==id[l]) copyindex=kFALSE;
+      if(inindices[k]==id[l]) {copyindex=kFALSE; break;}
     }
     if(copyindex) {
       outindices[j] = inindices[k]; j++;

diff --git a/STEER/STEER/AliMatrixSq.cxx b/STEER/STEER/AliMatrixSq.cxx
index c34ba271aa457d1c40cc86fc3316ccc24f225151..cd90702cdae8f6a25492b67c9fe9c1ec42bfb065 100644 (file)
--- a/STEER/STEER/AliMatrixSq.cxx
+++ b/STEER/STEER/AliMatrixSq.cxx
@@ -17,7 +17,13 @@ using namespace std;
 
 ClassImp(AliMatrixSq)
 
-
+AliMatrixSq & AliMatrixSq::operator=(const AliMatrixSq &src)
+{
+  // = operator
+  if (this == &src) return *this;
+  TMatrixDBase::operator=(src);
+  fSymmetric = src.fSymmetric; 
+}
 
 //___________________________________________________________
 void AliMatrixSq::MultiplyByVec(const Double_t *vecIn,Double_t *vecOut) const

diff --git a/STEER/STEER/AliMatrixSq.h b/STEER/STEER/AliMatrixSq.h
index f621d46547c2b62e28a9bd3e7b86cac9fe6c63a0..b4b5ae86d30b8937fd5a3f676ccac37e6273797a 100644 (file)
--- a/STEER/STEER/AliMatrixSq.h
+++ b/STEER/STEER/AliMatrixSq.h
@@ -15,6 +15,7 @@ class AliMatrixSq : public TMatrixDBase {
   AliMatrixSq(): fSymmetric(kFALSE) {}
   AliMatrixSq(const AliMatrixSq &src) : TMatrixDBase(src), fSymmetric(src.fSymmetric) {}
   virtual ~AliMatrixSq() {}
+  AliMatrixSq& operator=(const AliMatrixSq &src);
   virtual Int_t   GetSize()                            const {return fNcols;}
   virtual Float_t GetDensity()                         const     = 0;
   //

diff --git a/STEER/STEERBase/AliMagF.cxx b/STEER/STEERBase/AliMagF.cxx
index 6c818c4f0d96bc785f0de8c2c9bd5c6d820b9b3c..adc092c6767a4503c683927a76b450f61c1a405c 100644 (file)
--- a/STEER/STEERBase/AliMagF.cxx
+++ b/STEER/STEERBase/AliMagF.cxx
@@ -261,7 +261,7 @@ void AliMagF::InitMachineField(BeamType_t btype, Double_t benergy)
   //
   double rigScale = benergy/7000.;   // scale according to ratio of E/Enominal
   // for ions assume PbPb (with energy provided per nucleon) and account for A/Z
-  if (btype == kBeamTypeAA || kBeamTypepA || kBeamTypeAp) rigScale *= 208./82.;
+  if (btype==kBeamTypeAA || btype==kBeamTypepA || btype==kBeamTypeAp) rigScale *= 208./82.;
   //
   fQuadGradient = 22.0002*rigScale;
   fDipoleField  = 37.8781*rigScale;