Some hick-up with common blocks solved.

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

diff --git a/TRD/AliTRDtrackingSector.cxx b/TRD/AliTRDtrackingSector.cxx
index 5faee5f46d424db76c570c27ca61a2ad33ccb09f..99789dcee3c6e1cb4c2553369451a52b6ae0cc57 100644 (file)
--- a/TRD/AliTRDtrackingSector.cxx
+++ b/TRD/AliTRDtrackingSector.cxx
@@ -25,9 +25,6 @@
 //                                                                           //\r
 ///////////////////////////////////////////////////////////////////////////////\r
 \r
-#include "AliTRDcalibDB.h"\r
-#include "AliTRDCommonParam.h"\r
-#include "AliTRDpadPlane.h"\r
 #include "AliTRDtrackingSector.h"\r
 #include "AliTRDtrackingChamber.h"\r
 \r
@@ -38,7 +35,7 @@ ClassImp(AliTRDtrackingSector)
 AliTRDtrackingSector::AliTRDtrackingSector()\r
   :fSector(-1)\r
   ,fN(0)\r
-  ,fGeom(0x0)\r
+  ,fGeom(NULL)\r
 {\r
   // Default constructor\r
   \r
@@ -70,10 +67,10 @@ void AliTRDtrackingSector::Init(const AliTRDReconstructor *rec, const AliTRDCalD
 //     Propagate radial position information (calibration/alignment aware) from chambers to sector level\r
 //\r
   \r
-  AliTRDchamberTimeBin *tb = 0x0;\r
+  AliTRDchamberTimeBin *tb = NULL;\r
   AliTRDtrackingChamber **tc = &fChamber[0];\r
   for(Int_t ic = 0; (ic<AliTRDgeometry::kNdets) && (*tc); ic++, tc++){\r
-    for(Int_t itb=0; itb<AliTRDseed::knTimebins; itb++){\r
+    for(Int_t itb=0; itb<AliTRDseedV1::kNtb; itb++){\r
       if(!(tb = (*tc)->GetTB(itb))) continue;\r
       tb->SetReconstructor(rec);\r
     }\r
@@ -107,7 +104,7 @@ void AliTRDtrackingSector::Clear(const Option_t *opt)
   AliTRDtrackingChamber **tc = &fChamber[0];\r
   for(Int_t ich=0; ich<fN; ich++, tc++){ \r
     (*tc)->Clear(opt);\r
-    delete (*tc); (*tc) = 0x0;   // I would avoid\r
+    delete (*tc); (*tc) = NULL;   // I would avoid\r
   }    \r
   memset(fIndex, -1, AliTRDgeometry::kNdets*sizeof(Char_t));\r
   fN = 0;\r
@@ -121,7 +118,7 @@ AliTRDtrackingChamber* AliTRDtrackingSector::GetChamber(Int_t stack, Int_t layer
   \r
   Int_t ch = stack*AliTRDgeometry::kNlayer + layer;\r
   if(fIndex[ch] >= 0) return fChamber[Int_t(fIndex[ch])];\r
-  else if(!build) return 0x0;\r
+  else if(!build) return NULL;\r
   \r
   // CHAMBER HAS TO BE BUILD\r
   Int_t rch = ch;do rch--; while(rch>=0 && fIndex[rch]<0);\r
@@ -142,19 +139,19 @@ AliTRDtrackingChamber** AliTRDtrackingSector::GetStack(Int_t stack)
 // Return chamber at position (stack, plane) in current \r
 // sector or build a new one if it is not already created\r
   \r
-  if(stack<0 || stack>=AliTRDgeometry::kNstack) return 0x0;\r
+  if(stack<0 || stack>=AliTRDgeometry::kNstack) return NULL;\r
   \r
   Int_t ich, n = 0;\r
   for(int il=0; il<AliTRDgeometry::kNlayer; il++){\r
     ich = stack*AliTRDgeometry::kNlayer + il;\r
-    if(fIndex[ich] < 0) fStack[il] = 0x0; \r
+    if(fIndex[ich] < 0) fStack[il] = NULL; \r
     else{\r
       fStack[il] = fChamber[Int_t(fIndex[ich])];\r
       n++;\r
     }\r
   }\r
   \r
-  return n ? &fStack[0] : 0x0;\r
+  return n ? &fStack[0] : NULL;\r
 }\r
 \r
 //_____________________________________________________________________________\r