Fix coding violations

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

diff --git a/STEER/AliESDtrack.cxx b/STEER/AliESDtrack.cxx
index eaa619b47831c03b012015ca87e7b0b083805aa6..c986a083bef1f3a0064467b4732d3f7d59fe12c2 100644 (file)
--- a/STEER/AliESDtrack.cxx
+++ b/STEER/AliESDtrack.cxx
@@ -220,6 +220,7 @@ AliESDtrack::AliESDtrack() :
   fTPCnclsFIter1(0),
   fITSncls(0),
   fITSClusterMap(0),
+  fITSSharedMap(0),
   fTRDncls(0),
   fTRDncls0(0),
   fTRDntracklets(0),
@@ -319,6 +320,7 @@ AliESDtrack::AliESDtrack(const AliESDtrack& track):
   fTPCnclsFIter1(track.fTPCnclsIter1),
   fITSncls(track.fITSncls),
   fITSClusterMap(track.fITSClusterMap),
+  fITSSharedMap(track.fITSSharedMap),
   fTRDncls(track.fTRDncls),
   fTRDncls0(track.fTRDncls0),
   fTRDntracklets(track.fTRDntracklets),
@@ -431,6 +433,7 @@ AliESDtrack::AliESDtrack(const AliVTrack *track) :
   fTPCnclsFIter1(0),
   fITSncls(0),
   fITSClusterMap(0),
+  fITSSharedMap(0),
   fTRDncls(0),
   fTRDncls0(0),
   fTRDntracklets(0),
@@ -479,6 +482,7 @@ AliESDtrack::AliESDtrack(const AliVTrack *track) :
 
   // Set ITS cluster map
   fITSClusterMap=track->GetITSClusterMap();
+  fITSSharedMap=0;
 
   fITSncls=0;
   for(i=0; i<6; i++) {
@@ -565,6 +569,7 @@ AliESDtrack::AliESDtrack(TParticle * part) :
   fTPCnclsFIter1(0),
   fITSncls(0),
   fITSClusterMap(0),
+  fITSSharedMap(0),
   fTRDncls(0),
   fTRDncls0(0),
   fTRDntracklets(0),
@@ -896,6 +901,7 @@ AliESDtrack &AliESDtrack::operator=(const AliESDtrack &source){
 
   fITSncls = source.fITSncls;       
   fITSClusterMap = source.fITSClusterMap; 
+  fITSSharedMap = source.fITSSharedMap; 
   fTRDncls   = source.fTRDncls;       
   fTRDncls0  = source.fTRDncls0;      
   fTRDntracklets  = source.fTRDntracklets; 
@@ -964,6 +970,10 @@ Bool_t AliESDtrack::FillTPCOnlyTrack(AliESDtrack &track){
   track.fCdz = fCdzTPC;
   track.fCzz = fCzzTPC;
 
+  // copy the inner params
+  if(track.fIp) *track.fIp = *fIp;
+  else track.fIp = new AliExternalTrackParam(*fIp);
+
   // copy the TPCinner parameters
   if(track.fTPCInner) *track.fTPCInner = *fTPCInner;
   else track.fTPCInner = new AliExternalTrackParam(*fTPCInner);
@@ -974,7 +984,6 @@ Bool_t AliESDtrack::FillTPCOnlyTrack(AliESDtrack &track){
   track.fCzzTPC = fCzzTPC;
   track.fCchi2TPC = fCchi2TPC;
 
-
   // copy all other TPC specific parameters
 
   // replace label by TPC label
@@ -1045,6 +1054,7 @@ void AliESDtrack::MakeMiniESDtrack(){
   fITSchi2 = 0;
   fITSncls = 0;       
   fITSClusterMap=0;
+  fITSSharedMap=0;
   fITSsignal = 0;     
   for (Int_t i=0;i<4;i++) fITSdEdxSamples[i] = 0.;
   for (Int_t i=0;i<AliPID::kSPECIES;i++) fITSr[i]=0; 
@@ -1694,7 +1704,7 @@ UShort_t AliESDtrack::GetTPCclusters(Int_t *idx) const {
 }
 
 //_______________________________________________________________________
-Float_t AliESDtrack::GetTPCClusterInfo(Int_t nNeighbours/*=3*/, Int_t type/*=0*/) const
+Float_t AliESDtrack::GetTPCClusterInfo(Int_t nNeighbours/*=3*/, Int_t type/*=0*/, Int_t row0, Int_t row1) const
 {
   //
   // TPC cluster information
@@ -1714,7 +1724,7 @@ Float_t AliESDtrack::GetTPCClusterInfo(Int_t nNeighbours/*=3*/, Int_t type/*=0*/
   Int_t findable=0;
   Int_t last=-nNeighbours;
   
-  for (Int_t i=0; i<159; ++i){
+  for (Int_t i=row0; i<row1; ++i){
     //look to current row
     if (fTPCClusterMap[i]) {
       last=i;
@@ -2356,7 +2366,14 @@ void AliESDtrack::GetITSdEdxSamples(Double_t *s) const {
 
 UShort_t   AliESDtrack::GetTPCnclsS(Int_t i0,Int_t i1) const{
   //
-  // get number of shared clusters
+  // get number of shared TPC clusters
   //
   return  fTPCSharedMap.CountBits(i0)-fTPCSharedMap.CountBits(i1);
 }
+
+UShort_t   AliESDtrack::GetTPCncls(Int_t i0,Int_t i1) const{
+  //
+  // get number of TPC clusters
+  //
+  return  fTPCClusterMap.CountBits(i0)-fTPCClusterMap.CountBits(i1);
+}