]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TRD/AliTRDclusterizer.cxx
Moveing AliNeutralTrackParam to STEERBase to avoid dependence of libAOD on libESD
[u/mrichter/AliRoot.git] / TRD / AliTRDclusterizer.cxx
index d9048864c7f7610dfc42be24ecbcb4b36b96d231..6611a8276d9c829a9e19b4914aa1d6276f506598 100644 (file)
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <TF1.h>
-#include <TTree.h>
-#include <TH1.h>
-#include <TFile.h>
 #include <TClonesArray.h>
 #include <TObjArray.h>
 
 #include "AliRunLoader.h"
 #include "AliLoader.h"
-#include "AliRawReader.h"
-#include "AliLog.h"
+#include "AliTreeLoader.h"
 #include "AliAlignObj.h"
 
 #include "AliTRDclusterizer.h"
 #include "AliTRDcluster.h"
 #include "AliTRDReconstructor.h"
 #include "AliTRDgeometry.h"
-#include "AliTRDarraySignal.h"
 #include "AliTRDarrayDictionary.h"
 #include "AliTRDarrayADC.h"
 #include "AliTRDdigitsManager.h"
+#include "AliTRDdigitsParam.h"
 #include "AliTRDrawData.h"
 #include "AliTRDcalibDB.h"
-#include "AliTRDrecoParam.h"
-#include "AliTRDCommonParam.h"
 #include "AliTRDtransform.h"
 #include "AliTRDSignalIndex.h"
 #include "AliTRDrawStreamBase.h"
 #include "AliTRDfeeParam.h"
+#include "AliTRDtrackletWord.h"
 
 #include "TTreeStream.h"
 
@@ -66,18 +60,16 @@ AliTRDclusterizer::AliTRDclusterizer(const AliTRDReconstructor *const rec)
   ,fRunLoader(NULL)
   ,fClusterTree(NULL)
   ,fRecPoints(NULL)
+  ,fTracklets(NULL)
   ,fTrackletTree(NULL)
-  ,fDigitsManager(new AliTRDdigitsManager(rec))
+  ,fDigitsManager(new AliTRDdigitsManager())
   ,fTrackletContainer(NULL)
-  ,fAddLabels(kTRUE)
   ,fRawVersion(2)
   ,fTransform(new AliTRDtransform(0))
-  ,fLUTbin(0)
-  ,fLUT(NULL)
-  ,fDigitsIn(NULL)
+  ,fDigits(NULL)
   ,fIndexes(NULL)
-  ,fADCthresh(0)
   ,fMaxThresh(0)
+  ,fMaxThreshTest(0)
   ,fSigThresh(0)
   ,fMinMaxCutSigma(0)
   ,fMinLeftRightCutSigma(0)
@@ -90,14 +82,20 @@ AliTRDclusterizer::AliTRDclusterizer(const AliTRDReconstructor *const rec)
   ,fCalGainFactorDetValue(0)
   ,fCalNoiseROC(NULL)
   ,fCalNoiseDetValue(0)
-  ,fDigitsOut(NULL)
+  ,fCalPadStatusROC(NULL)
   ,fClusterROC(0)
   ,firstClusterROC(0)
+  ,fNoOfClusters(0)
+  ,fBaseline(0)
+  ,fRawStream(NULL)
 {
   //
   // AliTRDclusterizer default constructor
   //
 
+  SetBit(kLabels, kTRUE);
+  SetBit(knewDM, kFALSE);
+
   AliTRDcalibDB *trd = 0x0;
   if (!(trd = AliTRDcalibDB::Instance())) {
     AliFatal("Could not get calibration object");
@@ -107,7 +105,7 @@ AliTRDclusterizer::AliTRDclusterizer(const AliTRDReconstructor *const rec)
 
   // Initialize debug stream
   if(fReconstructor){
-    if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kClusterizer) > 1){
+    if(fReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kClusterizer) > 1){
       TDirectory *savedir = gDirectory; 
       //fgGetDebugStream    = new TTreeSRedirector("TRD.ClusterizerDebug.root");
       savedir->cd();
@@ -123,18 +121,16 @@ AliTRDclusterizer::AliTRDclusterizer(const Text_t *name, const Text_t *title, co
   ,fRunLoader(NULL)
   ,fClusterTree(NULL)
   ,fRecPoints(NULL)
+  ,fTracklets(NULL)
   ,fTrackletTree(NULL)
-  ,fDigitsManager(new AliTRDdigitsManager(rec))
+  ,fDigitsManager(new AliTRDdigitsManager())
   ,fTrackletContainer(NULL)
-  ,fAddLabels(kTRUE)
   ,fRawVersion(2)
   ,fTransform(new AliTRDtransform(0))
-  ,fLUTbin(0)
-  ,fLUT(NULL)
-  ,fDigitsIn(NULL)
+  ,fDigits(NULL)
   ,fIndexes(NULL)
-  ,fADCthresh(0)
   ,fMaxThresh(0)
+  ,fMaxThreshTest(0)
   ,fSigThresh(0)
   ,fMinMaxCutSigma(0)
   ,fMinLeftRightCutSigma(0)
@@ -147,14 +143,20 @@ AliTRDclusterizer::AliTRDclusterizer(const Text_t *name, const Text_t *title, co
   ,fCalGainFactorDetValue(0)
   ,fCalNoiseROC(NULL)
   ,fCalNoiseDetValue(0)
-  ,fDigitsOut(NULL)
+  ,fCalPadStatusROC(NULL)
   ,fClusterROC(0)
   ,firstClusterROC(0)
+  ,fNoOfClusters(0)
+  ,fBaseline(0)
+  ,fRawStream(NULL)
 {
   //
   // AliTRDclusterizer constructor
   //
 
+  SetBit(kLabels, kTRUE);
+  SetBit(knewDM, kFALSE);
+
   AliTRDcalibDB *trd = 0x0;
   if (!(trd = AliTRDcalibDB::Instance())) {
     AliFatal("Could not get calibration object");
@@ -164,7 +166,7 @@ AliTRDclusterizer::AliTRDclusterizer(const Text_t *name, const Text_t *title, co
 
   fRawVersion = AliTRDfeeParam::Instance()->GetRAWversion();
 
-  FillLUT();
+  //FillLUT();
 
 }
 
@@ -175,18 +177,16 @@ AliTRDclusterizer::AliTRDclusterizer(const AliTRDclusterizer &c)
   ,fRunLoader(NULL)
   ,fClusterTree(NULL)
   ,fRecPoints(NULL)
+  ,fTracklets(NULL)
   ,fTrackletTree(NULL)
   ,fDigitsManager(NULL)
   ,fTrackletContainer(NULL)
-  ,fAddLabels(kTRUE)
   ,fRawVersion(2)
   ,fTransform(NULL)
-  ,fLUTbin(0)
-  ,fLUT(0)
-  ,fDigitsIn(NULL)
+  ,fDigits(NULL)
   ,fIndexes(NULL)
-  ,fADCthresh(0)
   ,fMaxThresh(0)
+  ,fMaxThreshTest(0)
   ,fSigThresh(0)
   ,fMinMaxCutSigma(0)
   ,fMinLeftRightCutSigma(0)
@@ -199,15 +199,21 @@ AliTRDclusterizer::AliTRDclusterizer(const AliTRDclusterizer &c)
   ,fCalGainFactorDetValue(0)
   ,fCalNoiseROC(NULL)
   ,fCalNoiseDetValue(0)
-  ,fDigitsOut(NULL)
+  ,fCalPadStatusROC(NULL)
   ,fClusterROC(0)
   ,firstClusterROC(0)
+  ,fNoOfClusters(0)
+  ,fBaseline(0)
+  ,fRawStream(NULL)
 {
   //
   // AliTRDclusterizer copy constructor
   //
 
-  FillLUT();
+  SetBit(kLabels, kTRUE);
+  SetBit(knewDM, kFALSE);
+
+  //FillLUT();
 
 }
 
@@ -223,29 +229,31 @@ AliTRDclusterizer::~AliTRDclusterizer()
     delete fRecPoints;
   }
 
+  if (fTracklets){
+    fTracklets->Delete();
+    delete fTracklets;
+  }
+
   if (fDigitsManager) {
     delete fDigitsManager;
     fDigitsManager = NULL;
   }
 
   if (fTrackletContainer){
-    delete fTrackletContainer;
+    delete [] fTrackletContainer[0];
+    delete [] fTrackletContainer[1];
+    delete [] fTrackletContainer;
     fTrackletContainer = NULL;
   }
 
   if (fTransform){
     delete fTransform;
-    fTransform     = NULL;
+    fTransform = NULL;
   }
 
-  if (fLUT) {
-    delete [] fLUT;
-    fLUT           = NULL;
-  }
-  
-  if (fDigitsOut) {
-    delete fDigitsOut;
-    fDigitsOut     = NULL;
+  if (fRawStream){
+    delete fRawStream;
+    fRawStream = NULL;
   }
 
 }
@@ -278,15 +286,12 @@ void AliTRDclusterizer::Copy(TObject &c) const
   ((AliTRDclusterizer &) c).fTrackletTree  = NULL;
   ((AliTRDclusterizer &) c).fDigitsManager = NULL;
   ((AliTRDclusterizer &) c).fTrackletContainer = NULL;
-  ((AliTRDclusterizer &) c).fAddLabels     = fAddLabels;
   ((AliTRDclusterizer &) c).fRawVersion    = fRawVersion;
   ((AliTRDclusterizer &) c).fTransform     = NULL;
-  ((AliTRDclusterizer &) c).fLUTbin        = 0;
-  ((AliTRDclusterizer &) c).fLUT           = NULL;
-  ((AliTRDclusterizer &) c).fDigitsIn      = NULL;
+  ((AliTRDclusterizer &) c).fDigits      = NULL;
   ((AliTRDclusterizer &) c).fIndexes       = NULL;
-  ((AliTRDclusterizer &) c).fADCthresh     = 0;
   ((AliTRDclusterizer &) c).fMaxThresh     = 0;
+  ((AliTRDclusterizer &) c).fMaxThreshTest = 0;
   ((AliTRDclusterizer &) c).fSigThresh     = 0;
   ((AliTRDclusterizer &) c).fMinMaxCutSigma= 0;
   ((AliTRDclusterizer &) c).fMinLeftRightCutSigma = 0;
@@ -299,10 +304,13 @@ void AliTRDclusterizer::Copy(TObject &c) const
   ((AliTRDclusterizer &) c).fCalGainFactorDetValue = 0;
   ((AliTRDclusterizer &) c).fCalNoiseROC   = NULL;
   ((AliTRDclusterizer &) c).fCalNoiseDetValue = 0;
-  ((AliTRDclusterizer &) c).fDigitsOut     = NULL;
+  ((AliTRDclusterizer &) c).fCalPadStatusROC = NULL;
   ((AliTRDclusterizer &) c).fClusterROC    = 0;
   ((AliTRDclusterizer &) c).firstClusterROC= 0;
-
+  ((AliTRDclusterizer &) c).fNoOfClusters  = 0;
+  ((AliTRDclusterizer &) c).fBaseline      = 0;
+  ((AliTRDclusterizer &) c).fRawStream     = NULL;
+  
 }
 
 //_____________________________________________________________________________
@@ -353,7 +361,7 @@ Bool_t AliTRDclusterizer::OpenOutput()
 }
 
 //_____________________________________________________________________________
-Bool_t AliTRDclusterizer::OpenOutput(TTree *clusterTree)
+Bool_t AliTRDclusterizer::OpenOutput(TTree *const clusterTree)
 {
   //
   // Connect the output tree
@@ -365,42 +373,7 @@ Bool_t AliTRDclusterizer::OpenOutput(TTree *clusterTree)
     fClusterTree = clusterTree;
     fClusterTree->Branch("TRDcluster", "TObjArray", &ioArray, 32000, 0);
   }
-
-  // tracklet writing
-  if (fReconstructor->IsWritingTracklets()){
-    TString evfoldname = AliConfig::GetDefaultEventFolderName();
-    fRunLoader         = AliRunLoader::GetRunLoader(evfoldname);
-
-    if (!fRunLoader) {
-      fRunLoader = AliRunLoader::Open("galice.root");
-    }
-    if (!fRunLoader) {
-      AliError(Form("Can not open session for file galice.root."));
-      return kFALSE;
-    }
-
-    UInt_t **leaves = new UInt_t *[2];
-    AliDataLoader *dl = fRunLoader->GetLoader("TRDLoader")->GetDataLoader("tracklets");
-    if (!dl) {
-      AliError("Could not get the tracklets data loader!");
-      dl = new AliDataLoader("TRD.Tracklets.root","tracklets", "tracklets");
-      fRunLoader->GetLoader("TRDLoader")->AddDataLoader(dl);
-    }
-    else {
-      fTrackletTree = dl->Tree();
-      if (!fTrackletTree)
-        {
-        dl->MakeTree();
-        fTrackletTree = dl->Tree();
-        }
-      TBranch *trkbranch = fTrackletTree->GetBranch("trkbranch");
-      if (!trkbranch)
-        fTrackletTree->Branch("trkbranch",leaves[0],"det/i:side/i:tracklets[256]/i");
-    }
-  }
-
   return kTRUE;
-
 }
 
 //_____________________________________________________________________________
@@ -445,23 +418,29 @@ Bool_t AliTRDclusterizer::WriteClusters(Int_t det)
       ioArray->AddLast(c);
     }
     fClusterTree->Fill();
+    ioArray->Clear();
   } else {
-    
-    Int_t detOld = -1;
+    Int_t detOld = -1, nw(0);
     for (Int_t i = 0; i < nRecPoints; i++) {
       AliTRDcluster *c = (AliTRDcluster *) RecPoints()->UncheckedAt(i);
       if(c->GetDetector() != detOld){
+        nw += ioArray->GetEntriesFast();
         fClusterTree->Fill();
         ioArray->Clear();
         detOld = c->GetDetector();
       } 
       ioArray->AddLast(c);
     }
+    if(ioArray->GetEntriesFast()){
+      nw += ioArray->GetEntriesFast();
+      fClusterTree->Fill();
+      ioArray->Clear();
+    }
+    AliDebug(2, Form("Clusters FOUND[%d] WRITTEN[%d] STATUS[%s]", nRecPoints, nw, nw==nRecPoints?"OK":"FAILED"));
   }
   delete ioArray;
 
   return kTRUE;  
-
 }
 
 //_____________________________________________________________________________
@@ -497,8 +476,8 @@ Bool_t AliTRDclusterizer::WriteTracklets(Int_t det)
     }
   }
 
-  AliDataLoader *dl = fRunLoader->GetLoader("TRDLoader")->GetDataLoader("tracklets");
-  dl->WriteData("OVERWRITE");
+//  AliDataLoader *dl = fRunLoader->GetLoader("TRDLoader")->GetDataLoader("tracklets"); //jkl: wrong here
+//  dl->WriteData("OVERWRITE"); //jkl: wrong here
   //dl->Unload();
   delete [] leaves;
 
@@ -562,8 +541,8 @@ Bool_t AliTRDclusterizer::MakeClusters()
   //
 
   // Propagate info from the digits manager
-  if (fAddLabels == kTRUE){
-    fAddLabels = fDigitsManager->UsesDictionaries();
+  if (TestBit(kLabels)){
+    SetBit(kLabels, fDigitsManager->UsesDictionaries());
   }
   
   Bool_t fReturn = kTRUE;
@@ -581,7 +560,7 @@ Bool_t AliTRDclusterizer::MakeClusters()
   
     Bool_t fR = kFALSE;
     if (indexes->HasEntry()){
-      if (fAddLabels){
+      if (TestBit(kLabels)){
         for (Int_t iDict = 0; iDict < AliTRDdigitsManager::kNDict; iDict++){
           AliTRDarrayDictionary *tracksIn = 0; //mod
           tracksIn = (AliTRDarrayDictionary *) fDigitsManager->GetDictionary(i,iDict);  //mod
@@ -597,10 +576,8 @@ Bool_t AliTRDclusterizer::MakeClusters()
     //  ResetRecPoints();
     //}
         
-    // No compress just remove
-    fDigitsManager->RemoveDigits(i);
-    fDigitsManager->RemoveDictionaries(i);      
-    fDigitsManager->ClearIndexes(i);  
+    // Clear arrays of this chamber, to prepare for next event
+    fDigitsManager->ClearArrays(i);
   }
   
   if(fReconstructor->IsWritingClusters()) WriteClusters(-1);
@@ -631,39 +608,77 @@ Bool_t AliTRDclusterizer::Raw2ClustersChamber(AliRawReader *rawReader)
 
   // Create the digits manager
   if (!fDigitsManager){
-    fDigitsManager = new AliTRDdigitsManager(fReconstructor);
+    SetBit(knewDM, kTRUE);
+    fDigitsManager = new AliTRDdigitsManager(kTRUE);
     fDigitsManager->CreateArrays();
   }
 
-  fDigitsManager->SetUseDictionaries(fAddLabels);
+  fDigitsManager->SetUseDictionaries(TestBit(kLabels));
+
+  // ----- preparing tracklet output -----
+  if (fReconstructor->IsWritingTracklets()) {
+    AliDataLoader *trklLoader = AliRunLoader::Instance()->GetLoader("TRDLoader")->GetDataLoader("tracklets");
+    if (!trklLoader) {
+      //AliInfo("Could not get the tracklets data loader, adding it now!");
+      trklLoader = new AliDataLoader("TRD.Tracklets.root","tracklets", "tracklets");
+      AliRunLoader::Instance()->GetLoader("TRDLoader")->AddDataLoader(trklLoader);
+    }
+    AliTreeLoader *trklTreeLoader = dynamic_cast<AliTreeLoader*> (trklLoader->GetBaseLoader("tracklets-raw"));
+    if (!trklTreeLoader) {
+      trklTreeLoader = new AliTreeLoader("tracklets-raw", trklLoader);
+      trklLoader->AddBaseLoader(trklTreeLoader);
+    }
+    if (!trklTreeLoader->Tree())
+      trklTreeLoader->MakeTree();
+  }
 
   // tracklet container for raw tracklet writing
-  if (!fTrackletContainer && fReconstructor->IsWritingTracklets()) {
+  if (!fTrackletContainer && ( fReconstructor->IsWritingTracklets() || fReconstructor->IsProcessingTracklets() )) {
     // maximum tracklets for one HC
     const Int_t kTrackletChmb=256;
     fTrackletContainer = new UInt_t *[2];
     fTrackletContainer[0] = new UInt_t[kTrackletChmb]; 
     fTrackletContainer[1] = new UInt_t[kTrackletChmb]; 
+    memset(fTrackletContainer[0], 0, kTrackletChmb*sizeof(UInt_t)); //jkl
+    memset(fTrackletContainer[1], 0, kTrackletChmb*sizeof(UInt_t)); //jkl
   }
 
-  AliTRDrawStreamBase *input = AliTRDrawStreamBase::GetRawStream(rawReader);
+  if(!fRawStream)
+    fRawStream = AliTRDrawStreamBase::GetRawStream(rawReader);
+  else
+    fRawStream->SetReader(rawReader);
+
+  SetBit(kHLT, fReconstructor->IsHLT());
+
+  if(TestBit(kHLT)){
+    fRawStream->SetSharedPadReadout(kFALSE);
+    fRawStream->SetNoErrorWarning();
+  }
 
-  AliInfo(Form("Stream version: %s", input->IsA()->GetName()));
+  AliDebug(1,Form("Stream version: %s", fRawStream->IsA()->GetName()));
   
   Int_t det    = 0;
-  while ((det = input->NextChamber(fDigitsManager,fTrackletContainer)) >= 0){
-    Bool_t iclusterBranch = kFALSE;
-    if (fDigitsManager->GetIndexes(det)->HasEntry()){
-      iclusterBranch = MakeClusters(det);
-    }
+  while ((det = fRawStream->NextChamber(fDigitsManager,fTrackletContainer)) >= 0){
+    if (fDigitsManager->GetIndexes(det)->HasEntry())
+      MakeClusters(det);
+
+    fDigitsManager->ClearArrays(det);
 
-    fDigitsManager->ResetArrays(det);
-    
     if (!fReconstructor->IsWritingTracklets()) continue;
     if (*(fTrackletContainer[0]) > 0 || *(fTrackletContainer[1]) > 0) WriteTracklets(det);
   }
   
-  if (fReconstructor->IsWritingTracklets()){
+  if (fReconstructor->IsWritingTracklets()) {
+    if (AliDataLoader *trklLoader = AliRunLoader::Instance()->GetLoader("TRDLoader")->GetDataLoader("tracklets")) {
+      if (trklLoader) {
+       if (AliTreeLoader *trklTreeLoader = (AliTreeLoader*) trklLoader->GetBaseLoader("tracklets-raw"))
+         trklTreeLoader->WriteData("OVERWRITE");
+       trklLoader->UnloadAll();
+      }
+    }
+  }
+
+  if (fTrackletContainer){
     delete [] fTrackletContainer[0];
     delete [] fTrackletContainer[1];
     delete [] fTrackletContainer;
@@ -672,13 +687,14 @@ Bool_t AliTRDclusterizer::Raw2ClustersChamber(AliRawReader *rawReader)
 
   if(fReconstructor->IsWritingClusters()) WriteClusters(-1);
 
-  delete fDigitsManager;
-  fDigitsManager = NULL;
-
-  delete input;
-  input = NULL;
+  if(!TestBit(knewDM)){
+    delete fDigitsManager;
+    fDigitsManager = NULL;
+    delete fRawStream;
+    fRawStream = NULL;
+  }
 
-  AliInfo(Form("Number of found clusters : %d", RecPoints()->GetEntriesFast())); 
+  AliInfo(Form("Number of found clusters : %d", fNoOfClusters)); 
   return kTRUE;
 
 }
@@ -705,7 +721,7 @@ UChar_t AliTRDclusterizer::GetStatus(Short_t &signal)
 }
 
 //_____________________________________________________________________________
-void AliTRDclusterizer::SetPadStatus(const UChar_t status, UChar_t &out){
+void AliTRDclusterizer::SetPadStatus(const UChar_t status, UChar_t &out) const {
   //
   // Set the pad status into out
   // First three bits are needed for the position encoding
@@ -737,43 +753,37 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det)
   //
 
   // Get the digits
-  //   digits should be expanded beforehand! 
-  //   digitsIn->Expand();
-  fDigitsIn = (AliTRDarrayADC *) fDigitsManager->GetDigits(det); //mod     
+  fDigits = (AliTRDarrayADC *) fDigitsManager->GetDigits(det); //mod
+  fBaseline = fDigitsManager->GetDigitsParam()->GetADCbaseline(det);
   
   // This is to take care of switched off super modules
-  if (!fDigitsIn->HasData()) 
-    {
-      return kFALSE;
-    }
+  if (!fDigits->HasData()) return kFALSE;
 
   fIndexes = fDigitsManager->GetIndexes(det);
-  if (fIndexes->IsAllocated() == kFALSE)
-    {
-      AliError("Indexes do not exist!");
-      return kFALSE;      
-    }
-
-  AliTRDcalibDB  *calibration = AliTRDcalibDB::Instance();
-  if (!calibration) 
-    {
-      AliFatal("No AliTRDcalibDB instance available\n");
-      return kFALSE;  
-    }
+  if (fIndexes->IsAllocated() == kFALSE) {
+    AliError("Indexes do not exist!");
+    return kFALSE;      
+  }
 
-  fADCthresh = 0; 
+  AliTRDcalibDB* const calibration = AliTRDcalibDB::Instance();
+  if (!calibration) {
+    AliFatal("No AliTRDcalibDB instance available\n");
+    return kFALSE;  
+  }
 
   if (!fReconstructor){
     AliError("Reconstructor not set\n");
     return kFALSE;
   }
 
-  TTreeSRedirector *fDebugStream = fReconstructor->GetDebugStream(AliTRDReconstructor::kClusterizer);
+  const AliTRDrecoParam *const recoParam = fReconstructor->GetRecoParam();
 
-  fMaxThresh            = fReconstructor->GetRecoParam()->GetClusMaxThresh();
-  fSigThresh            = fReconstructor->GetRecoParam()->GetClusSigThresh();
-  fMinMaxCutSigma       = fReconstructor->GetRecoParam()->GetMinMaxCutSigma();
-  fMinLeftRightCutSigma = fReconstructor->GetRecoParam()->GetMinLeftRightCutSigma();
+  fMaxThresh            = (Short_t)recoParam->GetClusMaxThresh();
+  fMaxThreshTest        = (Short_t)(recoParam->GetClusMaxThresh()/2+fBaseline);
+  fSigThresh            = (Short_t)recoParam->GetClusSigThresh();
+  fMinMaxCutSigma       = recoParam->GetMinMaxCutSigma();
+  fMinLeftRightCutSigma = recoParam->GetMinLeftRightCutSigma();
+  const Int_t iEveryNTB = recoParam->GetRecEveryNTB();
 
   Int_t istack  = fIndexes->GetStack();
   fLayer  = fIndexes->GetLayer();
@@ -787,6 +797,8 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det)
     return kFALSE;
   }
 
+  AliDebug(2, Form("Det[%d] @ Sec[%d] Stk[%d] Ly[%d]", fDet, isector, istack, fLayer));
+
   // TRD space point transformation
   fTransform->SetDetector(det);
 
@@ -794,9 +806,35 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det)
   Int_t    iGeoModule = istack + AliTRDgeometry::Nstack() * isector;
   fVolid      = AliGeomManager::LayerToVolUID(iGeoLayer,iGeoModule); 
 
-  fColMax    = fDigitsIn->GetNcol();
-  Int_t nRowMax    = fDigitsIn->GetNrow();
-  fTimeTotal = fDigitsIn->GetNtime();
+  if(fReconstructor->IsProcessingTracklets() && fTrackletContainer)
+    AddTrackletsToArray();
+
+  fColMax    = fDigits->GetNcol();
+  fTimeTotal = fDigitsManager->GetDigitsParam()->GetNTimeBins(det);
+
+  // Check consistency between OCDB and raw data
+  Int_t nTimeOCDB = calibration->GetNumberOfTimeBinsDCS();
+  if(TestBit(kHLT)){
+    if((nTimeOCDB > -1) && (fTimeTotal != nTimeOCDB)){
+      AliWarning(Form("Number of timebins does not match OCDB value (RAW[%d] OCDB[%d]), using raw value"
+                     ,fTimeTotal,nTimeOCDB));
+    }
+  }else{
+    if(nTimeOCDB == -1){
+      AliWarning("Undefined number of timebins in OCDB, using value from raw data.");
+      if(!fTimeTotal>0){
+       AliError("Number of timebins in raw data is negative, skipping chamber!");
+       return kFALSE;
+      }
+    }else if(nTimeOCDB == -2){
+      AliError("Mixed number of timebins in OCDB, no reconstruction of TRD data!"); 
+      return kFALSE;
+    }else if(fTimeTotal != nTimeOCDB){
+      AliError(Form("Number of timebins in raw data does not match OCDB value (RAW[%d] OCDB[%d]), skipping chamber!"
+                   ,fTimeTotal,nTimeOCDB));
+      return kFALSE;
+    }
+  }
 
   // Detector wise calibration object for the gain factors
   const AliTRDCalDet *calGainFactorDet = calibration->GetGainFactorDet();
@@ -811,113 +849,107 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det)
   fCalNoiseROC           = calibration->GetNoiseROC(fDet);
   // Calibration value for chamber wise noise
   fCalNoiseDetValue      = calNoiseDet->GetValue(fDet);
-
-  if(fDigitsOut) delete fDigitsOut;
-  fDigitsOut = new AliTRDarraySignal(nRowMax, fColMax, fTimeTotal);
   
+  // Calibration object with the pad status
+  fCalPadStatusROC       = calibration->GetPadStatusROC(fDet);
+
   firstClusterROC = -1;
   fClusterROC     =  0;
 
+  SetBit(kLUT, recoParam->UseLUT());
+  SetBit(kGAUS, recoParam->UseGAUS());
+
   // Apply the gain and the tail cancelation via digital filter
-  TailCancelation();   
+  if(recoParam->UseTailCancelation()) TailCancelation(recoParam);
 
   MaxStruct curr, last;
-  last.Row = -1;
   Int_t nMaximas = 0, nCorrupted = 0;
-  Float_t Ratio = 1;
 
   // Here the clusterfining is happening
   
-  for(curr.Time = 0; curr.Time < fTimeTotal; curr.Time++)
-    while(fIndexes->NextRCIndex(curr.Row, curr.Col))
-      if(IsMaximum(curr, curr.padStatus, &curr.Signals[0]))
-       {
-         if(last.Row>-1)
-           {
-             last.Signals[0] *= Ratio;
-             if(curr.Row==last.Row && curr.Col==last.Col+2)
-               {
-                 if(IsFivePadCluster(last, curr, Ratio))
-                   {
-                     last.Signals[2] *= Ratio;
-                     Ratio = 1 - Ratio;
-                   }else Ratio = 1;
-               }else Ratio = 1;
-             CreateCluster(last);
-           }
-         last=curr;
-       }
-  if(last.Row>-1)
-    {
-      last.Signals[0] *= Ratio;
-      CreateCluster(last);
+  for(curr.time = 0; curr.time < fTimeTotal; curr.time+=iEveryNTB){
+    while(fIndexes->NextRCIndex(curr.row, curr.col)){
+      if(fDigits->GetData(curr.row, curr.col, curr.time) > fMaxThreshTest && IsMaximum(curr, curr.padStatus, &curr.signals[0])){
+        if(last.row>-1){
+          if(curr.time==last.time && curr.row==last.row && curr.col==last.col+2) FivePadCluster(last, curr);
+          CreateCluster(last);
+        }
+        last=curr; curr.fivePad=kFALSE;
+      }
     }
-
-  if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kClusterizer) > 2){
-    (*fDebugStream) << "MakeClusters"
-                   << "Detector="   << det
-                   << "NMaxima="    << nMaximas
-                   << "NClusters="  << fClusterROC
-                   << "NCorrupted=" << nCorrupted
-                   << "\n";
   }
+  if(last.row>-1) CreateCluster(last);
 
-  if (fAddLabels) {
-    AddLabels(fDet,firstClusterROC,fClusterROC);
+  if(recoParam->GetStreamLevel(AliTRDrecoParam::kClusterizer) > 2 && fReconstructor->IsDebugStreaming()){
+    TTreeSRedirector* fDebugStream = fReconstructor->GetDebugStream(AliTRDrecoParam::kClusterizer);
+    (*fDebugStream) << "MakeClusters"
+      << "Detector="   << det
+      << "NMaxima="    << nMaximas
+      << "NClusters="  << fClusterROC
+      << "NCorrupted=" << nCorrupted
+      << "\n";
   }
+  if (TestBit(kLabels)) AddLabels();
 
   return kTRUE;
 
 }
 
 //_____________________________________________________________________________
-Bool_t AliTRDclusterizer::IsMaximum(const MaxStruct &Max, UChar_t &padStatus, Float_t *const Signals) 
+Bool_t AliTRDclusterizer::IsMaximum(const MaxStruct &Max, UChar_t &padStatus, Short_t *const Signals) 
 {
   //
   // Returns true if this row,col,time combination is a maximum. 
   // Gives back the padStatus and the signals of the center pad and the two neighbouring pads.
   //
 
-  Signals[1] = fDigitsOut->GetData(Max.Row, Max.Col, Max.Time);
-  if(Signals[1] < fMaxThresh) return kFALSE;
+  Float_t gain = fCalGainFactorDetValue * fCalGainFactorROC->GetValue(Max.col,Max.row);
+  Signals[1] = (Short_t)((fDigits->GetData(Max.row, Max.col, Max.time) - fBaseline) / gain + 0.5f);
+  if(Signals[1] <= fMaxThresh) return kFALSE;
 
-  Float_t  noiseMiddleThresh = fMinMaxCutSigma*fCalNoiseDetValue*fCalNoiseROC->GetValue(Max.Col, Max.Row);
-  if (Signals[1] < noiseMiddleThresh) return kFALSE;
+  Short_t noiseMiddleThresh = (Short_t)(fMinMaxCutSigma*fCalNoiseDetValue*fCalNoiseROC->GetValue(Max.col, Max.row));
+  if (Signals[1] <= noiseMiddleThresh) return kFALSE;
 
-  if (Max.Col + 1 >= fColMax || Max.Col < 1) return kFALSE;
+  if (Max.col + 1 >= fColMax || Max.col < 1) return kFALSE;
 
-  UChar_t status[3]={fDigitsIn->GetPadStatus(Max.Row, Max.Col-1, Max.Time), 
-                    fDigitsIn->GetPadStatus(Max.Row, Max.Col,   Max.Time), 
-                    fDigitsIn->GetPadStatus(Max.Row, Max.Col+1, Max.Time)};
+  UChar_t status[3]={
+    fCalPadStatusROC->GetStatus(Max.col-1, Max.row)
+   ,fCalPadStatusROC->GetStatus(Max.col,   Max.row)
+   ,fCalPadStatusROC->GetStatus(Max.col+1, Max.row)
+  };
 
-  Signals[0] = fDigitsOut->GetData(Max.Row, Max.Col-1, Max.Time);
-  Signals[2] = fDigitsOut->GetData(Max.Row, Max.Col+1, Max.Time);  
+  gain = fCalGainFactorDetValue * fCalGainFactorROC->GetValue(Max.col-1,Max.row);
+  Signals[0] = (Short_t)((fDigits->GetData(Max.row, Max.col-1, Max.time) - fBaseline) / gain + 0.5f);
+  gain = fCalGainFactorDetValue * fCalGainFactorROC->GetValue(Max.col+1,Max.row);
+  Signals[2] = (Short_t)((fDigits->GetData(Max.row, Max.col+1, Max.time) - fBaseline) / gain + 0.5f);
 
   if(!(status[0] | status[1] | status[2])) {//all pads are good
     if ((Signals[2] <= Signals[1]) && (Signals[0] <  Signals[1])) {
-      if ((Signals[2] >= fSigThresh) || (Signals[0] >= fSigThresh)) {
-       Float_t  noiseSumThresh = fMinLeftRightCutSigma
-         * fCalNoiseDetValue
-         * fCalNoiseROC->GetValue(Max.Col, Max.Row);
-       if ((Signals[2]+Signals[0]+Signals[1]) < noiseSumThresh) return kFALSE;
-       padStatus = 0;
-       return kTRUE;
+      if ((Signals[2] > fSigThresh) || (Signals[0] > fSigThresh)) {
+       if(Signals[0]<0)Signals[0]=0;
+       if(Signals[2]<0)Signals[2]=0;
+        Short_t noiseSumThresh = (Short_t)(fMinLeftRightCutSigma * fCalNoiseDetValue
+                                          * fCalNoiseROC->GetValue(Max.col, Max.row));
+        if ((Signals[2]+Signals[0]+Signals[1]) <= noiseSumThresh) return kFALSE;
+        padStatus = 0;
+        return kTRUE;
       }
     }
-  }
-  else { // at least one of the pads is bad, and reject candidates with more than 1 problematic pad
-    if (status[2] && (!(status[0] || status[1])) && Signals[1] > Signals[0] && Signals[0] >= fSigThresh) { 
-      fDigitsOut->SetData(Max.Row, Max.Col+1, Max.Time, 0.);
+  } else { // at least one of the pads is bad, and reject candidates with more than 1 problematic pad
+    if(Signals[0]<0)Signals[0]=0;
+    if(Signals[2]<0)Signals[2]=0;
+    if (status[2] && (!(status[0] || status[1])) && Signals[1] > Signals[0] && Signals[0] > fSigThresh) { 
+      Signals[2]=0;
       SetPadStatus(status[2], padStatus);
       return kTRUE;
     } 
-    else if (status[0] && (!(status[1] || status[2])) && Signals[1] >= Signals[2] && Signals[2] >= fSigThresh) {
-      fDigitsOut->SetData(Max.Row, Max.Col-1, Max.Time, 0.);
+    else if (status[0] && (!(status[1] || status[2])) && Signals[1] >= Signals[2] && Signals[2] > fSigThresh) {
+      Signals[0]=0;
       SetPadStatus(status[0], padStatus);
       return kTRUE;
     }
-    else if (status[1] && (!(status[0] || status[2])) && ((Signals[2] >= fSigThresh) || (Signals[0] >= fSigThresh))) {
-      fDigitsOut->SetData(Max.Row, Max.Col, Max.Time, fMaxThresh);
+    else if (status[1] && (!(status[0] || status[2])) && ((Signals[2] > fSigThresh) || (Signals[0] > fSigThresh))) {
+      Signals[1] = fMaxThresh;
       SetPadStatus(status[1], padStatus);
       return kTRUE;
     }
@@ -926,174 +958,162 @@ Bool_t AliTRDclusterizer::IsMaximum(const MaxStruct &Max, UChar_t &padStatus, Fl
 }
 
 //_____________________________________________________________________________
-Bool_t AliTRDclusterizer::IsFivePadCluster(const MaxStruct &ThisMax, const MaxStruct &NeighbourMax, Float_t &ratio)
+Bool_t AliTRDclusterizer::FivePadCluster(MaxStruct &ThisMax, MaxStruct &NeighbourMax)
 {
   //
   // Look for 5 pad cluster with minimum in the middle
   // Gives back the ratio
   //
-
-  if (ThisMax.Col >= fColMax - 3) return kFALSE;
-  if (ThisMax.Col < fColMax - 5){
-    if (fDigitsOut->GetData(ThisMax.Row, ThisMax.Col+4, ThisMax.Time) >= fSigThresh)
+  
+  if (ThisMax.col >= fColMax - 3) return kFALSE;
+  Float_t gain;
+  if (ThisMax.col < fColMax - 5){
+    gain = fCalGainFactorDetValue * fCalGainFactorROC->GetValue(ThisMax.col+4,ThisMax.row);
+    if (fDigits->GetData(ThisMax.row, ThisMax.col+4, ThisMax.time) - fBaseline >= fSigThresh * gain)
       return kFALSE;
   }
-  if (ThisMax.Col > 1) {
-    if (fDigitsOut->GetData(ThisMax.Row, ThisMax.Col-2, ThisMax.Time) >= fSigThresh)
+  if (ThisMax.col > 1) {
+    gain = fCalGainFactorDetValue * fCalGainFactorROC->GetValue(ThisMax.col-2,ThisMax.row);
+    if (fDigits->GetData(ThisMax.row, ThisMax.col-2, ThisMax.time) - fBaseline >= fSigThresh * gain)
       return kFALSE;
   }
   
-  //if (fSignalsThisMax[1] >= 0){ //TR: mod
-  
   const Float_t kEpsilon = 0.01;
-  Double_t padSignal[5] = {ThisMax.Signals[0], ThisMax.Signals[1], ThisMax.Signals[2],
-                          NeighbourMax.Signals[1], NeighbourMax.Signals[2]};
+  Double_t padSignal[5] = {ThisMax.signals[0], ThisMax.signals[1], ThisMax.signals[2],
+      NeighbourMax.signals[1], NeighbourMax.signals[2]};
   
   // Unfold the two maxima and set the signal on 
   // the overlapping pad to the ratio
-  ratio = Unfold(kEpsilon,fLayer,padSignal);
+  Float_t ratio = Unfold(kEpsilon,fLayer,padSignal);
+  ThisMax.signals[2] = (Short_t)(ThisMax.signals[2]*ratio + 0.5f);
+  NeighbourMax.signals[0] = (Short_t)(NeighbourMax.signals[0]*(1-ratio) + 0.5f);
+  ThisMax.fivePad=kTRUE;
+  NeighbourMax.fivePad=kTRUE;
   return kTRUE;
+
 }
 
 //_____________________________________________________________________________
 void AliTRDclusterizer::CreateCluster(const MaxStruct &Max)
 {
   //
-  // Creates a cluster at the given position and saves it in fRecPoint
-  //
-
-  const Int_t kNsig = 5;
-  Double_t padSignal[kNsig];
-
-  // The position of the cluster in COL direction relative to the center pad (pad units)
-  Double_t clusterPosCol = 0.0;
-  if (fReconstructor->GetRecoParam()->IsLUT()) {
-    // Calculate the position of the cluster by using the
-    // lookup table method
-    clusterPosCol = LUTposition(fLayer,Max.Signals[0]
-                               ,Max.Signals[1]
-                               ,Max.Signals[2]);
-  } 
-  else {
-    // Calculate the position of the cluster by using the
-    // center of gravity method
-    padSignal[1] = Max.Signals[0];
-    padSignal[2] = Max.Signals[1];
-    padSignal[3] = Max.Signals[2];
-    if(Max.Col > 2){
-      padSignal[0] = fDigitsOut->GetData(Max.Row, Max.Col-2, Max.Time);
-      if(padSignal[0]>= padSignal[1])
-       padSignal[0] = 0;
-    }
-    if(Max.Col < fColMax - 3){
-      padSignal[4] = fDigitsOut->GetData(Max.Row, Max.Col+2, Max.Time);
-      if(padSignal[4]>= padSignal[3])
-       padSignal[4] = 0;
-    }
-    clusterPosCol = GetCOG(padSignal);
-  }
+  // Creates a cluster at the given position and saves it in fRecPoints
+  //
 
-  // Count the number of pads in the cluster
   Int_t nPadCount = 1;
+  Short_t signals[7] = { 0, 0, Max.signals[0], Max.signals[1], Max.signals[2], 0, 0 };
+  if(!TestBit(kHLT)) CalcAdditionalInfo(Max, signals, nPadCount);
+
+  AliTRDcluster cluster(fDet, ((UChar_t) Max.col), ((UChar_t) Max.row), ((UChar_t) Max.time), signals, fVolid);
+  cluster.SetNPads(nPadCount);
+  if(TestBit(kLUT)) cluster.SetRPhiMethod(AliTRDcluster::kLUT);
+  else if(TestBit(kGAUS)) cluster.SetRPhiMethod(AliTRDcluster::kGAUS);
+  else cluster.SetRPhiMethod(AliTRDcluster::kCOG);
+
+  cluster.SetFivePad(Max.fivePad);
+  // set pads status for the cluster
+  UChar_t maskPosition = GetCorruption(Max.padStatus);
+  if (maskPosition) { 
+    cluster.SetPadMaskedPosition(maskPosition);
+    cluster.SetPadMaskedStatus(GetPadStatus(Max.padStatus));
+  }
+
+  // Transform the local cluster coordinates into calibrated 
+  // space point positions defined in the local tracking system.
+  // Here the calibration for T0, Vdrift and ExB is applied as well.
+  if(!fTransform->Transform(&cluster)) return;
+  // Temporarily store the Max.Row, column and time bin of the center pad
+  // Used to later on assign the track indices
+  cluster.SetLabel(Max.row, 0);
+  cluster.SetLabel(Max.col, 1);
+  cluster.SetLabel(Max.time,2);
+
+  //needed for HLT reconstruction
+  AddClusterToArray(&cluster);
+
+  // Store the index of the first cluster in the current ROC
+  if (firstClusterROC < 0) firstClusterROC = fNoOfClusters;
+  
+  fNoOfClusters++;
+  fClusterROC++;
+}
+
+//_____________________________________________________________________________
+void AliTRDclusterizer::CalcAdditionalInfo(const MaxStruct &Max, Short_t *const signals, Int_t &nPadCount)
+{
   // Look to the right
   Int_t ii = 1;
-  while (fDigitsOut->GetData(Max.Row, Max.Col-ii, Max.Time) >= fSigThresh) {
+  while (fDigits->GetData(Max.row, Max.col-ii, Max.time) >= fSigThresh) {
     nPadCount++;
     ii++;
-    if (Max.Col < ii) break;
+    if (Max.col < ii) break;
   }
   // Look to the left
   ii = 1;
-  while (fDigitsOut->GetData(Max.Row, Max.Col+ii, Max.Time) >= fSigThresh) {
+  while (fDigits->GetData(Max.row, Max.col+ii, Max.time) >= fSigThresh) {
     nPadCount++;
     ii++;
-    if (Max.Col+ii >= fColMax) break;
+    if (Max.col+ii >= fColMax) break;
   }
 
   // Store the amplitudes of the pads in the cluster for later analysis
   // and check whether one of these pads is masked in the database
-  Short_t signals[7] = { 0, 0, TMath::Nint(Max.Signals[0]),
-                              TMath::Nint(Max.Signals[1]), 
-                              TMath::Nint(Max.Signals[2]), 0, 0 };
+  signals[2]=Max.signals[0];
+  signals[3]=Max.signals[1];
+  signals[4]=Max.signals[2];
+  Float_t gain;
   for(Int_t i = 0; i<2; i++)
     {
-      if(Max.Col+i >= 3)
-       signals[i] = TMath::Nint(fDigitsOut->GetData(Max.Row, Max.Col-3+i, Max.Time));
-      if(Max.Col+3-i < fColMax)
-       signals[6-i] = TMath::Nint(fDigitsOut->GetData(Max.Row, Max.Col+3-i, Max.Time));
+      if(Max.col+i >= 3){
+       gain = fCalGainFactorDetValue * fCalGainFactorROC->GetValue(Max.col-3+i,Max.row);
+       signals[i] = (Short_t)((fDigits->GetData(Max.row, Max.col-3+i, Max.time) - fBaseline) / gain + 0.5f);
+      }
+      if(Max.col+3-i < fColMax){
+       gain = fCalGainFactorDetValue * fCalGainFactorROC->GetValue(Max.col+3-i,Max.row);
+       signals[6-i] = (Short_t)((fDigits->GetData(Max.row, Max.col+3-i, Max.time) - fBaseline) / gain + 0.5f);
+      }
     }
   /*for (Int_t jPad = Max.Col-3; jPad <= Max.Col+3; jPad++) {
     if ((jPad >= 0) && (jPad < fColMax))
-      signals[jPad-Max.Col+3] = TMath::Nint(fDigitsOut->GetData(Max.Row,jPad,Max.Time));
+      signals[jPad-Max.Col+3] = TMath::Nint(fDigits->GetData(Max.Row,jPad,Max.Time));
       }*/
+}
 
-  // Transform the local cluster coordinates into calibrated 
-  // space point positions defined in the local tracking system.
-  // Here the calibration for T0, Vdrift and ExB is applied as well.
-  Double_t clusterXYZ[6];
-  clusterXYZ[0] = clusterPosCol;
-  clusterXYZ[1] = Max.Signals[2];
-  clusterXYZ[2] = Max.Signals[1];
-  clusterXYZ[3] = Max.Signals[0];
-  clusterXYZ[4] = 0.0;
-  clusterXYZ[5] = 0.0;
-  Int_t    clusterRCT[3];
-  clusterRCT[0] = Max.Row;
-  clusterRCT[1] = Max.Col;
-  clusterRCT[2] = 0;
-
-  Bool_t out = kTRUE;
-  if (fTransform->Transform(clusterXYZ,clusterRCT,((UInt_t) Max.Time),out,0)) {
-
-    // Add the cluster to the output array
-    // The track indices will be stored later 
-    Float_t clusterPos[3];
-    clusterPos[0] = clusterXYZ[0];
-    clusterPos[1] = clusterXYZ[1];
-    clusterPos[2] = clusterXYZ[2];
-    Float_t clusterSig[2];
-    clusterSig[0] = clusterXYZ[4];
-    clusterSig[1] = clusterXYZ[5];
-    Double_t clusterCharge  = clusterXYZ[3];
-    Char_t   clusterTimeBin = ((Char_t) clusterRCT[2]);
-
-    Int_t n = RecPoints()->GetEntriesFast();
-    AliTRDcluster *cluster = new((*RecPoints())[n]) AliTRDcluster(
-                                                                 fDet,
-                                                                 clusterCharge, clusterPos, clusterSig,
-                                                                 0x0,
-                                                                 ((Char_t) nPadCount),
-                                                                 signals,
-                                                                 ((UChar_t) Max.Col), ((UChar_t) Max.Row), ((UChar_t) Max.Time),
-                                                                 clusterTimeBin, clusterPosCol,
-                                                                 fVolid);
-    cluster->SetInChamber(!out);
-
-    UChar_t maskPosition = GetCorruption(Max.padStatus);
-    if (maskPosition) { 
-      cluster->SetPadMaskedPosition(maskPosition);
-      cluster->SetPadMaskedStatus(GetPadStatus(Max.padStatus));
-    }
-
-    // Temporarily store the Max.Row, column and time bin of the center pad
-    // Used to later on assign the track indices
-    cluster->SetLabel(Max.Row, 0);
-    cluster->SetLabel(Max.Col, 1);
-    cluster->SetLabel(Max.Time,2);
+//_____________________________________________________________________________
+void AliTRDclusterizer::AddClusterToArray(AliTRDcluster* cluster)
+{
+  //
+  // Add a cluster to the array
+  //
 
-    // Store the index of the first cluster in the current ROC
-    if (firstClusterROC < 0) {
-      firstClusterROC = RecPoints()->GetEntriesFast() - 1;
-    }
+  Int_t n = RecPoints()->GetEntriesFast();
+  if(n!=fNoOfClusters)AliError(Form("fNoOfClusters != RecPoints()->GetEntriesFast %i != %i \n", fNoOfClusters, n));
+  new((*RecPoints())[n]) AliTRDcluster(*cluster);
+}
 
-    // Count the number of cluster in the current ROC
-    fClusterROC++;
-  }
+//_____________________________________________________________________________
+void AliTRDclusterizer::AddTrackletsToArray()
+{
+  //
+  // Add the online tracklets of this chamber to the array
+  //
 
+  UInt_t* trackletword;
+  for(Int_t side=0; side<2; side++)
+    {
+      Int_t trkl=0;
+      trackletword=fTrackletContainer[side];
+      while(trackletword[trkl]>0){
+       Int_t n = TrackletsArray()->GetEntriesFast();
+       AliTRDtrackletWord tmp(trackletword[trkl]);
+       new((*TrackletsArray())[n]) AliTRDcluster(&tmp,fDet,fVolid);
+       trkl++;
+      }
+    }
 }
 
 //_____________________________________________________________________________
-Bool_t AliTRDclusterizer::AddLabels(const Int_t idet, const Int_t firstClusterROC, const Int_t nClusterROC)
+Bool_t AliTRDclusterizer::AddLabels()
 {
   //
   // Add the track indices to the found clusters
@@ -1111,7 +1131,7 @@ Bool_t AliTRDclusterizer::AddLabels(const Int_t idet, const Int_t firstClusterRO
   Int_t iPad = 0;
 
   // Temporary array to collect the track indices
-  Int_t *idxTracks = new Int_t[kNtrack*nClusterROC];
+  Int_t *idxTracks = new Int_t[kNtrack*fClusterROC];
 
   // Loop through the dictionary arrays one-by-one
   // to keep memory consumption low
@@ -1119,10 +1139,10 @@ Bool_t AliTRDclusterizer::AddLabels(const Int_t idet, const Int_t firstClusterRO
   for (Int_t iDict = 0; iDict < kNdict; iDict++) {
 
     // tracksIn should be expanded beforehand!
-    tracksIn = (AliTRDarrayDictionary *) fDigitsManager->GetDictionary(idet,iDict);
+    tracksIn = (AliTRDarrayDictionary *) fDigitsManager->GetDictionary(fDet,iDict);
 
     // Loop though the clusters found in this ROC
-    for (iClusterROC = 0; iClusterROC < nClusterROC; iClusterROC++) {
+    for (iClusterROC = 0; iClusterROC < fClusterROC; iClusterROC++) {
 
       AliTRDcluster *cluster = (AliTRDcluster *)
                                RecPoints()->UncheckedAt(firstClusterROC+iClusterROC);
@@ -1142,7 +1162,7 @@ Bool_t AliTRDclusterizer::AddLabels(const Int_t idet, const Int_t firstClusterRO
 
   // Copy the track indices into the cluster
   // Loop though the clusters found in this ROC
-  for (iClusterROC = 0; iClusterROC < nClusterROC; iClusterROC++) {
+  for (iClusterROC = 0; iClusterROC < fClusterROC; iClusterROC++) {
 
     AliTRDcluster *cluster = (AliTRDcluster *)
       RecPoints()->UncheckedAt(firstClusterROC+iClusterROC);
@@ -1161,31 +1181,7 @@ Bool_t AliTRDclusterizer::AddLabels(const Int_t idet, const Int_t firstClusterRO
 }
 
 //_____________________________________________________________________________
-Double_t AliTRDclusterizer::GetCOG(Double_t signal[5]) const
-{
-  //
-  // Get COG position
-  // Used for clusters with more than 3 pads - where LUT not applicable
-  //
-
-  Double_t sum = signal[0]
-              + signal[1]
-              + signal[2] 
-              + signal[3]
-              + signal[4];
-
-  // ???????????? CBL
-  // Go to 3 pad COG ????
-  // ???????????? CBL
-  Double_t res = (0.0 * (-signal[0] + signal[4])
-                      + (-signal[1] + signal[3])) / sum;
-
-  return res;            
-
-}
-
-//_____________________________________________________________________________
-Float_t AliTRDclusterizer::Unfold(Double_t eps, Int_t layer, Double_t *padSignal) const
+Float_t AliTRDclusterizer::Unfold(Double_t eps, Int_t layer, const Double_t *const padSignal) const
 {
   //
   // Method to unfold neighbouring maxima.
@@ -1243,87 +1239,56 @@ Float_t AliTRDclusterizer::Unfold(Double_t eps, Int_t layer, Double_t *padSignal
 }
 
 //_____________________________________________________________________________
-void AliTRDclusterizer::TailCancelation()
+void AliTRDclusterizer::TailCancelation(const AliTRDrecoParam* const recoParam)
 {
   //
-  // Applies the tail cancelation and gain factors: 
-  // Transform fDigitsIn to fDigitsOut
+  // Applies the tail cancelation
   //
 
   Int_t iRow  = 0;
   Int_t iCol  = 0;
   Int_t iTime = 0;
 
-  Double_t *inADC  = new Double_t[fTimeTotal];  // ADC data before tail cancellation
-  Double_t *outADC = new Double_t[fTimeTotal];  // ADC data after tail cancellation
-  fIndexes->ResetCounters();
-  TTreeSRedirector *fDebugStream = fReconstructor->GetDebugStream(AliTRDReconstructor::kClusterizer);
+  TTreeSRedirector *fDebugStream = fReconstructor->GetDebugStream(AliTRDrecoParam::kClusterizer);
+  Bool_t debugStreaming = recoParam->GetStreamLevel(AliTRDrecoParam::kClusterizer) > 7 && fReconstructor->IsDebugStreaming();
+  Int_t nexp = recoParam->GetTCnexp();
   while(fIndexes->NextRCIndex(iRow, iCol))
     {
-      Float_t  fCalGainFactorROCValue = fCalGainFactorROC->GetValue(iCol,iRow);
-      Double_t gain                  = fCalGainFactorDetValue 
-                                    * fCalGainFactorROCValue;
-
-      Bool_t corrupted = kFALSE;
-      for (iTime = 0; iTime < fTimeTotal; iTime++) 
-        {        
-          // Apply gain gain factor
-          inADC[iTime]   = fDigitsIn->GetDataB(iRow,iCol,iTime);
-          if (fDigitsIn->GetPadStatus(iRow, iCol, iTime)) corrupted = kTRUE;
-          inADC[iTime]  /= gain;
-          outADC[iTime]  = inADC[iTime];
-         if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kClusterizer) > 7){
-           (*fDebugStream) << "TailCancellation"
-                             << "col="  << iCol
-                             << "row="  << iRow
-                             << "time=" << iTime
-                             << "inADC=" << inADC[iTime]
-                             << "gain=" << gain
-                             << "outADC=" << outADC[iTime]
-                             << "corrupted=" << corrupted
-                             << "\n";
-         }
-        }
-      if (!corrupted)
-        {
-          // Apply the tail cancelation via the digital filter
-          // (only for non-coorupted pads)
-          if (fReconstructor->GetRecoParam()->IsTailCancelation()) 
-           DeConvExp(inADC,outADC,fTimeTotal,fReconstructor->GetRecoParam() ->GetTCnexp());
-        }
-
-      for(iTime = 0; iTime < fTimeTotal; iTime++)//while (fIndexes->NextTbinIndex(iTime))
-        {
-          // Store the amplitude of the digit if above threshold
-          if (outADC[iTime] > fADCthresh) 
-           fDigitsOut->SetData(iRow,iCol,iTime,outADC[iTime]);
-        } // while itime
-
+      // if corrupted then don't make the tail cancallation
+      if (fCalPadStatusROC->GetStatus(iCol, iRow)) continue;
+
+      if(debugStreaming){
+       for (iTime = 0; iTime < fTimeTotal; iTime++) 
+         (*fDebugStream) << "TailCancellation"
+                         << "col="  << iCol
+                         << "row="  << iRow
+                         << "\n";
+      }
+      
+      // Apply the tail cancelation via the digital filter
+      DeConvExp(fDigits->GetDataAddress(iRow,iCol),fTimeTotal,nexp);
+      
     } // while irow icol
-  
-  delete [] inADC;
-  delete [] outADC;
 
   return;
 
 }
 
 //_____________________________________________________________________________
-void AliTRDclusterizer::DeConvExp(const Double_t *const source, Double_t *const target
-                                 ,const Int_t n, const Int_t nexp) 
+void AliTRDclusterizer::DeConvExp(Short_t *const arr, const Int_t nTime, const Int_t nexp)
 {
   //
   // Tail cancellation by deconvolution for PASA v4 TRF
   //
 
-  Double_t rates[2];
-  Double_t coefficients[2];
+  Float_t rates[2];
+  Float_t coefficients[2];
 
   // Initialization (coefficient = alpha, rates = lambda)
-  Double_t r1 = 1.0;
-  Double_t r2 = 1.0;
-  Double_t c1 = 0.5;
-  Double_t c2 = 0.5;
+  Float_t r1 = 1.0;
+  Float_t r2 = 1.0;
+  Float_t c1 = 0.5;
+  Float_t c2 = 0.5;
 
   if (nexp == 1) {   // 1 Exponentials
     r1 = 1.156;
@@ -1333,7 +1298,7 @@ void AliTRDclusterizer::DeConvExp(const Double_t *const source, Double_t *const
   }
   if (nexp == 2) {   // 2 Exponentials
     Double_t par[4];
-    fReconstructor->GetTCParams(par);
+    fReconstructor->GetRecoParam()->GetTCParams(par);
     r1 = par[0];//1.156;
     r2 = par[1];//0.130;
     c1 = par[2];//0.114;
@@ -1351,19 +1316,19 @@ void AliTRDclusterizer::DeConvExp(const Double_t *const source, Double_t *const
   Int_t i = 0;
   Int_t k = 0;
 
-  Double_t reminder[2];
-  Double_t correction = 0.0;
-  Double_t result     = 0.0;
+  Float_t reminder[2];
+  Float_t correction = 0.0;
+  Float_t result     = 0.0;
 
   // Attention: computation order is important
   for (k = 0; k < nexp; k++) {
     reminder[k] = 0.0;
   }
 
-  for (i = 0; i < n; i++) {
+  for (i = 0; i < nTime; i++) {
 
-    result    = (source[i] - correction);    // No rescaling
-    target[i] = result;
+    result = arr[i] - correction - fBaseline;    // No rescaling
+    arr[i] = (Short_t)(result + fBaseline + 0.5f);
 
     for (k = 0; k < nexp; k++) {
       reminder[k] = rates[k] * (reminder[k] + coefficients[k] * result);
@@ -1386,8 +1351,9 @@ void AliTRDclusterizer::ResetRecPoints()
   //
 
   if (fRecPoints) {
-    fRecPoints->Delete();
-    delete fRecPoints;
+    fRecPoints->Clear();
+    fNoOfClusters = 0;
+    //    delete fRecPoints;
   }
 }
 
@@ -1402,7 +1368,6 @@ TClonesArray *AliTRDclusterizer::RecPoints()
     if(!(fRecPoints = AliTRDReconstructor::GetClusters())){
       // determine number of clusters which has to be allocated
       Float_t nclusters = fReconstructor->GetRecoParam()->GetNClusters();
-      if(fReconstructor->IsHLT()) nclusters /= AliTRDgeometry::kNsector;
 
       fRecPoints = new TClonesArray("AliTRDcluster", Int_t(nclusters));
     }
@@ -1414,201 +1379,18 @@ TClonesArray *AliTRDclusterizer::RecPoints()
 }
 
 //_____________________________________________________________________________
-void AliTRDclusterizer::FillLUT()
+TClonesArray *AliTRDclusterizer::TrackletsArray() 
 {
   //
-  // Create the LUT
+  // Returns the list of rec points
   //
 
-  const Int_t kNlut = 128;
-
-  fLUTbin = AliTRDgeometry::kNlayer * kNlut;
-
-  // The lookup table from Bogdan
-  Float_t lut[AliTRDgeometry::kNlayer][kNlut] = {  
-    {
-      0.0070, 0.0150, 0.0224, 0.0298, 0.0374, 0.0454, 0.0533, 0.0611, 
-      0.0684, 0.0755, 0.0827, 0.0900, 0.0975, 0.1049, 0.1120, 0.1187, 
-      0.1253, 0.1318, 0.1385, 0.1453, 0.1519, 0.1584, 0.1646, 0.1704, 
-      0.1762, 0.1821, 0.1879, 0.1938, 0.1996, 0.2053, 0.2108, 0.2160, 
-      0.2210, 0.2260, 0.2310, 0.2361, 0.2411, 0.2461, 0.2509, 0.2557, 
-      0.2602, 0.2646, 0.2689, 0.2732, 0.2774, 0.2816, 0.2859, 0.2901, 
-      0.2942, 0.2983, 0.3022, 0.3061, 0.3099, 0.3136, 0.3172, 0.3207, 
-      0.3242, 0.3278, 0.3312, 0.3347, 0.3382, 0.3416, 0.3450, 0.3483, 
-      0.3515, 0.3547, 0.3579, 0.3609, 0.3639, 0.3669, 0.3698, 0.3727, 
-      0.3756, 0.3785, 0.3813, 0.3842, 0.3870, 0.3898, 0.3926, 0.3952, 
-      0.3979, 0.4005, 0.4032, 0.4057, 0.4082, 0.4108, 0.4132, 0.4157, 
-      0.4181, 0.4205, 0.4228, 0.4252, 0.4275, 0.4299, 0.4322, 0.4345, 
-      0.4367, 0.4390, 0.4412, 0.4434, 0.4456, 0.4478, 0.4499, 0.4520, 
-      0.4541, 0.4562, 0.4583, 0.4603, 0.4623, 0.4643, 0.4663, 0.4683, 
-      0.4702, 0.4722, 0.4741, 0.4758, 0.4774, 0.4790, 0.4805, 0.4824, 
-      0.4844, 0.4863, 0.4883, 0.4902, 0.4921, 0.4940, 0.4959, 0.4978 
-    },
-    {
-      0.0072, 0.0156, 0.0235, 0.0313, 0.0394, 0.0478, 0.0561, 0.0642, 
-      0.0718, 0.0792, 0.0868, 0.0947, 0.1025, 0.1101, 0.1172, 0.1241, 
-      0.1309, 0.1378, 0.1449, 0.1518, 0.1586, 0.1650, 0.1710, 0.1770, 
-      0.1830, 0.1891, 0.1952, 0.2011, 0.2070, 0.2125, 0.2177, 0.2229, 
-      0.2280, 0.2332, 0.2383, 0.2435, 0.2484, 0.2533, 0.2581, 0.2627, 
-      0.2670, 0.2714, 0.2757, 0.2799, 0.2842, 0.2884, 0.2927, 0.2968, 
-      0.3008, 0.3048, 0.3086, 0.3123, 0.3159, 0.3195, 0.3231, 0.3266, 
-      0.3301, 0.3335, 0.3370, 0.3404, 0.3438, 0.3471, 0.3504, 0.3536, 
-      0.3567, 0.3598, 0.3628, 0.3657, 0.3686, 0.3715, 0.3744, 0.3772, 
-      0.3800, 0.3828, 0.3856, 0.3884, 0.3911, 0.3938, 0.3965, 0.3991, 
-      0.4016, 0.4042, 0.4067, 0.4092, 0.4116, 0.4140, 0.4164, 0.4187, 
-      0.4211, 0.4234, 0.4257, 0.4280, 0.4302, 0.4325, 0.4347, 0.4369, 
-      0.4391, 0.4413, 0.4434, 0.4456, 0.4477, 0.4497, 0.4518, 0.4538, 
-      0.4558, 0.4578, 0.4598, 0.4618, 0.4637, 0.4656, 0.4675, 0.4694, 
-      0.4713, 0.4732, 0.4750, 0.4766, 0.4781, 0.4797, 0.4813, 0.4832, 
-      0.4851, 0.4870, 0.4888, 0.4906, 0.4925, 0.4942, 0.4960, 0.4978
-    },
-    {
-      0.0075, 0.0163, 0.0246, 0.0328, 0.0415, 0.0504, 0.0592, 0.0674, 
-      0.0753, 0.0832, 0.0914, 0.0996, 0.1077, 0.1154, 0.1225, 0.1296, 
-      0.1369, 0.1442, 0.1515, 0.1585, 0.1652, 0.1714, 0.1776, 0.1839, 
-      0.1902, 0.1965, 0.2025, 0.2085, 0.2141, 0.2194, 0.2247, 0.2299, 
-      0.2352, 0.2405, 0.2457, 0.2507, 0.2557, 0.2604, 0.2649, 0.2693, 
-      0.2737, 0.2780, 0.2823, 0.2867, 0.2909, 0.2951, 0.2992, 0.3033, 
-      0.3072, 0.3110, 0.3146, 0.3182, 0.3218, 0.3253, 0.3288, 0.3323, 
-      0.3357, 0.3392, 0.3426, 0.3459, 0.3492, 0.3524, 0.3555, 0.3586, 
-      0.3616, 0.3645, 0.3674, 0.3703, 0.3731, 0.3759, 0.3787, 0.3815, 
-      0.3843, 0.3870, 0.3897, 0.3925, 0.3950, 0.3976, 0.4002, 0.4027, 
-      0.4052, 0.4076, 0.4101, 0.4124, 0.4148, 0.4171, 0.4194, 0.4217, 
-      0.4239, 0.4262, 0.4284, 0.4306, 0.4328, 0.4350, 0.4371, 0.4393, 
-      0.4414, 0.4435, 0.4455, 0.4476, 0.4496, 0.4516, 0.4536, 0.4555, 
-      0.4575, 0.4594, 0.4613, 0.4632, 0.4650, 0.4669, 0.4687, 0.4705, 
-      0.4723, 0.4741, 0.4758, 0.4773, 0.4789, 0.4804, 0.4821, 0.4839, 
-      0.4857, 0.4875, 0.4893, 0.4910, 0.4928, 0.4945, 0.4961, 0.4978
-    },
-    {
-      0.0078, 0.0171, 0.0258, 0.0345, 0.0438, 0.0532, 0.0624, 0.0708, 
-      0.0791, 0.0875, 0.0962, 0.1048, 0.1130, 0.1206, 0.1281, 0.1356, 
-      0.1432, 0.1508, 0.1582, 0.1651, 0.1716, 0.1780, 0.1845, 0.1910, 
-      0.1975, 0.2038, 0.2099, 0.2155, 0.2210, 0.2263, 0.2317, 0.2371, 
-      0.2425, 0.2477, 0.2528, 0.2578, 0.2626, 0.2671, 0.2715, 0.2759, 
-      0.2803, 0.2846, 0.2890, 0.2933, 0.2975, 0.3016, 0.3056, 0.3095, 
-      0.3132, 0.3168, 0.3204, 0.3239, 0.3274, 0.3309, 0.3344, 0.3378, 
-      0.3412, 0.3446, 0.3479, 0.3511, 0.3543, 0.3574, 0.3603, 0.3633, 
-      0.3662, 0.3690, 0.3718, 0.3747, 0.3774, 0.3802, 0.3829, 0.3857, 
-      0.3883, 0.3910, 0.3936, 0.3962, 0.3987, 0.4012, 0.4037, 0.4061, 
-      0.4085, 0.4109, 0.4132, 0.4155, 0.4177, 0.4200, 0.4222, 0.4244, 
-      0.4266, 0.4288, 0.4309, 0.4331, 0.4352, 0.4373, 0.4394, 0.4414, 
-      0.4435, 0.4455, 0.4475, 0.4494, 0.4514, 0.4533, 0.4552, 0.4571, 
-      0.4590, 0.4608, 0.4626, 0.4645, 0.4662, 0.4680, 0.4698, 0.4715, 
-      0.4733, 0.4750, 0.4766, 0.4781, 0.4796, 0.4812, 0.4829, 0.4846, 
-      0.4863, 0.4880, 0.4897, 0.4914, 0.4930, 0.4946, 0.4963, 0.4979
-    },
-    {
-      0.0081, 0.0178, 0.0270, 0.0364, 0.0463, 0.0562, 0.0656, 0.0744, 
-      0.0831, 0.0921, 0.1013, 0.1102, 0.1183, 0.1261, 0.1339, 0.1419, 
-      0.1499, 0.1576, 0.1648, 0.1715, 0.1782, 0.1849, 0.1917, 0.1984, 
-      0.2048, 0.2110, 0.2167, 0.2223, 0.2278, 0.2333, 0.2389, 0.2444, 
-      0.2497, 0.2548, 0.2598, 0.2645, 0.2691, 0.2735, 0.2780, 0.2824, 
-      0.2868, 0.2912, 0.2955, 0.2997, 0.3038, 0.3078, 0.3116, 0.3152, 
-      0.3188, 0.3224, 0.3259, 0.3294, 0.3329, 0.3364, 0.3398, 0.3432, 
-      0.3465, 0.3497, 0.3529, 0.3561, 0.3591, 0.3620, 0.3649, 0.3677, 
-      0.3705, 0.3733, 0.3761, 0.3788, 0.3816, 0.3843, 0.3869, 0.3896, 
-      0.3922, 0.3948, 0.3973, 0.3998, 0.4022, 0.4047, 0.4070, 0.4094, 
-      0.4117, 0.4139, 0.4162, 0.4184, 0.4206, 0.4227, 0.4249, 0.4270, 
-      0.4291, 0.4313, 0.4334, 0.4354, 0.4375, 0.4395, 0.4415, 0.4435, 
-      0.4455, 0.4474, 0.4493, 0.4512, 0.4531, 0.4550, 0.4568, 0.4586, 
-      0.4604, 0.4622, 0.4639, 0.4657, 0.4674, 0.4691, 0.4708, 0.4725, 
-      0.4742, 0.4758, 0.4773, 0.4788, 0.4803, 0.4819, 0.4836, 0.4852, 
-      0.4869, 0.4885, 0.4901, 0.4917, 0.4933, 0.4948, 0.4964, 0.4979
-    },
-    {
-      0.0085, 0.0189, 0.0288, 0.0389, 0.0497, 0.0603, 0.0699, 0.0792, 
-      0.0887, 0.0985, 0.1082, 0.1170, 0.1253, 0.1336, 0.1421, 0.1505, 
-      0.1587, 0.1662, 0.1733, 0.1803, 0.1874, 0.1945, 0.2014, 0.2081, 
-      0.2143, 0.2201, 0.2259, 0.2316, 0.2374, 0.2431, 0.2487, 0.2541, 
-      0.2593, 0.2642, 0.2689, 0.2735, 0.2781, 0.2826, 0.2872, 0.2917, 
-      0.2961, 0.3003, 0.3045, 0.3086, 0.3125, 0.3162, 0.3198, 0.3235, 
-      0.3270, 0.3306, 0.3342, 0.3377, 0.3411, 0.3446, 0.3479, 0.3511, 
-      0.3543, 0.3575, 0.3605, 0.3634, 0.3663, 0.3691, 0.3720, 0.3748, 
-      0.3775, 0.3803, 0.3830, 0.3857, 0.3884, 0.3911, 0.3937, 0.3962, 
-      0.3987, 0.4012, 0.4036, 0.4060, 0.4084, 0.4107, 0.4129, 0.4152, 
-      0.4174, 0.4196, 0.4218, 0.4239, 0.4261, 0.4282, 0.4303, 0.4324, 
-      0.4344, 0.4365, 0.4385, 0.4405, 0.4425, 0.4445, 0.4464, 0.4483, 
-      0.4502, 0.4521, 0.4539, 0.4558, 0.4576, 0.4593, 0.4611, 0.4629, 
-      0.4646, 0.4663, 0.4680, 0.4697, 0.4714, 0.4730, 0.4747, 0.4759, 
-      0.4769, 0.4780, 0.4790, 0.4800, 0.4811, 0.4827, 0.4843, 0.4859, 
-      0.4874, 0.4889, 0.4905, 0.4920, 0.4935, 0.4950, 0.4965, 0.4979
-    }
-  }; 
-
-  if (fLUT) {
-    delete [] fLUT;
-  }
-  fLUT = new Double_t[fLUTbin];
-
-  for (Int_t ilayer = 0; ilayer < AliTRDgeometry::kNlayer; ilayer++) {
-    for (Int_t ilut  = 0; ilut  <  kNlut; ilut++  ) {
-      fLUT[ilayer*kNlut+ilut] = lut[ilayer][ilut];
-    }
+  if (!fTracklets && fReconstructor->IsProcessingTracklets()) {
+    fTracklets = new TClonesArray("AliTRDcluster", 2*MAXTRACKLETSPERHC);
+    //SetClustersOwner(kTRUE);
+    //AliTRDReconstructor::SetTracklets(0x0);
   }
+  return fTracklets;
 
 }
 
-//_____________________________________________________________________________
-Double_t AliTRDclusterizer::LUTposition(Int_t ilayer
-                                      , Double_t ampL
-                                      , Double_t ampC
-                                      , Double_t ampR) const
-{
-  //
-  // Calculates the cluster position using the lookup table.
-  // Method provided by Bogdan Vulpescu.
-  //
-
-  const Int_t kNlut = 128;
-
-  Double_t pos;
-  Double_t x    = 0.0;
-  Double_t xmin;
-  Double_t xmax;
-  Double_t xwid;
-
-  Int_t    side = 0;
-  Int_t    ix;
-
-  Double_t xMin[AliTRDgeometry::kNlayer] = { 0.006492, 0.006377, 0.006258
-                                          , 0.006144, 0.006030, 0.005980 };
-  Double_t xMax[AliTRDgeometry::kNlayer] = { 0.960351, 0.965870, 0.970445
-                                          , 0.974352, 0.977667, 0.996101 };
-
-  if      (ampL > ampR) {
-    x    = (ampL - ampR) / ampC;
-    side = -1;
-  } 
-  else if (ampL < ampR) {
-    x    = (ampR - ampL) / ampC;
-    side = +1;
-  }
-
-  if (ampL != ampR) {
-
-    xmin = xMin[ilayer] + 0.000005;
-    xmax = xMax[ilayer] - 0.000005;
-    xwid = (xmax - xmin) / 127.0;
-
-    if      (x < xmin) {
-      pos = 0.0000;
-    } 
-    else if (x > xmax) {
-      pos = side * 0.5000;
-    } 
-    else {
-      ix  = (Int_t) ((x - xmin) / xwid);
-      pos = side * fLUT[ilayer*kNlut+ix];
-    }
-      
-  } 
-  else {
-
-    pos = 0.0;
-
-  }
-
-  return pos;
-
-}