reverting to prev.

[u/mrichter/AliRoot.git] / HBTAN / AliHBTParticle.cxx

diff --git a/HBTAN/AliHBTParticle.cxx b/HBTAN/AliHBTParticle.cxx
index eeced89f53dd225c010f3aa1baea97a7dbd254b7..2760b5cc0406b7b4f0cc6a9780c0a47c97a0aa24 100644 (file)
--- a/HBTAN/AliHBTParticle.cxx
+++ b/HBTAN/AliHBTParticle.cxx
@@ -25,7 +25,7 @@ Int_t AliHBTParticle::fgDebug = 0;
 AliHBTParticle::AliHBTParticle():  
  fPdgIdx(0), fIdxInEvent(0),fNPids(0),fPids(0x0),fPidProb(0x0),
  fCalcMass(0),fPx(0), fPy(0),fPz(0),fE(0), fVx(0), fVy(0),fVz(0),fVt(0),
- fTrackPoints(0x0),fClusterMap(0x0)
+ fTrackPoints(0x0),fITSTrackPoints(0x0),fClusterMap(0x0)
 {//empty particle
 }
 //______________________________________________________________________________
@@ -37,7 +37,7 @@ AliHBTParticle::AliHBTParticle(Int_t pdg, Int_t idx,
   fCalcMass(0), 
   fPx(px), fPy(py),fPz(pz),fE(etot), 
   fVx(vx), fVy(vy),fVz(vz),fVt(time),
-  fTrackPoints(0x0),fClusterMap(0x0)
+  fTrackPoints(0x0),fITSTrackPoints(0x0),fClusterMap(0x0)
 {
 //mormal constructor
   SetPdgCode(pdg);
@@ -58,7 +58,7 @@ AliHBTParticle::AliHBTParticle(Int_t pdg, Float_t prob, Int_t idx,
   fCalcMass(0), 
   fPx(px), fPy(py),fPz(pz),fE(etot), 
   fVx(vx), fVy(vy),fVz(vz),fVt(time),
-  fTrackPoints(0x0),fClusterMap(0x0)
+  fTrackPoints(0x0),fITSTrackPoints(0x0),fClusterMap(0x0)
 {
 //mormal constructor
   SetPdgCode(pdg,prob);
@@ -78,7 +78,7 @@ AliHBTParticle::AliHBTParticle(const AliHBTParticle& in):
    fCalcMass(in.GetCalcMass()),
    fPx(in.Px()),fPy(in.Py()),fPz(in.Pz()),fE(in.Energy()), 
    fVx(in.Vx()),fVy(in.Vy()),fVz(in.Vz()),fVt(in.T()),
-   fTrackPoints(0x0), fClusterMap(0x0)
+   fTrackPoints(0x0), fITSTrackPoints(0x0), fClusterMap(0x0)
 {
  //Copy constructor
  for(Int_t i = 0; i<fNPids; i++)
@@ -89,6 +89,8 @@ AliHBTParticle::AliHBTParticle(const AliHBTParticle& in):
  
  if (in.fTrackPoints)
    fTrackPoints = (AliHBTTrackPoints*)in.fTrackPoints->Clone();
+ if (in.fITSTrackPoints)
+   fITSTrackPoints = (AliHBTTrackPoints*)in.fITSTrackPoints->Clone();
  if (in.fClusterMap)
    fClusterMap = (AliHBTClusterMap*)in.fClusterMap->Clone();
 }
@@ -100,7 +102,7 @@ AliHBTParticle::AliHBTParticle(const TParticle &p,Int_t idx):
    fCalcMass(p.GetCalcMass()),
    fPx(p.Px()),fPy(p.Py()),fPz(p.Pz()),fE(p.Energy()), 
    fVx(p.Vx()),fVy(p.Vy()),fVz(p.Vz()),fVt(p.T()),
-   fTrackPoints(0x0),fClusterMap(0x0)
+   fTrackPoints(0x0), fITSTrackPoints(0x0), fClusterMap(0x0)
 {
  //all copied in the initialization
  SetPdgCode(p.GetPdgCode());
@@ -113,6 +115,7 @@ AliHBTParticle::~AliHBTParticle()
   delete [] fPids;
   delete [] fPidProb;
   delete fTrackPoints;
+  delete fITSTrackPoints;
   delete fClusterMap;
 }
 //______________________________________________________________________________
@@ -145,7 +148,10 @@ AliHBTParticle& AliHBTParticle::operator=(const AliHBTParticle& in)
   fVt = in.T();
   
   delete fTrackPoints;
-  fTrackPoints = (in.fTrackPoints)?(AliHBTTrackPoints*)fTrackPoints->Clone():0x0;
+  fTrackPoints = (in.fTrackPoints)?(AliHBTTrackPoints*)in.fTrackPoints->Clone():0x0;
+
+  delete fITSTrackPoints;
+  fITSTrackPoints = (in.fTrackPoints)?(AliHBTTrackPoints*)in.fITSTrackPoints->Clone():0x0;
   
   delete fClusterMap;
   fClusterMap =  (in.fClusterMap)?(AliHBTClusterMap*)in.fClusterMap->Clone():0x0;