X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TRD%2FAliTRDtrackingSector.cxx;h=6b7419f70657fe833b06a64bfcf01e7a0b1615c1;hb=b25fa6e809a8dcd6f7832cac83214392cd77878a;hp=ff045659d572bc938deb9e9c66549d2174778164;hpb=d12ef0c7b3952828df439470fe551a5bb0540208;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TRD/AliTRDtrackingSector.cxx b/TRD/AliTRDtrackingSector.cxx
index ff045659d57..6b7419f7065 100644
--- a/TRD/AliTRDtrackingSector.cxx
+++ b/TRD/AliTRDtrackingSector.cxx
@@ -25,9 +25,7 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "AliTRDcalibDB.h"
-#include "AliTRDCommonParam.h"
-#include "AliTRDpadPlane.h"
+#include "AliTRDReconstructor.h"
 #include "AliTRDtrackingSector.h"
 #include "AliTRDtrackingChamber.h"
 
@@ -38,11 +36,12 @@ ClassImp(AliTRDtrackingSector)
 AliTRDtrackingSector::AliTRDtrackingSector()
   :fSector(-1)
   ,fN(0)
-  ,fGeom(0x0)
+  ,fGeom(NULL)
 {
   // Default constructor
   
   memset(fChamber, 0, AliTRDgeometry::kNdets*sizeof(AliTRDtrackingChamber*));
+  memset(fStack,   0, AliTRDgeometry::kNlayer*sizeof(AliTRDtrackingChamber*));
   memset(fIndex, -1, AliTRDgeometry::kNdets*sizeof(Char_t));
   memset(fX0, 0, AliTRDgeometry::kNlayer*sizeof(Float_t));
 }
@@ -58,26 +57,27 @@ AliTRDtrackingSector::AliTRDtrackingSector(AliTRDgeometry *geo, Int_t gs)
   //
 
   memset(fChamber, 0, AliTRDgeometry::kNdets*sizeof(AliTRDtrackingChamber*));
+  memset(fStack,   0, AliTRDgeometry::kNlayer*sizeof(AliTRDtrackingChamber*));
   memset(fIndex, -1, AliTRDgeometry::kNdets*sizeof(Char_t));
   memset(fX0, 0, AliTRDgeometry::kNlayer*sizeof(Float_t));
 }
 
     
 //_____________________________________________________________________________
-void AliTRDtrackingSector::Init(const AliTRDReconstructor *rec, const AliTRDCalDet *cal)
+void AliTRDtrackingSector::Init(const AliTRDReconstructor *rec)
 {		
 // 	Steer building of tracking chambers and build tracking sector.
 // 	Propagate radial position information (calibration/alignment aware) from chambers to sector level
 //
   
-  AliTRDchamberTimeBin *tb = 0x0;
+  AliTRDchamberTimeBin *tb = NULL;
   AliTRDtrackingChamber **tc = &fChamber[0];
   for(Int_t ic = 0; (ic<AliTRDgeometry::kNdets) && (*tc); ic++, tc++){
-    for(Int_t itb=0; itb<AliTRDseed::knTimebins; itb++){
+    for(Int_t itb=0; itb<AliTRDseedV1::kNtb; itb++){
       if(!(tb = (*tc)->GetTB(itb))) continue;
       tb->SetReconstructor(rec);
     }
-    (*tc)->Build(fGeom, cal, rec->IsHLT());
+    (*tc)->Build(fGeom, rec->IsHLT());
   }
     
   Int_t nl;
@@ -107,7 +107,7 @@ void AliTRDtrackingSector::Clear(const Option_t *opt)
   AliTRDtrackingChamber **tc = &fChamber[0];
   for(Int_t ich=0; ich<fN; ich++, tc++){ 
     (*tc)->Clear(opt);
-    delete (*tc); (*tc) = 0x0;   // I would avoid
+    delete (*tc); (*tc) = NULL;   // I would avoid
   }	
   memset(fIndex, -1, AliTRDgeometry::kNdets*sizeof(Char_t));
   fN = 0;
@@ -121,7 +121,7 @@ AliTRDtrackingChamber* AliTRDtrackingSector::GetChamber(Int_t stack, Int_t layer
   
   Int_t ch = stack*AliTRDgeometry::kNlayer + layer;
   if(fIndex[ch] >= 0) return fChamber[Int_t(fIndex[ch])];
-  else if(!build) return 0x0;
+  else if(!build) return NULL;
   
   // CHAMBER HAS TO BE BUILD
   Int_t rch = ch;do rch--; while(rch>=0 && fIndex[rch]<0);
@@ -142,34 +142,35 @@ AliTRDtrackingChamber** AliTRDtrackingSector::GetStack(Int_t stack)
 // Return chamber at position (stack, plane) in current 
 // sector or build a new one if it is not already created
   
-  if(stack<0 || stack>=AliTRDgeometry::kNstack) return 0x0;
+  if(stack<0 || stack>=AliTRDgeometry::kNstack) return NULL;
   
   Int_t ich, n = 0;
   for(int il=0; il<AliTRDgeometry::kNlayer; il++){
     ich = stack*AliTRDgeometry::kNlayer + il;
-    if(fIndex[ich] < 0) fStack[il] = 0x0; 
+    if(fIndex[ich] < 0) fStack[il] = NULL; 
     else{
       fStack[il] = fChamber[Int_t(fIndex[ich])];
       n++;
     }
   }
   
-  return n ? &fStack[0] : 0x0;
+  return n ? &fStack[0] : NULL;
 }
 
 //_____________________________________________________________________________
-void AliTRDtrackingSector::Print(Option_t *)
+void AliTRDtrackingSector::Print(Option_t *opt) const
 {
 // Dump info about this tracking sector and the tracking chamber within
 // 
 
-  printf("\tSector %2d\n", fSector);
+  printf("\n\tSector[%2d]\n", fSector);
   for(int il=0; il<AliTRDgeometry::kNlayer; il++){
     for(int is =0; is<AliTRDgeometry::kNstack; is++){
       Int_t ch = is*AliTRDgeometry::kNlayer + il;
-      printf("%2d[%2d] ", fIndex[ch], fIndex[ch]>=0 ? fChamber[Int_t(fIndex[ch])]->GetNClusters() : 0);
+      if(opt) fChamber[Int_t(fIndex[ch])]->Print(opt);
+      else printf("%2d[%2d] ", fIndex[ch], fIndex[ch]>=0 ? fChamber[Int_t(fIndex[ch])]->GetNClusters() : 0);
     }
-    printf("\n");
+    if(!opt) printf("\n");
   }
 
 }