Partial fix for bug #59809: putting HLT trigger decision in the ESD, not yet in stand...

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

diff --git a/STEER/AliTrackPointArray.cxx b/STEER/AliTrackPointArray.cxx
index aa1c8d7f4acf69d77d7d84e116bb17327a2f4be0..5572817e12d02680e32ebdc183bf97f2f634b6cf 100644 (file)
--- a/STEER/AliTrackPointArray.cxx
+++ b/STEER/AliTrackPointArray.cxx
@@ -42,6 +42,9 @@ AliTrackPointArray::AliTrackPointArray() :
   fZ(0),
   fCharge(0),
   fDriftTime(0),
+  fChargeRatio(0),
+  fClusterType(0),
+  fIsExtra(0),
   fSize(0),
   fCov(0),
   fVolumeID(0)
@@ -58,6 +61,9 @@ AliTrackPointArray::AliTrackPointArray(Int_t npoints):
   fZ(new Float_t[npoints]),
   fCharge(new Float_t[npoints]),
   fDriftTime(new Float_t[npoints]),
+  fChargeRatio(new Float_t[npoints]),
+  fClusterType(new Int_t[npoints]),
+  fIsExtra(new Bool_t[npoints]),
   fSize(6*npoints),
   fCov(new Float_t[fSize]),
   fVolumeID(new UShort_t[npoints])
@@ -70,6 +76,9 @@ AliTrackPointArray::AliTrackPointArray(Int_t npoints):
     fZ[ip]=0;
     fCharge[ip]=0;
     fDriftTime[ip]=0;
+    fChargeRatio[ip]=0;
+    fClusterType[ip]=0;
+    fIsExtra[ip]=kFALSE;
     fVolumeID[ip]=0;
     for (Int_t icov=0;icov<6; icov++)
       fCov[6*ip+icov]=0;
@@ -86,6 +95,9 @@ AliTrackPointArray::AliTrackPointArray(const AliTrackPointArray &array):
   fZ(new Float_t[fNPoints]),
   fCharge(new Float_t[fNPoints]),
   fDriftTime(new Float_t[fNPoints]),
+  fChargeRatio(new Float_t[fNPoints]),
+  fClusterType(new Int_t[fNPoints]),
+  fIsExtra(new Bool_t[fNPoints]),
   fSize(array.fSize),
   fCov(new Float_t[fSize]),
   fVolumeID(new UShort_t[fNPoints])
@@ -105,6 +117,21 @@ AliTrackPointArray::AliTrackPointArray(const AliTrackPointArray &array):
   } else {
     memset(fDriftTime, 0, fNPoints*sizeof(Float_t));
   }
+  if (array.fChargeRatio) {
+    memcpy(fChargeRatio,array.fChargeRatio,fNPoints*sizeof(Float_t));
+  } else {
+    memset(fChargeRatio, 0, fNPoints*sizeof(Float_t));
+  }
+  if (array.fClusterType) {
+    memcpy(fClusterType,array.fClusterType,fNPoints*sizeof(Int_t));
+  } else {
+    memset(fClusterType, 0, fNPoints*sizeof(Int_t));
+  }
+  if (array.fIsExtra) {
+    memcpy(fIsExtra,array.fIsExtra,fNPoints*sizeof(Bool_t));
+  } else {
+    memset(fIsExtra, 0, fNPoints*sizeof(Bool_t));
+  }
   memcpy(fVolumeID,array.fVolumeID,fNPoints*sizeof(UShort_t));
   memcpy(fCov,array.fCov,fSize*sizeof(Float_t));
 }
@@ -130,6 +157,12 @@ AliTrackPointArray &AliTrackPointArray::operator =(const AliTrackPointArray& arr
   fCharge = new Float_t[fNPoints];
   delete [] fDriftTime;
   fDriftTime = new Float_t[fNPoints];
+  delete [] fChargeRatio;
+  fChargeRatio = new Float_t[fNPoints];
+  delete [] fClusterType;
+  fClusterType = new Int_t[fNPoints];
+  delete [] fIsExtra;
+  fIsExtra = new Bool_t[fNPoints];
   delete [] fVolumeID;
   fVolumeID = new UShort_t[fNPoints];
   delete [] fCov;
@@ -139,6 +172,9 @@ AliTrackPointArray &AliTrackPointArray::operator =(const AliTrackPointArray& arr
   memcpy(fZ,array.fZ,fNPoints*sizeof(Float_t));
   memcpy(fCharge,array.fCharge,fNPoints*sizeof(Float_t));
   memcpy(fDriftTime,array.fDriftTime,fNPoints*sizeof(Float_t));
+  memcpy(fChargeRatio,array.fChargeRatio,fNPoints*sizeof(Float_t));
+  memcpy(fClusterType,array.fClusterType,fNPoints*sizeof(Int_t));
+  memcpy(fIsExtra,array.fIsExtra,fNPoints*sizeof(Bool_t));
   memcpy(fVolumeID,array.fVolumeID,fNPoints*sizeof(UShort_t));
   memcpy(fCov,array.fCov,fSize*sizeof(Float_t));
 
@@ -155,6 +191,9 @@ AliTrackPointArray::~AliTrackPointArray()
   delete [] fZ;
   delete [] fCharge;
   delete [] fDriftTime;
+  delete [] fChargeRatio;
+  delete [] fClusterType;
+  delete [] fIsExtra;
   delete [] fVolumeID;
   delete [] fCov;
 }
@@ -171,6 +210,9 @@ Bool_t AliTrackPointArray::AddPoint(Int_t i, const AliTrackPoint *p)
   fZ[i] = p->GetZ();
   fCharge[i] = p->GetCharge();
   fDriftTime[i] = p->GetDriftTime();
+  fChargeRatio[i]=p->GetChargeRatio();
+  fClusterType[i]=p->GetClusterType();
+  fIsExtra[i] = p->IsExtra();
   fVolumeID[i] = p->GetVolumeID();
   memcpy(&fCov[6*i],p->GetCov(),6*sizeof(Float_t));
   return kTRUE;
@@ -185,8 +227,11 @@ Bool_t AliTrackPointArray::GetPoint(AliTrackPoint &p, Int_t i) const
   if (i >= fNPoints) return kFALSE;
   p.SetXYZ(fX[i],fY[i],fZ[i],&fCov[6*i]);
   p.SetVolumeID(fVolumeID[i]);
-  p.SetCharge(fCharge[i]);
-  p.SetDriftTime(fDriftTime[i]);
+  p.SetCharge(fCharge ? fCharge[i] : 0);
+  p.SetDriftTime(fDriftTime ? fDriftTime[i] : 0);
+  p.SetChargeRatio(fChargeRatio ? fChargeRatio[i] : 0);
+  p.SetClusterType(fClusterType ? fClusterType[i] : 0);
+  p.SetExtra(fIsExtra ? fIsExtra[i] : kFALSE);
   return kTRUE;
 }
 
@@ -236,6 +281,9 @@ AliTrackPoint::AliTrackPoint() :
   fZ(0),
   fCharge(0),
   fDriftTime(0),
+  fChargeRatio(0),
+  fClusterType(0),
+  fIsExtra(kFALSE),
   fVolumeID(0)
 {
   // Default constructor
@@ -245,13 +293,16 @@ AliTrackPoint::AliTrackPoint() :
 
 
 //______________________________________________________________________________
-AliTrackPoint::AliTrackPoint(Float_t x, Float_t y, Float_t z, const Float_t *cov, UShort_t volid, Float_t charge, Float_t drifttime) :
+AliTrackPoint::AliTrackPoint(Float_t x, Float_t y, Float_t z, const Float_t *cov, UShort_t volid, Float_t charge, Float_t drifttime,Float_t chargeratio, Int_t clutyp) :
   TObject(),
   fX(0),
   fY(0),
   fZ(0),
   fCharge(0),
   fDriftTime(0),
+  fChargeRatio(0),
+  fClusterType(0),
+  fIsExtra(kFALSE),
   fVolumeID(0)
 {
   // Constructor
@@ -259,17 +310,22 @@ AliTrackPoint::AliTrackPoint(Float_t x, Float_t y, Float_t z, const Float_t *cov
   SetXYZ(x,y,z,cov);
   SetCharge(charge);
   SetDriftTime(drifttime);
+  SetChargeRatio(chargeratio);
+  SetClusterType(clutyp);
   SetVolumeID(volid);
 }
 
 //______________________________________________________________________________
-AliTrackPoint::AliTrackPoint(const Float_t *xyz, const Float_t *cov, UShort_t volid, Float_t charge, Float_t drifttime) :
+AliTrackPoint::AliTrackPoint(const Float_t *xyz, const Float_t *cov, UShort_t volid, Float_t charge, Float_t drifttime,Float_t chargeratio, Int_t clutyp) :
   TObject(),
   fX(0),
   fY(0),
   fZ(0),
   fCharge(0),
   fDriftTime(0),
+  fChargeRatio(0),
+  fClusterType(0),
+  fIsExtra(kFALSE),
   fVolumeID(0)
 {
   // Constructor
@@ -277,7 +333,9 @@ AliTrackPoint::AliTrackPoint(const Float_t *xyz, const Float_t *cov, UShort_t vo
   SetXYZ(xyz[0],xyz[1],xyz[2],cov);
   SetCharge(charge);
   SetDriftTime(drifttime);
+  SetChargeRatio(chargeratio);
   SetVolumeID(volid);
+  SetClusterType(clutyp);
 }
 
 //______________________________________________________________________________
@@ -288,6 +346,9 @@ AliTrackPoint::AliTrackPoint(const AliTrackPoint &p):
   fZ(0),
   fCharge(0),
   fDriftTime(0),
+  fChargeRatio(0),
+  fClusterType(0),
+  fIsExtra(kFALSE),
   fVolumeID(0)
 {
   // Copy constructor
@@ -295,6 +356,9 @@ AliTrackPoint::AliTrackPoint(const AliTrackPoint &p):
   SetXYZ(p.fX,p.fY,p.fZ,&(p.fCov[0]));
   SetCharge(p.fCharge);
   SetDriftTime(p.fDriftTime);
+  SetChargeRatio(p.fChargeRatio);
+  SetClusterType(p.fClusterType);
+  SetExtra(p.fIsExtra);
   SetVolumeID(p.fVolumeID);
 }
 
@@ -309,6 +373,9 @@ AliTrackPoint &AliTrackPoint::operator =(const AliTrackPoint& p)
   SetXYZ(p.fX,p.fY,p.fZ,&(p.fCov[0]));
   SetCharge(p.fCharge);
   SetDriftTime(p.fDriftTime);
+  SetChargeRatio(p.fChargeRatio);
+  SetClusterType(p.fClusterType);
+  SetExtra(p.fIsExtra);
   SetVolumeID(p.fVolumeID);
 
   return *this;
@@ -559,6 +626,9 @@ void AliTrackPoint::Print(Option_t *) const
   printf("Z = %12.6f    Tz = %12.6f%12.6f%12.6f\n", fZ, fCov[2], fCov[4], fCov[5]);
   printf("Charge = %f\n", fCharge);
   printf("Drift Time = %f\n", fDriftTime);
+  printf("Charge Ratio  = %f\n", fChargeRatio);
+  printf("Cluster Type  = %d\n", fClusterType);
+  if(fIsExtra) printf("This is an extra point\n");
 
 }
 
@@ -604,3 +674,4 @@ void AliTrackPoint::SetAlignCovMatrix(const TMatrixDSym alignparmtrx){
 
 }
 
+