Period number added. Filling of bunch crossing number and orbit number corrected.

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

diff --git a/STEER/AliESDtrack.cxx b/STEER/AliESDtrack.cxx
index 2096880d087a1d14d1065a84b70a81d4a277316d..750826c11377cf20f9df3ee809f1e6e2308e2b7b 100644 (file)
--- a/STEER/AliESDtrack.cxx
+++ b/STEER/AliESDtrack.cxx
@@ -74,6 +74,7 @@ AliESDtrack::AliESDtrack() :
   fOp(0),
   fITSchi2(0),
   fITSncls(0),
+  fITSClusterMap(0),
   fITSsignal(0),
   fITSLabel(0),
   fTPCchi2(0),
@@ -96,16 +97,16 @@ AliESDtrack::AliESDtrack() :
   fTOFCalChannel(-1),
   fTOFsignal(-1),
   fTOFsignalToT(0),
-  fRICHchi2(1e10),
-  fRICHqn(-1),
-  fRICHcluIdx(-1),
-  fRICHsignal(-1),
-  fRICHtrkTheta(-1),
-  fRICHtrkPhi(-1),
-  fRICHtrkX(-1),
-  fRICHtrkY(-1),
-  fRICHmipX(-1),
-  fRICHmipY(-1),
+  fHMPIDchi2(1e10),
+  fHMPIDqn(-1),
+  fHMPIDcluIdx(-1),
+  fHMPIDsignal(-1),
+  fHMPIDtrkTheta(-1),
+  fHMPIDtrkPhi(-1),
+  fHMPIDtrkX(-1),
+  fHMPIDtrkY(-1),
+  fHMPIDmipX(-1),
+  fHMPIDmipY(-1),
   fEMCALindex(kEMCALNoMatch),
   fFriendTrack(new AliESDfriendTrack())
 {
@@ -120,7 +121,7 @@ AliESDtrack::AliESDtrack() :
     fTPCr[i]=1.;
     fTRDr[i]=1.;
     fTOFr[i]=1.;
-    fRICHr[i]=1.;
+    fHMPIDr[i]=1.;
   }
   
   for (i=0; i<3; i++)   { fKinkIndexes[i]=0;}
@@ -152,6 +153,7 @@ AliESDtrack::AliESDtrack(const AliESDtrack& track):
   fOp(0),
   fITSchi2(track.fITSchi2),
   fITSncls(track.fITSncls),
+  fITSClusterMap(track.fITSClusterMap),
   fITSsignal(track.fITSsignal),
   fITSLabel(track.fITSLabel),
   fTPCchi2(track.fTPCchi2),
@@ -174,16 +176,16 @@ AliESDtrack::AliESDtrack(const AliESDtrack& track):
   fTOFCalChannel(track.fTOFCalChannel),
   fTOFsignal(track.fTOFsignal),
   fTOFsignalToT(track.fTOFsignalToT),
-  fRICHchi2(track.fRICHchi2),
-  fRICHqn(track.fRICHqn),
-  fRICHcluIdx(track.fRICHcluIdx),
-  fRICHsignal(track.fRICHsignal),
-  fRICHtrkTheta(track.fRICHtrkTheta),
-  fRICHtrkPhi(track.fRICHtrkPhi),
-  fRICHtrkX(track.fRICHtrkX),
-  fRICHtrkY(track.fRICHtrkY),
-  fRICHmipX(track.fRICHmipX),
-  fRICHmipY(track.fRICHmipY),
+  fHMPIDchi2(track.fHMPIDchi2),
+  fHMPIDqn(track.fHMPIDqn),
+  fHMPIDcluIdx(track.fHMPIDcluIdx),
+  fHMPIDsignal(track.fHMPIDsignal),
+  fHMPIDtrkTheta(track.fHMPIDtrkTheta),
+  fHMPIDtrkPhi(track.fHMPIDtrkPhi),
+  fHMPIDtrkX(track.fHMPIDtrkX),
+  fHMPIDtrkY(track.fHMPIDtrkY),
+  fHMPIDmipX(track.fHMPIDmipX),
+  fHMPIDmipY(track.fHMPIDmipY),
   fEMCALindex(track.fEMCALindex),
   fFriendTrack(0)
 {
@@ -210,7 +212,7 @@ AliESDtrack::AliESDtrack(const AliESDtrack& track):
   for (Int_t i=0;i<AliPID::kSPECIES;i++) fTOFr[i]=track.fTOFr[i];
   for (Int_t i=0;i<3;i++) fTOFLabel[i]=track.fTOFLabel[i];
   for (Int_t i=0;i<10;i++) fTOFInfo[i]=track.fTOFInfo[i];
-  for (Int_t i=0;i<AliPID::kSPECIES;i++) fRICHr[i]=track.fRICHr[i];
+  for (Int_t i=0;i<AliPID::kSPECIES;i++) fHMPIDr[i]=track.fHMPIDr[i];
 
   if (track.fCp) fCp=new AliExternalTrackParam(*track.fCp);
   if (track.fIp) fIp=new AliExternalTrackParam(*track.fIp);
@@ -235,6 +237,7 @@ AliESDtrack::AliESDtrack(TParticle * part) :
   fOp(0),
   fITSchi2(0),
   fITSncls(0),
+  fITSClusterMap(0),
   fITSsignal(0),
   fITSLabel(0),
   fTPCchi2(0),
@@ -257,16 +260,16 @@ AliESDtrack::AliESDtrack(TParticle * part) :
   fTOFCalChannel(-1),
   fTOFsignal(-1),
   fTOFsignalToT(0),
-  fRICHchi2(1e10),
-  fRICHqn(-1),
-  fRICHcluIdx(-1),
-  fRICHsignal(-1),
-  fRICHtrkTheta(-1),
-  fRICHtrkPhi(-1),
-  fRICHtrkX(-1),
-  fRICHtrkY(-1),
-  fRICHmipX(-1),
-  fRICHmipY(-1),
+  fHMPIDchi2(1e10),
+  fHMPIDqn(-1),
+  fHMPIDcluIdx(-1),
+  fHMPIDsignal(-1),
+  fHMPIDtrkTheta(-1),
+  fHMPIDtrkPhi(-1),
+  fHMPIDtrkX(-1),
+  fHMPIDtrkY(-1),
+  fHMPIDmipX(-1),
+  fHMPIDmipY(-1),
   fEMCALindex(kEMCALNoMatch),
   fFriendTrack(0)
 {
@@ -283,7 +286,7 @@ AliESDtrack::AliESDtrack(TParticle * part) :
     fTPCr[i]=0.;
     fTRDr[i]=0.;
     fTOFr[i]=0.;
-    fRICHr[i]=0.;
+    fHMPIDr[i]=0.;
   }
   
   for (i=0; i<3; i++)   { fKinkIndexes[i]=0;}
@@ -316,7 +319,7 @@ AliESDtrack::AliESDtrack(TParticle * part) :
   alpha *= TMath::Pi();
 
   // Covariance matrix: no errors, the parameters are exact
-  for (Int_t i=0; i<15; i++) covar[i]=0.;
+  for (i=0; i<15; i++) covar[i]=0.;
 
   // Get the vertex of origin and the momentum
   TVector3 ver(part->Vx(),part->Vy(),part->Vz());
@@ -379,7 +382,7 @@ AliESDtrack::AliESDtrack(TParticle * part) :
     fTPCr[indexPID]=1.;
     fTRDr[indexPID]=1.;
     fTOFr[indexPID]=1.;
-    fRICHr[indexPID]=1.;
+    fHMPIDr[indexPID]=1.;
 
   }
   // AliESD track label
@@ -444,6 +447,7 @@ void AliESDtrack::MakeMiniESDtrack(){
   // Reset ITS track related information
   fITSchi2 = 0;
   fITSncls = 0;       
+  fITSClusterMap=0;
   fITSsignal = 0;     
   for (Int_t i=0;i<AliPID::kSPECIES;i++) fITSr[i]=0; 
   fITSLabel = 0;       
@@ -488,18 +492,18 @@ void AliESDtrack::MakeMiniESDtrack(){
   for (Int_t i=0;i<3;i++) fTOFLabel[i] = 0;
   for (Int_t i=0;i<10;i++) fTOFInfo[i] = 0;
 
-  // Reset RICH related track information
-  fRICHchi2 = 0;     
-  fRICHqn = -1;     
-  fRICHcluIdx = -1;     
-  fRICHsignal = 0;     
-  for (Int_t i=0;i<AliPID::kSPECIES;i++) fRICHr[i] = 0;
-  fRICHtrkTheta = -1;     
-  fRICHtrkPhi = -1;      
-  fRICHtrkX = -1;     
-  fRICHtrkY = -1;      
-  fRICHmipX = -1;
-  fRICHmipY = -1;
+  // Reset HMPID related track information
+  fHMPIDchi2 = 0;     
+  fHMPIDqn = -1;     
+  fHMPIDcluIdx = -1;     
+  fHMPIDsignal = 0;     
+  for (Int_t i=0;i<AliPID::kSPECIES;i++) fHMPIDr[i] = 0;
+  fHMPIDtrkTheta = -1;     
+  fHMPIDtrkPhi = -1;      
+  fHMPIDtrkX = -1;     
+  fHMPIDtrkY = -1;      
+  fHMPIDmipX = -1;
+  fHMPIDmipY = -1;
   fEMCALindex = kEMCALNoMatch;
 
   delete fFriendTrack; fFriendTrack = 0;
@@ -550,10 +554,15 @@ Bool_t AliESDtrack::UpdateTrackParams(const AliKalmanTrack *t, ULong_t flags){
   switch (flags) {
     
   case kITSin: case kITSout: case kITSrefit:
-    index=fFriendTrack->GetITSindices(); 
-    for (Int_t i=0;i<AliESDfriendTrack::kMaxITScluster;i++) 
-         index[i]=t->GetClusterIndex(i);
     fITSncls=t->GetNumberOfClusters();
+    index=fFriendTrack->GetITSindices(); 
+    for (Int_t i=0;i<AliESDfriendTrack::kMaxITScluster;i++) {
+        index[i]=t->GetClusterIndex(i);
+       if (i<fITSncls) {
+           Int_t l=(index[i] & 0xf0000000) >> 28;
+           SETBIT(fITSClusterMap,l);                 
+        }
+    }
     fITSchi2=t->GetChi2();
     fITSsignal=t->GetPIDsignal();
     fITSLabel = t->GetLabel();
@@ -958,16 +967,16 @@ void AliESDtrack::SetTOFInfo(Float_t*info) {
 
 
 //_______________________________________________________________________
-void AliESDtrack::SetRICHpid(const Double_t *p) {  
-  // Sets the probability of each particle type (in RICH)
-  SetPIDValues(fRICHr,p,AliPID::kSPECIES);
-  SetStatus(AliESDtrack::kRICHpid);
+void AliESDtrack::SetHMPIDpid(const Double_t *p) {  
+  // Sets the probability of each particle type (in HMPID)
+  SetPIDValues(fHMPIDr,p,AliPID::kSPECIES);
+  SetStatus(AliESDtrack::kHMPIDpid);
 }
 
 //_______________________________________________________________________
-void AliESDtrack::GetRICHpid(Double_t *p) const {
-  // Gets probabilities of each particle type (in RICH)
-  for (Int_t i=0; i<AliPID::kSPECIES; i++) p[i]=fRICHr[i];
+void AliESDtrack::GetHMPIDpid(Double_t *p) const {
+  // Gets probabilities of each particle type (in HMPID)
+  for (Int_t i=0; i<AliPID::kSPECIES; i++) p[i]=fHMPIDr[i];
 }
 
 
@@ -1093,12 +1102,12 @@ void AliESDtrack::Print(Option_t *) const {
       printf("%f, ", p[index]) ;
     printf("\n           signal = %f\n", GetTOFsignal()) ;
   }
-  if( IsOn(kRICHpid) ){
-    printf("From RICH: ") ; 
-    GetRICHpid(p) ; 
+  if( IsOn(kHMPIDpid) ){
+    printf("From HMPID: ") ; 
+    GetHMPIDpid(p) ; 
     for(index = 0 ; index < AliPID::kSPECIES; index++) 
       printf("%f, ", p[index]) ;
-    printf("\n           signal = %f\n", GetRICHsignal()) ;
+    printf("\n           signal = %f\n", GetHMPIDsignal()) ;
   }
 }