Compilation on Windoiws/Cygwin

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

diff --git a/STEER/AliVertex.cxx b/STEER/AliVertex.cxx
index 32e92ff27fee99a64fb0f97658244677e9424cbf..06fb8915fe07ca8e7584b801826bc827300e893e 100644 (file)
--- a/STEER/AliVertex.cxx
+++ b/STEER/AliVertex.cxx
@@ -31,13 +31,13 @@ AliVertex::AliVertex() :
   TNamed(),
   fSigma(0),
   fNContributors(0),
-  fNIndices(0)
+  fNIndices(0),
+  fIndices(0)
 {
 //
 // Default Constructor, set everything to 0
 //
   for(Int_t k=0;k<3;k++) fPosition[k]   = 0;
-  fIndices = 0;
 }
 
 //--------------------------------------------------------------------------
@@ -46,14 +46,14 @@ AliVertex::AliVertex(Double_t position[3],Double_t dispersion,
   TNamed(),
   fSigma(dispersion),
   fNContributors(nContributors),
-  fNIndices(0)
+  fNIndices(0),
+  fIndices(0)
 {
   //
   // Standard Constructor
   //
 
   for(Int_t k=0;k<3;k++) fPosition[k]   = position[k];
-  fIndices = 0;
   SetName("BaseVertex");
 
 }
@@ -63,7 +63,8 @@ AliVertex::AliVertex(const AliVertex &source):
   TNamed(source),
   fSigma(source.GetDispersion()),
   fNContributors(source.GetNContributors()),
-  fNIndices(source.GetNIndices())
+  fNIndices(source.GetNIndices()),
+  fIndices(0x0)
 {
   //
   // Copy constructor
@@ -80,16 +81,18 @@ AliVertex &AliVertex::operator=(const AliVertex &source){
   //
   // assignment operator
   //
-  if(&source == this) return *this;
-  this->SetName(source.GetName());
-  this->SetTitle(source.GetTitle());
-  for(Int_t i=0;i<3;i++)fPosition[i] = source.fPosition[i];
-  fSigma = source.GetDispersion();
-  fNContributors = source.GetNContributors();
-  fNIndices = source.GetNIndices();
-  if(source.fNIndices>0) {
-    fIndices = new UShort_t[fNIndices];
-    memcpy(fIndices,source.fIndices,fNIndices*sizeof(UShort_t));
+  if(&source != this){
+    TNamed::operator=(source);
+    for(Int_t i=0;i<3;i++)fPosition[i] = source.fPosition[i];
+    fSigma = source.GetDispersion();
+    fNContributors = source.GetNContributors();
+    fNIndices = source.GetNIndices();
+    if(fIndices)delete [] fIndices;
+    fIndices = 0;
+    if(fNIndices>0) {
+      fIndices = new UShort_t[fNIndices];
+      memcpy(fIndices,source.fIndices,fNIndices*sizeof(UShort_t));
+    }
   }
   return *this;
 }
@@ -101,7 +104,17 @@ AliVertex::~AliVertex() {
 // Default Destructor
 //
   delete [] fIndices;
+  fIndices = 0;
+}
+
+void AliVertex::Clear(Option_t* option) 
+{
+    // Delete allocated memory
+    delete [] fIndices;
+    fIndices = 0;
+    TNamed::Clear(option);
 }
+
 //--------------------------------------------------------------------------
 void AliVertex::GetXYZ(Double_t position[3]) const {
 //
@@ -120,6 +133,7 @@ void AliVertex::SetIndices(Int_t nindices,UShort_t *indices) {
 //
   if(fNContributors<1)  { printf("fNContributors<1"); return; }
   fNIndices = nindices;
+  delete [] fIndices;
   fIndices = new UShort_t[fNIndices];
   for(Int_t i=0;i<fNIndices;i++) fIndices[i] = indices[i]; 
   return;