added comments to new data members (Leticia)

[u/mrichter/AliRoot.git] / TOF / AliTOFtrackerMI.cxx

diff --git a/TOF/AliTOFtrackerMI.cxx b/TOF/AliTOFtrackerMI.cxx
index 417bc0f691aa8a069d20ba6c3b7f5f8c0796acb7..01794c5e4a812562e8239dfa07e4fa1ff882da6e 100644 (file)
--- a/TOF/AliTOFtrackerMI.cxx
+++ b/TOF/AliTOFtrackerMI.cxx
@@ -24,11 +24,13 @@
 #include <Rtypes.h>
 
 #include "TClonesArray.h"
+#include "TObjArray.h"
 #include "TTree.h"
 #include "TTreeStream.h"
 
 #include "AliESDEvent.h"
 #include "AliESDtrack.h"
+#include "AliESDpid.h"
 
 #include "AliTOFRecoParam.h"
 #include "AliTOFReconstructor.h"
@@ -36,7 +38,8 @@
 #include "AliTOFGeometry.h"
 #include "AliTOFtrackerMI.h"
 #include "AliTOFtrack.h"
-#include "AliTOFpidESD.h"
+
+#include "AliMathBase.h"
 
 class TGeoManager;
 
@@ -46,9 +49,8 @@ ClassImp(AliTOFtrackerMI)
 
 //_____________________________________________________________________________
 AliTOFtrackerMI::AliTOFtrackerMI():
-  fRecoParam(0x0),
+  fkRecoParam(0x0),
   fGeom(0x0),
-  fPid(0x0),
   fN(0),
   fNseeds(0),
   fNseedsTOF(0),
@@ -63,7 +65,7 @@ AliTOFtrackerMI::AliTOFtrackerMI():
   fDy(0), 
   fDz(0), 
   fTracks(new TClonesArray("AliTOFtrack")),
-  fSeeds(new TClonesArray("AliESDtrack")),
+  fSeeds(new TObjArray(100)),
   fDebugStreamer(0x0)
  { 
   //AliTOFtrackerMI main Ctor
@@ -76,15 +78,14 @@ AliTOFtrackerMI::AliTOFtrackerMI():
 //_____________________________________________________________________________
 AliTOFtrackerMI::~AliTOFtrackerMI(){
   //
-  //
+  // Destructor
   //
   if (fDebugStreamer) {    
     //fDebugStreamer->Close();
     delete fDebugStreamer;
   }
-  delete fRecoParam;
+  delete fkRecoParam;
   delete fGeom;
-  delete fPid;
   if (fTracks){
     fTracks->Delete();
     delete fTracks;
@@ -96,9 +97,19 @@ AliTOFtrackerMI::~AliTOFtrackerMI(){
     fSeeds=0x0;
   }
 }
+//_____________________________________________________________________________
+void AliTOFtrackerMI::GetPidSettings(AliESDpid *esdPID) {
+  // 
+  // Sets TOF resolution from RecoParams
+  //
+  if (fkRecoParam)
+    esdPID->GetTOFResponse().SetTimeResolution(fkRecoParam->GetTimeResolution());
+  else
+    AliWarning("fkRecoParam not yet set; cannot set PID settings");
+}
 
 //_____________________________________________________________________________
-Int_t AliTOFtrackerMI::PropagateBack(AliESDEvent* event) {
+Int_t AliTOFtrackerMI::PropagateBack(AliESDEvent * const event) {
   //
   // Gets seeds from ESD event and Match with TOF Clusters
   //
@@ -106,19 +117,14 @@ Int_t AliTOFtrackerMI::PropagateBack(AliESDEvent* event) {
   // initialize RecoParam for current event
   AliDebug(1,"Initializing params for TOF");
 
-  fRecoParam = AliTOFReconstructor::GetRecoParam();  // instantiate reco param from STEER...
+  fkRecoParam = AliTOFReconstructor::GetRecoParam();  // instantiate reco param from STEER...
 
-  if (fRecoParam == 0x0) { 
+  if (fkRecoParam == 0x0) { 
     AliFatal("No Reco Param found for TOF!!!");
   }
-  //fRecoParam->Dump();
-  //if(fRecoParam->GetApplyPbPbCuts())fRecoParam=fRecoParam->GetPbPbparam();
-  //fRecoParam->PrintParameters();
-
-  Double_t parPID[2];   
-  parPID[0]=fRecoParam->GetTimeResolution();
-  parPID[1]=fRecoParam->GetTimeNSigma();
-  fPid=new AliTOFpidESD(parPID);
+  //fkRecoParam->Dump();
+  //if(fkRecoParam->GetApplyPbPbCuts())fkRecoParam=fkRecoParam->GetPbPbparam();
+  //fkRecoParam->PrintParameters();
 
   //Initialise some counters
 
@@ -131,15 +137,10 @@ Int_t AliTOFtrackerMI::PropagateBack(AliESDEvent* event) {
 
   Int_t ntrk=event->GetNumberOfTracks();
   fNseeds = ntrk;
-  TClonesArray &aESDTrack = *fSeeds;
-
 
   //Load ESD tracks into a local Array of ESD Seeds
-
-  for (Int_t i=0; i<fNseeds; i++) {
-    AliESDtrack *t=event->GetTrack(i);
-    new(aESDTrack[i]) AliESDtrack(*t);
-  }
+  for (Int_t i=0; i<fNseeds; i++)
+    fSeeds->AddLast(event->GetTrack(i));
 
   //Prepare ESD tracks candidates for TOF Matching
   CollectESD();
@@ -158,7 +159,7 @@ Int_t AliTOFtrackerMI::PropagateBack(AliESDEvent* event) {
 
   for (Int_t i=0; i<ntrk; i++) {
     AliESDtrack *t=event->GetTrack(i);
-    AliESDtrack *seed =(AliESDtrack*)fSeeds->UncheckedAt(i);
+    AliESDtrack *seed =(AliESDtrack*)fSeeds->At(i);
 
     if ( (seed->GetStatus()&AliESDtrack::kTOFin)!=0 ) {
       t->SetStatus(AliESDtrack::kTOFin);
@@ -190,6 +191,8 @@ Int_t AliTOFtrackerMI::PropagateBack(AliESDEvent* event) {
        t->SetIntegratedLength(seed->GetIntegratedLength());
        t->SetTOFsignalToT(seed->GetTOFsignalToT());
        t->SetTOFCalChannel(seed->GetTOFCalChannel());
+       t->SetTOFDeltaBC(seed->GetTOFDeltaBC());
+       t->SetTOFL0L1(seed->GetTOFL0L1());
        //
        // Make attention, please:
        //      AliESDtrack::fTOFInfo array does not be stored in the AliESDs.root file
@@ -203,10 +206,9 @@ Int_t AliTOFtrackerMI::PropagateBack(AliESDEvent* event) {
 
 
   //Make TOF PID
-  fPid->MakePID(event);
 
   fSeeds->Clear();
-  fTracks->Clear();
+  fTracks->Delete();
   return 0;
   
 }
@@ -219,7 +221,7 @@ void AliTOFtrackerMI::CollectESD() {
   Int_t c1=0;
   for (Int_t i=0; i<fNseeds; i++) {
 
-    AliESDtrack *t =(AliESDtrack*)fSeeds->UncheckedAt(i);
+    AliESDtrack *t =(AliESDtrack*)fSeeds->At(i);
     if ((t->GetStatus()&AliESDtrack::kTPCout)==0)continue;
 
     AliTOFtrack *track = new AliTOFtrack(*t); // New
@@ -259,16 +261,8 @@ void AliTOFtrackerMI::CollectESD() {
 
 }
 
-
-
-
-
-
-
-//
-//
 //_________________________________________________________________________
-void AliTOFtrackerMI::MatchTracks( Bool_t /*mLastStep*/){
+void AliTOFtrackerMI::MatchTracks( Bool_t /*mLastStep*/) const {
   return;
 }
 //
@@ -288,8 +282,6 @@ void AliTOFtrackerMI::MatchTracksMI(Bool_t mLastStep){
   
   Int_t nSteps=(Int_t)(fTOFHeigth/0.1);
 
-  //AliTOFcalib *calib = new AliTOFcalib(); // AdC
-
   //PH Arrays (moved outside of the loop)
   Float_t * trackPos[4];
   for (Int_t ii=0; ii<4; ii++) trackPos[ii] = new Float_t[nSteps];
@@ -311,7 +303,7 @@ void AliTOFtrackerMI::MatchTracksMI(Bool_t mLastStep){
   for (Int_t i=0; i<fNseedsTOF; i++) {
 
     AliTOFtrack *track =(AliTOFtrack*)fTracks->UncheckedAt(i);
-    AliESDtrack *t =(AliESDtrack*)fSeeds->UncheckedAt(track->GetSeedIndex());
+    AliESDtrack *t =(AliESDtrack*)fSeeds->At(track->GetSeedIndex());
     Bool_t hasTime = ( (t->GetStatus()& AliESDtrack::kTIME)>0) ? kTRUE:kFALSE;   // did we integrate time
     Float_t trdquality = t->GetTRDQuality();
     //
@@ -560,6 +552,8 @@ void AliTOFtrackerMI::MatchTracksMI(Bool_t mLastStep){
     t->SetTOFInfo(info);
     t->SetTOFsignal(tof2);
     t->SetTOFcluster(cgold->GetIndex());  
+    t->SetTOFDeltaBC(cgold->GetDeltaBC());
+    t->SetTOFL0L1(cgold->GetL0L1Latency());
 
     AliDebug(2, Form("%7i     %7i     %10i     %10i  %10i  %10i      %7i",
                     i,
@@ -784,7 +778,7 @@ Float_t AliTOFtrackerMI::GetLinearDistances(AliTOFtrack * track, AliTOFcluster *
 }
 
 //_________________________________________________________________________
-void    AliTOFtrackerMI::GetLikelihood(Float_t dy, Float_t dz, const Double_t *cov, AliTOFtrack * /*track*/, Float_t & py, Float_t &pz)
+void AliTOFtrackerMI::GetLikelihood(Float_t dy, Float_t dz, const Double_t *cov, AliTOFtrack * /*track*/, Float_t & py, Float_t &pz) const
 {
   //
   //  get likelihood - track covariance taken
@@ -798,8 +792,8 @@ void    AliTOFtrackerMI::GetLikelihood(Float_t dy, Float_t dz, const Double_t *c
 
   
   Float_t normwidth, normd, p0,p1;  
-  Float_t sigmay = TMath::Max(TMath::Sqrt(cov[0]+kMeanSigmaY*kMeanSigmaY),kMaxSigmaY);
-  Float_t sigmaz = TMath::Max(TMath::Sqrt(cov[2]+kMeanSigmaZ*kMeanSigmaZ),kMaxSigmaZ);
+  Float_t sigmay = TMath::Max(TMath::Sqrt(TMath::Abs(cov[0])+kMeanSigmaY*kMeanSigmaY),kMaxSigmaY);
+  Float_t sigmaz = TMath::Max(TMath::Sqrt(TMath::Abs(cov[2])+kMeanSigmaZ*kMeanSigmaZ),kMaxSigmaZ);
 
   py=0;
   pz=0;  
@@ -808,28 +802,28 @@ void    AliTOFtrackerMI::GetLikelihood(Float_t dy, Float_t dz, const Double_t *c
   //
   normwidth = fDy/sigmay;
   normd     = dy/sigmay;
-  p0 = 0.5*(1+TMath::Erf(normd-normwidth*0.5));
-  p1 = 0.5*(1+TMath::Erf(normd+normwidth*0.5));  
+  p0 = 0.5*(1+AliMathBase::ErfFast(normd-normwidth*0.5));
+  p1 = 0.5*(1+AliMathBase::ErfFast(normd+normwidth*0.5));  
   py+= 0.75*(p1-p0);
   //
   normwidth = fDy/(3.*sigmay);
   normd     = dy/(3.*sigmay);
-  p0 = 0.5*(1+TMath::Erf(normd-normwidth*0.5));
-  p1 = 0.5*(1+TMath::Erf(normd+normwidth*0.5));  
+  p0 = 0.5*(1+AliMathBase::ErfFast(normd-normwidth*0.5));
+  p1 = 0.5*(1+AliMathBase::ErfFast(normd+normwidth*0.5));  
   py+= 0.25*(p1-p0);
   // 
   // pz calculation   - 75% admixture of original sigma - 25% tails 
   //
   normwidth = fDz/sigmaz;
   normd     = dz/sigmaz;
-  p0 = 0.5*(1+TMath::Erf(normd-normwidth*0.5));
-  p1 = 0.5*(1+TMath::Erf(normd+normwidth*0.5));  
+  p0 = 0.5*(1+AliMathBase::ErfFast(normd-normwidth*0.5));
+  p1 = 0.5*(1+AliMathBase::ErfFast(normd+normwidth*0.5));  
   pz+= 0.75*(p1-p0);
   //
   normwidth = fDz/(3.*sigmaz);
   normd     = dz/(3.*sigmaz);
-  p0 = 0.5*(1+TMath::Erf(normd-normwidth*0.5));
-  p1 = 0.5*(1+TMath::Erf(normd+normwidth*0.5));  
+  p0 = 0.5*(1+AliMathBase::ErfFast(normd-normwidth*0.5));
+  p1 = 0.5*(1+AliMathBase::ErfFast(normd+normwidth*0.5));  
   pz+= 0.25*(p1-p0);
 }
 //_________________________________________________________________________