Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGCF / FEMTOSCOPY / K0Analysis / AliFemtoK0EventCollection.cxx

diff --git a/PWGCF/FEMTOSCOPY/K0Analysis/AliFemtoK0EventCollection.cxx b/PWGCF/FEMTOSCOPY/K0Analysis/AliFemtoK0EventCollection.cxx
index bd4871845498ccaaa2c77e62c540403f1147dbcf..7ffaec4ab17d42b8eb75ee6e26f4d02a7633deca 100644 (file)
--- a/PWGCF/FEMTOSCOPY/K0Analysis/AliFemtoK0EventCollection.cxx
+++ b/PWGCF/FEMTOSCOPY/K0Analysis/AliFemtoK0EventCollection.cxx
@@ -46,7 +46,10 @@ AliFemtoK0Particle::AliFemtoK0Particle() :
  fPPos(),
  fPNeg(),
  fPosXYZ(),
- fNegXYZ()
+ fNegXYZ(),
+ fPhi(0),
+ fPhiPsi(0),
+ fCutPass()
 {
   //Default constructor
 }
@@ -73,7 +76,10 @@ AliFemtoK0Particle::AliFemtoK0Particle(const AliFemtoK0Particle &obj) :
  fPPos(),
  fPNeg(),
  fPosXYZ(),
- fNegXYZ()
+ fNegXYZ(),
+ fPhi(),
+ fPhiPsi(),
+ fCutPass()
 
 {
   // copy constructor
@@ -112,6 +118,12 @@ AliFemtoK0Particle &AliFemtoK0Particle::operator=(const AliFemtoK0Particle &obj)
    fNegXYZ[j][i] = obj.fNegXYZ[j][i];
   }
  }
+ for(int i=0;i<4;i++){
+  for(int j=0;j<5;j++){
+   fCutPass[i][j] = obj.fCutPass[i][j];
+ }}
+ fPhi = obj.fPhi;
+ fPhiPsi = obj.fPhiPsi;
  return (*this);
 }
 //_____________________________________________________________________________
@@ -152,9 +164,11 @@ AliFemtoK0Event &AliFemtoK0Event::operator=(const AliFemtoK0Event &obj)
 AliFemtoK0Event::~AliFemtoK0Event()
 {
  //Destructor
- if(fK0Particle) delete fK0Particle;
+ if(fK0Particle){
+  delete fK0Particle;
+  fK0Particle = NULL;
+ }
 }
-
 //_____________________________________________________________________________
 AliFemtoK0EventCollection::AliFemtoK0EventCollection() : 
  fBufferSize(0),
@@ -211,10 +225,11 @@ AliFemtoK0EventCollection::~AliFemtoK0EventCollection()
  for(int i =0; i < fBufferSize; i++){
   if((fEvt + i)->fK0Particle != NULL){
    delete [] (fEvt + i)->fK0Particle;
+   (fEvt + i)->fK0Particle = NULL;
   }
  }
  
- delete [] fEvt;
+ delete [] fEvt; fEvt = NULL;
 }
 //_____________________________________________________________________________
 void AliFemtoK0EventCollection::FIFOShift(){ //Shift elements in FIFO by one and clear last element in FIFO 
@@ -229,4 +244,3 @@ void AliFemtoK0EventCollection::FIFOShift(){ //Shift elements in FIFO by one and
   (fEvt)->fFillStatus=0;
 
 }
-