Bug fix in copy constructor and assignment operator.

[u/mrichter/AliRoot.git] / STEER / AliTrackResiduals.cxx

diff --git a/STEER/AliTrackResiduals.cxx b/STEER/AliTrackResiduals.cxx
index e5ed3da6027f48849377d5747b61d515b40146e2..4d0e7342768f07bd2b686f35ab8b9a813e1802a1 100644 (file)
--- a/STEER/AliTrackResiduals.cxx
+++ b/STEER/AliTrackResiduals.cxx
@@ -22,7 +22,7 @@
 #include "AliTrackResiduals.h"
 
 #include "AliAlignObj.h"
-#include "AliAlignObjAngles.h"
+#include "AliAlignObjParams.h"
 #include "AliTrackPointArray.h"
 
 ClassImp(AliTrackResiduals)
@@ -40,6 +40,10 @@ AliTrackResiduals::AliTrackResiduals():
   fIsOwner(kTRUE)
 {
   // Default constructor
+  for (Int_t ipar=0; ipar<6; ipar++){
+    fBFixed[ipar] = kFALSE;
+    fFixed[ipar]  = 0.;
+  }  
 }
 
 //_____________________________________________________________________________
@@ -47,6 +51,8 @@ AliTrackResiduals::AliTrackResiduals(Int_t ntracks):
   fN(ntracks),
   fLast(0),
   fAlignObj(0),
+  fVolArray(0),
+  fTrackArray(0),
   fChi2(0),
   fNdf(0),
   fMinNPoints(0),
@@ -59,6 +65,11 @@ AliTrackResiduals::AliTrackResiduals(Int_t ntracks):
     for (Int_t itrack = 0; itrack < ntracks; itrack++)
       fVolArray[itrack] = fTrackArray[itrack] = 0x0;
   }
+
+  for (Int_t ipar=0; ipar<6; ipar++){
+    fBFixed[ipar] = kFALSE;
+    fFixed[ipar]  = 0.;
+  }  
 }
 
 //_____________________________________________________________________________
@@ -66,6 +77,9 @@ AliTrackResiduals::AliTrackResiduals(const AliTrackResiduals &res):
   TObject(res),
   fN(res.fN),
   fLast(res.fLast),
+  fAlignObj(0),
+  fVolArray(0),
+  fTrackArray(0),
   fChi2(res.fChi2),
   fNdf(res.fNdf),
   fMinNPoints(res.fMinNPoints),
@@ -91,6 +105,10 @@ AliTrackResiduals::AliTrackResiduals(const AliTrackResiduals &res):
          fTrackArray = 0x0;
       }
   }
+  for(Int_t i=0;i<6;i++) { 
+    fBFixed[i]=res.fBFixed[i];
+    fFixed[i]=res.fFixed[i];
+  }
 }
 
 //_____________________________________________________________________________
@@ -112,6 +130,11 @@ AliTrackResiduals &AliTrackResiduals::operator =(const AliTrackResiduals& res)
   fVolArray = res.fVolArray;
   fTrackArray = res.fTrackArray;
 
+  for(Int_t i=0;i<6;i++) { 
+    fBFixed[i]=res.fBFixed[i];
+    fFixed[i]=res.fFixed[i];
+  }
+
   return *this;
 }
 
@@ -143,6 +166,9 @@ void AliTrackResiduals::SetNTracks(Int_t ntracks)
     for (Int_t itrack = 0; itrack < ntracks; itrack++)
       fVolArray[itrack] = fTrackArray[itrack] = 0x0;
   }
+  else {
+    fVolArray = fTrackArray = 0x0;
+  }
 }
 
 //_____________________________________________________________________________
@@ -171,7 +197,7 @@ void AliTrackResiduals::InitAlignObj()
   // Create the alignment object 
   // to be updated
   if (fAlignObj) delete fAlignObj;
-  fAlignObj = new AliAlignObjAngles;
+  fAlignObj = new AliAlignObjParams;
 }
 
 
@@ -198,12 +224,26 @@ void AliTrackResiduals::DeleteTrackPointArrays()
   // the object is their owner.
   // Called by the destructor and SetNTracks methods.
   if (fIsOwner) {
-    for (Int_t itrack = 0; itrack < fLast; itrack++)
-      {
-       delete fVolArray[itrack];
-       delete fTrackArray[itrack];
+    if (fVolArray) {
+      for (Int_t itrack = 0; itrack < fN; itrack++) {
+       if (fVolArray[itrack]) delete fVolArray[itrack];
       }
-    delete [] fVolArray;
-    delete [] fTrackArray;
+      delete [] fVolArray;
+    }
+    if (fTrackArray) {
+      for (Int_t itrack = 0; itrack < fN; itrack++) {
+       if (fTrackArray[itrack]) delete fTrackArray[itrack];
+      }
+      delete [] fTrackArray;
+    }
+  }
+}
+
+//_____________________________________________________
+Int_t AliTrackResiduals::GetNFreeParam(){ 
+  Int_t unfixedparam=6;
+  for(Int_t j=0;j<6;j++){
+    if(fBFixed[j]==kTRUE)unfixedparam--;
   }
+  return unfixedparam;
 }