Possibility to filter the ESD friends and add objects to AliESDfriends.root. Major...

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

diff --git a/STEER/AliESDtrack.cxx b/STEER/AliESDtrack.cxx
index c99baee9a1eb975d1fb4371aafb9ffe3900e8d5d..97487b268920752ab7a42c0cc651137cd6a2c4b6 100644 (file)
--- a/STEER/AliESDtrack.cxx
+++ b/STEER/AliESDtrack.cxx
@@ -1161,7 +1161,6 @@ Bool_t AliESDtrack::UpdateTrackParams(const AliKalmanTrack *t, ULong_t flags){
   //
   // This function updates track's running parameters 
   //
-  Int_t *index=0;
   Bool_t rc=kTRUE;
 
   SetStatus(flags);
@@ -1181,16 +1180,21 @@ Bool_t AliESDtrack::UpdateTrackParams(const AliKalmanTrack *t, ULong_t flags){
   switch (flags) {
     
   case kITSin: case kITSout: case kITSrefit:
+    {
     fITSClusterMap=0;
     fITSncls=t->GetNumberOfClusters();
-    index=fFriendTrack->GetITSindices(); 
+    Int_t* indexITS = new Int_t[AliESDfriendTrack::kMaxITScluster];
     for (Int_t i=0;i<AliESDfriendTrack::kMaxITScluster;i++) {
-        index[i]=t->GetClusterIndex(i);
+       indexITS[i]=t->GetClusterIndex(i);
+
        if (i<fITSncls) {
-           Int_t l=(index[i] & 0xf0000000) >> 28;
+         Int_t l=(indexITS[i] & 0xf0000000) >> 28;
            SETBIT(fITSClusterMap,l);                 
         }
     }
+    fFriendTrack->SetITSIndices(indexITS,AliESDfriendTrack::kMaxITScluster);
+    delete [] indexITS;
+
     fITSchi2=t->GetChi2();
     fITSsignal=t->GetPIDsignal();
     fITSLabel = t->GetLabel();
@@ -1200,9 +1204,11 @@ Bool_t AliESDtrack::UpdateTrackParams(const AliKalmanTrack *t, ULong_t flags){
       else 
         fOp->Set(t->GetX(),t->GetAlpha(),t->GetParameter(),t->GetCovariance());
     }   
+    }
     break;
     
   case kTPCin: case kTPCrefit:
+    {
     fTPCLabel = t->GetLabel();
     if (flags==kTPCin)  {
       fTPCInner=new AliExternalTrackParam(*t); 
@@ -1212,8 +1218,10 @@ Bool_t AliESDtrack::UpdateTrackParams(const AliKalmanTrack *t, ULong_t flags){
     if (!fIp) fIp=new AliExternalTrackParam(*t);
     else 
       fIp->Set(t->GetX(),t->GetAlpha(),t->GetParameter(),t->GetCovariance());
+    }
   case kTPCout:
-    index=fFriendTrack->GetTPCindices(); 
+    {
+    Int_t* indexTPC = new Int_t[AliESDfriendTrack::kMaxTPCcluster];
     if (flags & kTPCout){
       if (!fOp) fOp=new AliExternalTrackParam(*t);
       else 
@@ -1228,8 +1236,8 @@ Bool_t AliESDtrack::UpdateTrackParams(const AliKalmanTrack *t, ULong_t flags){
        //       for (Int_t i=0;i<fTPCncls;i++) 
        for (Int_t i=0;i<AliESDfriendTrack::kMaxTPCcluster;i++) 
         {
-          index[i]=t->GetClusterIndex(i);
-          Int_t idx = index[i];
+         indexTPC[i]=t->GetClusterIndex(i);
+         Int_t idx = indexTPC[i];
 
          if (idx<0) continue; 
 
@@ -1272,20 +1280,30 @@ Bool_t AliESDtrack::UpdateTrackParams(const AliKalmanTrack *t, ULong_t flags){
            }
           // End Of Piotr's Cluster Map for HBT
         }
+       fFriendTrack->SetTPCIndices(indexTPC,AliESDfriendTrack::kMaxTPCcluster);
+       delete [] indexTPC;
+
      }
     fTPCsignal=t->GetPIDsignal();
+    }
     break;
 
   case kTRDin: case kTRDrefit:
     break;
   case kTRDout:
-    index     = fFriendTrack->GetTRDindices();
+    {
     fTRDLabel = t->GetLabel(); 
     fTRDchi2  = t->GetChi2();
     fTRDncls  = t->GetNumberOfClusters();
-    for (Int_t i=0;i<6;i++) index[i]=t->GetTrackletIndex(i);
+      Int_t* indexTRD = new Int_t[AliESDfriendTrack::kMaxTRDcluster];
+      for (Int_t i=0;i<AliESDfriendTrack::kMaxTRDcluster;i++) indexTRD[i]=-2;
+      for (Int_t i=0;i<6;i++) indexTRD[i]=t->GetTrackletIndex(i);
+      fFriendTrack->SetTRDIndices(indexTRD,AliESDfriendTrack::kMaxTRDcluster);
+      delete [] indexTRD;
+    
     
     fTRDsignal=t->GetPIDsignal();
+    }
     break;
   case kTRDbackup:
     if (!fOp) fOp=new AliExternalTrackParam(*t);
@@ -1551,12 +1569,17 @@ Char_t AliESDtrack::GetITSclusters(Int_t *idx) const {
   //---------------------------------------------------------------------
   // This function returns indices of the assgined ITS clusters 
   //---------------------------------------------------------------------
-  if (idx!=0) {
-     Int_t *index=fFriendTrack->GetITSindices();
-     for (Int_t i=0; i<AliESDfriendTrack::kMaxITScluster; i++) {
-         if ( (i>=fITSncls) && (i<6) ) idx[i]=-1;
-         else idx[i]=index[i];
-     }
+  if (idx) {
+    Int_t *index=fFriendTrack->GetITSindices();
+    for (Int_t i=0; i<AliESDfriendTrack::kMaxITScluster; i++) {
+      if ( (i>=fITSncls) && (i<6) ) idx[i]=-1;
+      else {
+       if (index) {
+         idx[i]=index[i];
+       }
+       else idx[i]= -2;
+      }
+    }
   }
   return fITSncls;
 }
@@ -1623,9 +1646,15 @@ UShort_t AliESDtrack::GetTPCclusters(Int_t *idx) const {
   //---------------------------------------------------------------------
   // This function returns indices of the assgined ITS clusters 
   //---------------------------------------------------------------------
-  if (idx!=0) {
+  if (idx) {
     Int_t *index=fFriendTrack->GetTPCindices();
-    for (Int_t i=0; i<AliESDfriendTrack::kMaxTPCcluster; i++) idx[i]=index[i];
+
+    if (index){
+      for (Int_t i=0; i<AliESDfriendTrack::kMaxTPCcluster; i++) idx[i]=index[i];
+    }
+    else {
+      for (Int_t i=0; i<AliESDfriendTrack::kMaxTPCcluster; i++) idx[i]=-2;
+    }
   }
   return fTPCncls;
 }
@@ -1667,9 +1696,15 @@ UChar_t AliESDtrack::GetTRDclusters(Int_t *idx) const {
   //---------------------------------------------------------------------
   // This function returns indices of the assgined TRD clusters 
   //---------------------------------------------------------------------
-  if (idx!=0) {
-     Int_t *index=fFriendTrack->GetTRDindices();
-     for (Int_t i=0; i<AliESDfriendTrack::kMaxTRDcluster; i++) idx[i]=index[i];
+  if (idx) {
+    Int_t *index=fFriendTrack->GetTRDindices();
+
+    if (index) {
+      for (Int_t i=0; i<AliESDfriendTrack::kMaxTRDcluster; i++) idx[i]=index[i];
+    }
+    else {
+      for (Int_t i=0; i<AliESDfriendTrack::kMaxTRDcluster; i++) idx[i]=-2;
+    }
   }
   return fTRDncls;
 }
@@ -1687,10 +1722,14 @@ UChar_t AliESDtrack::GetTRDtracklets(Int_t *idx) const {
 //      Therefore tracks with TRD gaps contain default values for indices [-1] 
 
   if (!idx) return GetTRDntracklets();
-  Int_t *index=fFriendTrack->GetTRDindices(), n(0);
+  Int_t *index=fFriendTrack->GetTRDindices();
+  Int_t n = 0;
   for (Int_t i=0; i<kTRDnPlanes; i++){ 
-    if(index[i]>=0) n++;
-    idx[i]=index[i];
+    if (index){
+      if(index[i]>=0) n++;
+      idx[i]=index[i];
+    }
+    else idx[i] = -2;
   }
   return n;
 }