removing warnings

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

diff --git a/TOF/AliTOFtrackerV1.cxx b/TOF/AliTOFtrackerV1.cxx
index 14e5433b5d4a0a97c08ff326248439b8a6355248..9c1dcc385d7150f7c894c4ddd4f9ba1212f3a74f 100644 (file)
--- a/TOF/AliTOFtrackerV1.cxx
+++ b/TOF/AliTOFtrackerV1.cxx
@@ -67,7 +67,7 @@ AliTOFtrackerV1::AliTOFtrackerV1():
   fnunmatch(0),
   fnmatch(0),
   fTracks(new TClonesArray("AliTOFtrack")),
-  fSeeds(new TObjArray(15000)),
+  fSeeds(new TObjArray(100)),
   fHDigClusMap(0x0),
   fHDigNClus(0x0),
   fHDigClusTime(0x0),
@@ -80,7 +80,9 @@ AliTOFtrackerV1::AliTOFtrackerV1():
   fHRecSigYVsPWin(0x0),
   fHRecSigZVsPWin(0x0)
  { 
-  //AliTOFtrackerV1 main Ctor
+   //AliTOFtrackerV1 main Ctor
+
+   for (Int_t ii=0; ii<kMaxCluster; ii++) fClusters[ii]=0x0;
 
    InitCheckHists();
 
@@ -117,6 +119,11 @@ AliTOFtrackerV1::~AliTOFtrackerV1() {
     delete fSeeds;
     fSeeds=0x0;
   }
+
+
+  for (Int_t ii=0; ii<kMaxCluster; ii++)
+    if (fClusters[ii]) fClusters[ii]->Delete();
+
 }
 //_____________________________________________________________________________
 void AliTOFtrackerV1::GetPidSettings(AliESDpid *esdPID) {
@@ -158,10 +165,7 @@ Int_t AliTOFtrackerV1::PropagateBack(AliESDEvent * const event) {
   Int_t ntrk=event->GetNumberOfTracks();
   fNseeds = ntrk;
 
-
   //Load ESD tracks into a local Array of ESD Seeds
-  if (!fSeeds)
-    fSeeds = new TObjArray(fNseeds);
   for (Int_t i=0; i<fNseeds; i++)
     fSeeds->AddLast(event->GetTrack(i));
 
@@ -274,7 +278,7 @@ Int_t AliTOFtrackerV1::PropagateBack(AliESDEvent * const event) {
                        covB[13],covA[13],
                        covB[14],covA[14]
                        ));
-       AliDebug(3,Form(" %6d  %f %f %f %f % %6d %3d %f  %f %f %f %f %f",
+       AliDebug(3,Form(" %6d  %f %f %f %f %f %6d %3d %f  %f %f %f %f %f",
                        i,
                        t->GetTOFsignalRaw(),
                        t->GetTOFsignal(),
@@ -291,7 +295,7 @@ Int_t AliTOFtrackerV1::PropagateBack(AliESDEvent * const event) {
     }
   }
 
-  fSeeds->Clear(); delete fSeeds; fSeeds=0;
+  fSeeds->Clear();
   fTracks->Delete();
   return 0;
   
@@ -365,7 +369,7 @@ void AliTOFtrackerV1::MatchTracks( ){
   Float_t dY=AliTOFGeometry::XPad(); 
   Float_t dZ=AliTOFGeometry::ZPad(); 
 
-  const Float_t kTimeOffset = 32.; // time offset for tracking algorithm [ps]
+  const Float_t kTimeOffset = 0.; // time offset for tracking algorithm [ps]
 
   const Int_t kncmax = 100;
   Float_t sensRadius = fkRecoParam->GetSensRadius();
@@ -390,7 +394,7 @@ void AliTOFtrackerV1::MatchTracks( ){
     AliESDtrack *t =(AliESDtrack*)fSeeds->At(track->GetSeedIndex());
     //if ( t->GetTOFsignal()>0. ) continue;
     if ( (t->GetStatus()&AliESDtrack::kTOFout)!=0 ) continue;
-    AliTOFtrack *trackTOFin =new AliTOFtrack(*track);
+    AliTOFtrack *trackTOFin = new AliTOFtrack(*track);
      
     // Determine a window around the track
     Double_t x,par[5]; trackTOFin->GetExternalParameters(x,par);
@@ -403,16 +407,16 @@ void AliTOFtrackerV1::MatchTracks( ){
     }
 
     Double_t z    = par[1];   
-    Double_t dz   =  scaleFact*3.*TMath::Sqrt(TMath::Abs(cov[2])+dZ*dZ/12.);
-    Double_t dphi =  scaleFact*3.*TMath::Sqrt(TMath::Abs(cov[0])+dY*dY/12.)/sensRadius; 
+    Double_t dz   = scaleFact*3.*TMath::Sqrt(TMath::Abs(cov[2])+dZ*dZ/12.);
+    Double_t dphi = scaleFact*3.*TMath::Sqrt(TMath::Abs(cov[0])+dY*dY/12.)/sensRadius; 
 
     Double_t phi=TMath::ATan2(par[0],x) + trackTOFin->GetAlpha();
     if (phi<-TMath::Pi())phi+=2*TMath::Pi();
     if (phi>=TMath::Pi())phi-=2*TMath::Pi();
 
     //upper limit on window's size.
-    if(dz> dzMax) dz=dzMax;
-    if(dphi*sensRadius> dyMax) dphi=dyMax/sensRadius;
+    if (dz> dzMax) dz=dzMax;
+    if (dphi*sensRadius> dyMax) dphi=dyMax/sensRadius;
 
     // find the clusters inside the selected window 
     Int_t nc=0;
@@ -425,9 +429,9 @@ void AliTOFtrackerV1::MatchTracks( ){
        AliWarning("No more matchable clusters can be stored! Please, increase the corresponding vectors size.");
        break; /* R+ fix (buffer overflow protection) */
       }
-      if(c->GetZ() > z+dz) break;
-      if(c->IsUsed()) continue;      
-      if(!c->GetStatus()) {
+      if (c->GetZ() > z+dz) break;
+      if (c->IsUsed()) continue;      
+      if (!c->GetStatus()) {
        AliDebug(1,"Cluster in channel declared bad!");
        continue; // skip bad channels as declared in OCDB  
       }
@@ -582,8 +586,14 @@ void AliTOFtrackerV1::MatchTracks( ){
     fHRecNClus->Fill(nc);
     fHRecChi2->Fill(bestChi2);
     fHRecDistZ->Fill(dzTW);
-    fHRecSigYVsP->Fill(mom,TMath::Sqrt(cov[0]));
-    fHRecSigZVsP->Fill(mom,TMath::Sqrt(cov[2]));
+    if (cov[0]>=0.)
+      fHRecSigYVsP->Fill(mom,TMath::Sqrt(cov[0]));
+    else
+      fHRecSigYVsP->Fill(mom,-TMath::Sqrt(-cov[0]));
+    if (cov[2]>=0.)
+      fHRecSigZVsP->Fill(mom,TMath::Sqrt(cov[2]));
+    else
+      fHRecSigZVsP->Fill(mom,-TMath::Sqrt(-cov[2]));
     fHRecSigYVsPWin->Fill(mom,dphi*sensRadius);
     fHRecSigZVsPWin->Fill(mom,dz);