Avoiding warnings

[u/mrichter/AliRoot.git] / TRD / AliTRDtrackingChamber.cxx

diff --git a/TRD/AliTRDtrackingChamber.cxx b/TRD/AliTRDtrackingChamber.cxx
index 7b6d1afc427da88fd73e3a678c8d87b8fcc73f5b..29b603787161daf9969ca500373e8b4249686512 100644 (file)
--- a/TRD/AliTRDtrackingChamber.cxx
+++ b/TRD/AliTRDtrackingChamber.cxx
@@ -52,7 +52,7 @@ AliTRDtrackingChamber::AliTRDtrackingChamber()
 //_______________________________________________________
 void AliTRDtrackingChamber::Clear(const Option_t *opt)
 {
-  for(Int_t itb=0; itb<kNTimeBins; itb++) fTB[itb].Clear(opt);
+  for(Int_t itb=0; itb<AliTRDseedV1::kNtb; itb++) fTB[itb].Clear(opt);
 }
 
 //_______________________________________________________
@@ -62,7 +62,7 @@ void AliTRDtrackingChamber::InsertCluster(AliTRDcluster *c, Int_t index)
 }
 
 //_______________________________________________________
-Bool_t AliTRDtrackingChamber::Build(AliTRDgeometry *geo, const AliTRDCalDet *cal, Bool_t hlt)
+Bool_t AliTRDtrackingChamber::Build(AliTRDgeometry *const geo, const AliTRDCalDet *cal, Bool_t hlt)
 {
 // Init chamber and all time bins (AliTRDchamberTimeBin)
 // Calculates radial position of the chamber based on 
@@ -81,7 +81,7 @@ Bool_t AliTRDtrackingChamber::Build(AliTRDgeometry *geo, const AliTRDCalDet *cal
   Int_t nrows = pp->GetNrows();
   
   Int_t index[50], jtb = 0;
-  for(Int_t itb=0; itb<kNTimeBins; itb++){ 
+  for(Int_t itb=0; itb<AliTRDseedV1::kNtb; itb++){ 
     if(!fTB[itb]) continue;
     fTB[itb].SetRange(z0, zl);
     fTB[itb].SetNRows(nrows);
@@ -104,7 +104,7 @@ Bool_t AliTRDtrackingChamber::Build(AliTRDgeometry *geo, const AliTRDCalDet *cal
     mean /= roc->GetNchannels();
     t0 = (Int_t)(cal->GetValue(fDetector) + mean);
   }
-
+  fTB[t0].SetT0();
   fX0 = x0 + dx*(index[0] - t0);       
   return kTRUE;
 }
@@ -116,7 +116,7 @@ Int_t AliTRDtrackingChamber::GetNClusters() const
 // Returns number of clusters in chamber
 //
   Int_t n = 0;
-  for(Int_t itb=0; itb<kNTimeBins; itb++){ 
+  for(Int_t itb=0; itb<AliTRDseedV1::kNtb; itb++){ 
     n += Int_t(fTB[itb]);
   }
   return n;    
@@ -129,7 +129,7 @@ void AliTRDtrackingChamber::Bootstrap(const AliTRDReconstructor *rec)
 // Bootstrap each time bin
 //
   AliTRDchamberTimeBin *jtb = &fTB[0];
-  for(Int_t itb=0; itb<kNTimeBins; itb++, ++jtb){ 
+  for(Int_t itb=0; itb<AliTRDseedV1::kNtb; itb++, ++jtb){ 
     (*jtb).Bootstrap(rec, fDetector);
   }
 }
@@ -141,7 +141,7 @@ void  AliTRDtrackingChamber::SetOwner()
 // Set ownership in time bins
 //
   AliTRDchamberTimeBin *jtb = &fTB[0];
-  for(Int_t itb=0; itb<kNTimeBins; itb++, ++jtb){ 
+  for(Int_t itb=0; itb<AliTRDseedV1::kNtb; itb++, ++jtb){ 
     if(!(Int_t(*jtb))) continue;
     (*jtb).SetOwner();
   }
@@ -172,7 +172,7 @@ Double_t AliTRDtrackingChamber::GetQuality()
   Int_t ncl   = 0;
   Int_t nused = 0;
   Int_t nClLayer;
-  for(int itb=0; itb<kNTimeBins; itb++){
+  for(int itb=0; itb<AliTRDseedV1::kNtb; itb++){
     if(!(nClLayer = fTB[itb].GetNClusters())) continue;
     ncl += nClLayer;
     for(Int_t incl = 0; incl < nClLayer; incl++){
@@ -200,7 +200,7 @@ Double_t AliTRDtrackingChamber::GetQuality()
 
 
 //_______________________________________________________
-Bool_t AliTRDtrackingChamber::GetSeedingLayer(AliTRDchamberTimeBin *&fakeLayer, AliTRDgeometry *geo, const AliTRDReconstructor *rec)
+Bool_t AliTRDtrackingChamber::GetSeedingLayer(AliTRDchamberTimeBin *&fakeLayer, AliTRDgeometry * const geo, const AliTRDReconstructor *rec)
 {
   //
   // Creates a seeding layer
@@ -234,12 +234,12 @@ Bool_t AliTRDtrackingChamber::GetSeedingLayer(AliTRDchamberTimeBin *&fakeLayer,
   Int_t hvals[kMaxPads + 1];   memset(hvals, 0, sizeof(Int_t)*kMaxPads);        // one entry in addition for termination flag
   Float_t *sigmas[kMaxRows];
   Float_t svals[kMaxPads];     memset(svals, 0, sizeof(Float_t)*kMaxPads);     
-  AliTRDcluster *c = 0x0;
+  AliTRDcluster *c = NULL;
   for(Int_t irs = 0; irs < kMaxRows; irs++){
     histogram[irs] = &hvals[irs*kMaxCols];
     sigmas[irs] = &svals[irs*kMaxCols];
   }
-  for(Int_t iTime = timeBinMin; iTime < kNTimeBins-timeBinMax; iTime++){
+  for(Int_t iTime = timeBinMin; iTime < AliTRDseedV1::kNtb-timeBinMax; iTime++){
     if(!(nClusters = fTB[iTime].GetNClusters())) continue;
     z0 = fTB[iTime].GetZ0();
     zl = fTB[iTime].GetDZ0();
@@ -302,7 +302,7 @@ Bool_t AliTRDtrackingChamber::GetSeedingLayer(AliTRDchamberTimeBin *&fakeLayer,
   Int_t col, row, lower, lower1, upper, upper1;
   for(Int_t ib = 0; ib < nCont; ib++){
     if(nCandidates >= AliTRDtrackerV1::kMaxTracksStack){
-      printf("Number of seed candidates %d exceeded maximum allowed per stack %d", nCandidates, AliTRDtrackerV1::kMaxTracksStack);
+      AliWarning(Form("Number of seed candidates %d exceeded maximum allowed per stack %d", nCandidates, AliTRDtrackerV1::kMaxTracksStack));
       break;
     }
     // Positions
@@ -362,7 +362,7 @@ Bool_t AliTRDtrackingChamber::GetSeedingLayer(AliTRDchamberTimeBin *&fakeLayer,
       col = cand[ican] % nCols;
       //temporary
       Int_t n = 0; Double_t x = 0., y = 0., z = 0.;
-      for(int itb=0; itb<kNTimeBins; itb++){
+      for(int itb=0; itb<AliTRDseedV1::kNtb; itb++){
         if(!(nClusters = fTB[itb].GetNClusters())) continue;
         for(Int_t incl = 0; incl < nClusters; incl++){
           c = fTB[itb].GetCluster(incl);       
@@ -379,18 +379,18 @@ Bool_t AliTRDtrackingChamber::GetSeedingLayer(AliTRDchamberTimeBin *&fakeLayer,
       pos[2] = z/n;
       sig[0] = .02;
       sig[1] = sigcands[ican];
-      fakeLayer->InsertCluster(new AliTRDcluster(fDetector, 0., pos, sig, 0x0, 3, signal, col, row, 0, 0, 0., 0), fakeIndex++);
+      fakeLayer->InsertCluster(new AliTRDcluster(fDetector, 0., pos, sig, NULL, 3, signal, col, row, 0, 0, 0., 0), fakeIndex++);
     }
   }
   fakeLayer->BuildIndices();
   //fakeLayer->Print();
   
-  if(rec->GetStreamLevel(AliTRDReconstructor::kTracker) >= 3){
+  if(rec->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) >= 3){
     //TMatrixD hist(nRows, nCols);
     //for(Int_t i = 0; i < nRows; i++)
     // for(Int_t j = 0; j < nCols; j++)
     //         hist(i,j) = histogram[i][j];
-    TTreeSRedirector &cstreamer = *AliTRDtrackerV1::DebugStreamer();
+    TTreeSRedirector &cstreamer = *rec->GetDebugStream(AliTRDrecoParam::kTracker);
     cstreamer << "GetSeedingLayer"
     << "layer="      << layer
     << "ymin="       << ymin
@@ -409,9 +409,24 @@ Bool_t AliTRDtrackingChamber::GetSeedingLayer(AliTRDchamberTimeBin *&fakeLayer,
 //_______________________________________________________
 void AliTRDtrackingChamber::Print(Option_t *opt) const
 {
+  // Print the chamber status
   if(!GetNClusters()) return;
   AliInfo(Form("fDetector   = %d", fDetector));
   AliInfo(Form("fX0         = %7.3f", fX0));
   const AliTRDchamberTimeBin *itb = &fTB[0];
-  for(Int_t jtb=0; jtb<kNTimeBins; jtb++, itb++) (*itb).Print(opt);
+  for(Int_t jtb=0; jtb<AliTRDseedV1::kNtb; jtb++, itb++) (*itb).Print(opt);
 }
+
+
+//_______________________________________________________
+void AliTRDtrackingChamber::Update()
+{
+// Steer purging of used and shared clusters 
+
+  AliTRDchamberTimeBin *jtb = &fTB[0];
+  for(Int_t itb=AliTRDseedV1::kNtb; itb--; ++jtb){ 
+    if(!(Int_t(*jtb))) continue;
+    (*jtb).BuildIndices();
+  }
+}
+