]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TRD/AliTRDclusterizer.cxx
a/ AliTRDCalibChamberStatus (in ProcessEvent the warning and in Check trying to fix...
[u/mrichter/AliRoot.git] / TRD / AliTRDclusterizer.cxx
index f09db8bffce9453b4884305900e5978d507202e2..df0cfff03bddac8ac6c0483b9f8bd33ced2d342a 100644 (file)
@@ -1,18 +1,17 @@
-
 /**************************************************************************
- * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- *                                                                        *
- * Author: The ALICE Off-line Project.                                    *
- * Contributors are mentioned in the code where appropriate.              *
- *                                                                        *
- * Permission to use, copy, modify and distribute this software and its   *
- * documentation strictly for non-commercial purposes is hereby granted   *
- * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notice   *
- * appear in the supporting documentation. The authors make no claims     *
- * about the suitability of this software for any purpose. It is          *
- * provided "as is" without express or implied warranty.                  *
- **************************************************************************/
+* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+*                                                                        *
+* Author: The ALICE Off-line Project.                                    *
+* Contributors are mentioned in the code where appropriate.              *
+*                                                                        *
+* Permission to use, copy, modify and distribute this software and its   *
+* documentation strictly for non-commercial purposes is hereby granted   *
+* without fee, provided that the above copyright notice appears in all   *
+* copies and that both the copyright notice and this permission notice   *
+* appear in the supporting documentation. The authors make no claims     *
+* about the suitability of this software for any purpose. It is          *
+* provided "as is" without express or implied warranty.                  *
+**************************************************************************/
 
 /* $Id$ */
 
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#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 "AliAlignObj.h"
 
 #include "AliTRDclusterizer.h"
 #include "AliTRDcluster.h"
+#include "AliTRDReconstructor.h"
 #include "AliTRDgeometry.h"
-#include "AliTRDdataArrayF.h"
-#include "AliTRDdataArrayI.h"
+#include "AliTRDarrayDictionary.h"
+#include "AliTRDarrayADC.h"
 #include "AliTRDdigitsManager.h"
+#include "AliTRDdigitsParam.h"
 #include "AliTRDrawData.h"
 #include "AliTRDcalibDB.h"
-#include "AliTRDSimParam.h"
-#include "AliTRDRecParam.h"
-#include "AliTRDCommonParam.h"
 #include "AliTRDtransform.h"
 #include "AliTRDSignalIndex.h"
-#include "AliTRDRawStream.h"
-#include "AliTRDRawStreamV2.h"
+#include "AliTRDrawStreamBase.h"
 #include "AliTRDfeeParam.h"
+#include "AliTRDtrackletWord.h"
+
+#include "TTreeStream.h"
 
 #include "Cal/AliTRDCalROC.h"
 #include "Cal/AliTRDCalDet.h"
+#include "Cal/AliTRDCalSingleChamberStatus.h"
 
 ClassImp(AliTRDclusterizer)
 
 //_____________________________________________________________________________
-AliTRDclusterizer::AliTRDclusterizer()
+AliTRDclusterizer::AliTRDclusterizer(const AliTRDReconstructor *const rec)
   :TNamed()
+  ,fReconstructor(rec)  
   ,fRunLoader(NULL)
   ,fClusterTree(NULL)
   ,fRecPoints(NULL)
-  ,fDigitsManager(NULL)
-  ,fAddLabels(kTRUE)
+  ,fTracklets(NULL)
+  ,fTrackletTree(NULL)
+  ,fDigitsManager(new AliTRDdigitsManager())
+  ,fTrackletContainer(NULL)
   ,fRawVersion(2)
-  ,fIndexesOut(NULL)
-  ,fIndexesMaxima(NULL)
-  ,fTransform(NULL)
+  ,fTransform(new AliTRDtransform(0))
+  ,fDigits(NULL)
+  ,fIndexes(NULL)
+  ,fMaxThresh(0)
+  ,fMaxThreshTest(0)
+  ,fSigThresh(0)
+  ,fMinMaxCutSigma(0)
+  ,fMinLeftRightCutSigma(0)
+  ,fLayer(0)
+  ,fDet(0)
+  ,fVolid(0)
+  ,fColMax(0)
+  ,fTimeTotal(0)
+  ,fCalGainFactorROC(NULL)
+  ,fCalGainFactorDetValue(0)
+  ,fCalNoiseROC(NULL)
+  ,fCalNoiseDetValue(0)
+  ,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");
+  }
+
   fRawVersion = AliTRDfeeParam::Instance()->GetRAWversion();
 
+  // Initialize debug stream
+  if(fReconstructor){
+    if(fReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kClusterizer) > 1){
+      TDirectory *savedir = gDirectory; 
+      //fgGetDebugStream    = new TTreeSRedirector("TRD.ClusterizerDebug.root");
+      savedir->cd();
+    }
+  }
+
 }
 
 //_____________________________________________________________________________
-AliTRDclusterizer::AliTRDclusterizer(const Text_t *name, const Text_t *title)
+AliTRDclusterizer::AliTRDclusterizer(const Text_t *name, const Text_t *title, const AliTRDReconstructor *const rec)
   :TNamed(name,title)
+  ,fReconstructor(rec)
   ,fRunLoader(NULL)
   ,fClusterTree(NULL)
   ,fRecPoints(NULL)
+  ,fTracklets(NULL)
+  ,fTrackletTree(NULL)
   ,fDigitsManager(new AliTRDdigitsManager())
-  ,fAddLabels(kTRUE)
+  ,fTrackletContainer(NULL)
   ,fRawVersion(2)
-  ,fIndexesOut(NULL)
-  ,fIndexesMaxima(NULL)
   ,fTransform(new AliTRDtransform(0))
+  ,fDigits(NULL)
+  ,fIndexes(NULL)
+  ,fMaxThresh(0)
+  ,fMaxThreshTest(0)
+  ,fSigThresh(0)
+  ,fMinMaxCutSigma(0)
+  ,fMinLeftRightCutSigma(0)
+  ,fLayer(0)
+  ,fDet(0)
+  ,fVolid(0)
+  ,fColMax(0)
+  ,fTimeTotal(0)
+  ,fCalGainFactorROC(NULL)
+  ,fCalGainFactorDetValue(0)
+  ,fCalNoiseROC(NULL)
+  ,fCalNoiseDetValue(0)
+  ,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");
+  }
+
   fDigitsManager->CreateArrays();
 
   fRawVersion = AliTRDfeeParam::Instance()->GetRAWversion();
 
+  //FillLUT();
+
 }
 
 //_____________________________________________________________________________
 AliTRDclusterizer::AliTRDclusterizer(const AliTRDclusterizer &c)
   :TNamed(c)
+  ,fReconstructor(c.fReconstructor)
   ,fRunLoader(NULL)
   ,fClusterTree(NULL)
   ,fRecPoints(NULL)
+  ,fTracklets(NULL)
+  ,fTrackletTree(NULL)
   ,fDigitsManager(NULL)
-  ,fAddLabels(kTRUE)
+  ,fTrackletContainer(NULL)
   ,fRawVersion(2)
-  ,fIndexesOut(NULL)
-  ,fIndexesMaxima(NULL)
   ,fTransform(NULL)
+  ,fDigits(NULL)
+  ,fIndexes(NULL)
+  ,fMaxThresh(0)
+  ,fMaxThreshTest(0)
+  ,fSigThresh(0)
+  ,fMinMaxCutSigma(0)
+  ,fMinLeftRightCutSigma(0)
+  ,fLayer(0)
+  ,fDet(0)
+  ,fVolid(0)
+  ,fColMax(0)
+  ,fTimeTotal(0)
+  ,fCalGainFactorROC(NULL)
+  ,fCalGainFactorDetValue(0)
+  ,fCalNoiseROC(NULL)
+  ,fCalNoiseDetValue(0)
+  ,fCalPadStatusROC(NULL)
+  ,fClusterROC(0)
+  ,firstClusterROC(0)
+  ,fNoOfClusters(0)
+  ,fBaseline(0)
+  ,fRawStream(NULL)
 {
   //
   // AliTRDclusterizer copy constructor
   //
 
+  SetBit(kLabels, kTRUE);
+  SetBit(knewDM, kFALSE);
+
+  //FillLUT();
+
 }
 
 //_____________________________________________________________________________
@@ -126,35 +223,37 @@ AliTRDclusterizer::~AliTRDclusterizer()
   // AliTRDclusterizer destructor
   //
 
-  if (fRecPoints) 
-    {
-      fRecPoints->Delete();
-      delete fRecPoints;
-    }
+  if (fRecPoints/* && IsClustersOwner()*/){
+    fRecPoints->Delete();
+    delete fRecPoints;
+  }
 
-  if (fDigitsManager) 
-    {
-      delete fDigitsManager;
-      fDigitsManager = NULL;
-    }
+  if (fTracklets){
+    fTracklets->Delete();
+    delete fTracklets;
+  }
 
-  if (fIndexesOut)
-    {
-      delete fIndexesOut;
-      fIndexesOut    = NULL;
-    }
+  if (fDigitsManager) {
+    delete fDigitsManager;
+    fDigitsManager = NULL;
+  }
 
-  if (fIndexesMaxima)
-    {
-      delete fIndexesMaxima;
-      fIndexesMaxima = NULL;
-    }
+  if (fTrackletContainer){
+    delete [] fTrackletContainer[0];
+    delete [] fTrackletContainer[1];
+    delete [] fTrackletContainer;
+    fTrackletContainer = NULL;
+  }
 
-  if (fTransform)
-    {
-      delete fTransform;
-      fTransform     = NULL;
-    }
+  if (fTransform){
+    delete fTransform;
+    fTransform = NULL;
+  }
+
+  if (fRawStream){
+    delete fRawStream;
+    fRawStream = NULL;
+  }
 
 }
 
@@ -169,6 +268,7 @@ AliTRDclusterizer &AliTRDclusterizer::operator=(const AliTRDclusterizer &c)
     {
       ((AliTRDclusterizer &) c).Copy(*this);
     }
+
   return *this;
 
 }
@@ -182,13 +282,34 @@ void AliTRDclusterizer::Copy(TObject &c) const
 
   ((AliTRDclusterizer &) c).fClusterTree   = NULL;
   ((AliTRDclusterizer &) c).fRecPoints     = NULL;  
+  ((AliTRDclusterizer &) c).fTrackletTree  = NULL;
   ((AliTRDclusterizer &) c).fDigitsManager = NULL;
-  ((AliTRDclusterizer &) c).fAddLabels     = fAddLabels;
+  ((AliTRDclusterizer &) c).fTrackletContainer = NULL;
   ((AliTRDclusterizer &) c).fRawVersion    = fRawVersion;
-  ((AliTRDclusterizer &) c).fIndexesOut    = NULL;
-  ((AliTRDclusterizer &) c).fIndexesMaxima = NULL;
   ((AliTRDclusterizer &) c).fTransform     = NULL;
-
+  ((AliTRDclusterizer &) c).fDigits      = NULL;
+  ((AliTRDclusterizer &) c).fIndexes       = NULL;
+  ((AliTRDclusterizer &) c).fMaxThresh     = 0;
+  ((AliTRDclusterizer &) c).fMaxThreshTest = 0;
+  ((AliTRDclusterizer &) c).fSigThresh     = 0;
+  ((AliTRDclusterizer &) c).fMinMaxCutSigma= 0;
+  ((AliTRDclusterizer &) c).fMinLeftRightCutSigma = 0;
+  ((AliTRDclusterizer &) c).fLayer         = 0;
+  ((AliTRDclusterizer &) c).fDet           = 0;
+  ((AliTRDclusterizer &) c).fVolid         = 0;
+  ((AliTRDclusterizer &) c).fColMax        = 0;
+  ((AliTRDclusterizer &) c).fTimeTotal     = 0;
+  ((AliTRDclusterizer &) c).fCalGainFactorROC = NULL;
+  ((AliTRDclusterizer &) c).fCalGainFactorDetValue = 0;
+  ((AliTRDclusterizer &) c).fCalNoiseROC   = NULL;
+  ((AliTRDclusterizer &) c).fCalNoiseDetValue = 0;
+  ((AliTRDclusterizer &) c).fCalPadStatusROC = NULL;
+  ((AliTRDclusterizer &) c).fClusterROC    = 0;
+  ((AliTRDclusterizer &) c).firstClusterROC= 0;
+  ((AliTRDclusterizer &) c).fNoOfClusters  = 0;
+  ((AliTRDclusterizer &) c).fBaseline      = 0;
+  ((AliTRDclusterizer &) c).fRawStream     = NULL;
+  
 }
 
 //_____________________________________________________________________________
@@ -224,32 +345,34 @@ Bool_t AliTRDclusterizer::OpenOutput()
   // Open the output file
   //
 
-  TObjArray *ioArray = 0;
+  if (!fReconstructor->IsWritingClusters()) return kTRUE;
+
+  TObjArray *ioArray = 0x0; 
 
   AliLoader* loader = fRunLoader->GetLoader("TRDLoader");
   loader->MakeTree("R");
 
   fClusterTree = loader->TreeR();
-  fClusterTree->Branch("TRDcluster","TObjArray",&ioArray,32000,0);
+  fClusterTree->Branch("TRDcluster", "TObjArray", &ioArray, 32000, 0);
 
   return kTRUE;
 
 }
 
 //_____________________________________________________________________________
-Bool_t AliTRDclusterizer::OpenOutput(TTree *clusterTree)
+Bool_t AliTRDclusterizer::OpenOutput(TTree *const clusterTree)
 {
   //
   // Connect the output tree
   //
 
-  TObjArray *ioArray = 0;
-
-  fClusterTree = clusterTree;
-  fClusterTree->Branch("TRDcluster","TObjArray",&ioArray,32000,0);
-
+  // clusters writing
+  if (fReconstructor->IsWritingClusters()){
+    TObjArray *ioArray = 0x0;
+    fClusterTree = clusterTree;
+    fClusterTree->Branch("TRDcluster", "TObjArray", &ioArray, 32000, 0);
+  }
   return kTRUE;
-
 }
 
 //_____________________________________________________________________________
@@ -279,114 +402,85 @@ Bool_t AliTRDclusterizer::WriteClusters(Int_t det)
     AliError(Form("Unexpected detector index %d.\n",det));
     return kFALSE;
   }
+
+  TObjArray *ioArray = new TObjArray(400);
   TBranch *branch = fClusterTree->GetBranch("TRDcluster");
   if (!branch) {
-    TObjArray *ioArray = 0;
     branch = fClusterTree->Branch("TRDcluster","TObjArray",&ioArray,32000,0);
-  }
-
-  if ((det >=                      0) && 
-      (det <  AliTRDgeometry::Ndet())) {
-
-    Int_t nRecPoints = RecPoints()->GetEntriesFast();
-    TObjArray *detRecPoints = new TObjArray(400);
-
+  } else branch->SetAddress(&ioArray);
+  
+  Int_t nRecPoints = RecPoints()->GetEntriesFast();
+  if(det >= 0){
     for (Int_t i = 0; i < nRecPoints; i++) {
       AliTRDcluster *c = (AliTRDcluster *) RecPoints()->UncheckedAt(i);
-      if (det == c->GetDetector()) {
-        detRecPoints->AddLast(c);
-      }
-      else {
-        AliError(Form("Attempt to write a cluster with unexpected detector index: got=%d expected=%d\n"
-                     ,c->GetDetector()
-                     ,det));
-      }
+      if(det != c->GetDetector()) continue;
+      ioArray->AddLast(c);
     }
-
-    branch->SetAddress(&detRecPoints);
     fClusterTree->Fill();
-
-    delete detRecPoints;
-    
-    return kTRUE;
-
-  }
-
-  if (det == -1) {
-
-    AliInfo(Form("Writing the cluster tree %s for event %d."
-               ,fClusterTree->GetName(),fRunLoader->GetEventNumber()));
-
-    if (fRecPoints) {
-
-      branch->SetAddress(&fRecPoints);
-
-      AliLoader *loader = fRunLoader->GetLoader("TRDLoader");
-      loader->WriteRecPoints("OVERWRITE");
-  
+    ioArray->Clear();
+  } else {
+    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);
     }
-    else {
-
-      AliError("Cluster tree does not exist. Cannot write clusters.\n");
-      return kFALSE;
-
+    if(ioArray->GetEntriesFast()){
+      nw += ioArray->GetEntriesFast();
+      fClusterTree->Fill();
+      ioArray->Clear();
     }
-
-    return kTRUE;  
-
+    AliDebug(2, Form("Clusters FOUND[%d] WRITTEN[%d] STATUS[%s]", nRecPoints, nw, nw==nRecPoints?"OK":"FAILED"));
   }
+  delete ioArray;
 
-  AliError(Form("Unexpected detector index %d.\n",det));
-  return kFALSE;  
-  
+  return kTRUE;  
 }
 
 //_____________________________________________________________________________
-void AliTRDclusterizer::ResetHelperIndexes(AliTRDSignalIndex *indexesIn)
+Bool_t AliTRDclusterizer::WriteTracklets(Int_t det)
 {
-  // 
-  // Reset the helper indexes
+  //
+  // Write the raw data tracklets into seperate file
   //
 
-  if (fIndexesOut)
-    {
-      // carefull here - we assume that only row number may change - most probable
-      if (indexesIn->GetNrow() <= fIndexesOut->GetNrow())
-       fIndexesOut->ResetContent();
-      else
-       fIndexesOut->ResetContentConditional(indexesIn->GetNrow()
-                                           , indexesIn->GetNcol()
-                                           , indexesIn->GetNtime());
-    }
-  else
-    {
-      fIndexesOut = new AliTRDSignalIndex(indexesIn->GetNrow()
-                                        , indexesIn->GetNcol() 
-                                        , indexesIn->GetNtime());
-    }
-  
-  if (fIndexesMaxima)
-    {
-      // carefull here - we assume that only row number may change - most probable
-      if (indexesIn->GetNrow() <= fIndexesMaxima->GetNrow()) 
-        {
-         fIndexesMaxima->ResetContent();
-       }
-      else
-       {
-         fIndexesMaxima->ResetContentConditional(indexesIn->GetNrow()
-                                                , indexesIn->GetNcol()
-                                                , indexesIn->GetNtime());
-       }
-    }
-  else
-    {
-      fIndexesMaxima = new AliTRDSignalIndex(indexesIn->GetNrow()
-                                           , indexesIn->GetNcol()
-                                           , indexesIn->GetNtime());
+  UInt_t **leaves = new UInt_t *[2];
+  for (Int_t i=0; i<2 ;i++){
+    leaves[i] = new UInt_t[258];
+    leaves[i][0] = det; // det
+    leaves[i][1] = i;   // side
+    memcpy(leaves[i]+2, fTrackletContainer[i], sizeof(UInt_t) * 256);
+  }
+
+  if (!fTrackletTree){
+    AliDataLoader *dl = fRunLoader->GetLoader("TRDLoader")->GetDataLoader("tracklets");
+    dl->MakeTree();
+    fTrackletTree = dl->Tree();
+  }
+
+  TBranch *trkbranch = fTrackletTree->GetBranch("trkbranch");
+  if (!trkbranch) {
+    trkbranch = fTrackletTree->Branch("trkbranch",leaves[0],"det/i:side/i:tracklets[256]/i");
+  }
+
+  for (Int_t i=0; i<2; i++){
+    if (leaves[i][2]>0) {
+      trkbranch->SetAddress(leaves[i]);
+      fTrackletTree->Fill();
     }
+  }
+
+//  AliDataLoader *dl = fRunLoader->GetLoader("TRDLoader")->GetDataLoader("tracklets"); //jkl: wrong here
+//  dl->WriteData("OVERWRITE"); //jkl: wrong here
+  //dl->Unload();
+  delete [] leaves;
+
+  return kTRUE;
 
 }
 
@@ -446,56 +540,48 @@ 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;
-  for (Int_t i = 0; i < AliTRDgeometry::kNdet; i++)
-    {
-
-      AliTRDdataArrayI *digitsIn = fDigitsManager->GetDigits(i);      
-      // This is to take care of switched off super modules
-      if (digitsIn->GetNtime() == 0) 
-        {
-         continue;
+  for (Int_t i = 0; i < AliTRDgeometry::kNdet; i++){
+  
+    AliTRDarrayADC *digitsIn = (AliTRDarrayADC*) fDigitsManager->GetDigits(i); //mod     
+    // This is to take care of switched off super modules
+    if (!digitsIn->HasData()) continue;
+    digitsIn->Expand();
+    digitsIn->DeleteNegatives();  // Restore digits array to >=0 values
+    AliTRDSignalIndex* indexes = fDigitsManager->GetIndexes(i);
+    if (indexes->IsAllocated() == kFALSE){
+      fDigitsManager->BuildIndexes(i);
+    }
+  
+    Bool_t fR = kFALSE;
+    if (indexes->HasEntry()){
+      if (TestBit(kLabels)){
+        for (Int_t iDict = 0; iDict < AliTRDdigitsManager::kNDict; iDict++){
+          AliTRDarrayDictionary *tracksIn = 0; //mod
+          tracksIn = (AliTRDarrayDictionary *) fDigitsManager->GetDictionary(i,iDict);  //mod
+          tracksIn->Expand();
         }
-      digitsIn->Expand();
-      AliTRDSignalIndex* indexes = fDigitsManager->GetIndexes(i);
-      if (indexes->IsAllocated() == kFALSE)
-       {
-         fDigitsManager->BuildIndexes(i);
-       }
-
-      Bool_t fR = kFALSE;
-      if (indexes->HasEntry())
-       {
-         if (fAddLabels)
-           {
-             for (Int_t iDict = 0; iDict < AliTRDdigitsManager::kNDict; iDict++) 
-               {
-                 AliTRDdataArrayI *tracksIn = 0;
-                 tracksIn = fDigitsManager->GetDictionary(i,iDict);
-                 tracksIn->Expand();
-               }
-           }
-         fR = MakeClusters(i);
-         fReturn = fR && fReturn;
-       }
-
-      if (fR == kFALSE)
-       {
-         WriteClusters(i);
-         ResetRecPoints();
-       }
-
-      // No compress just remove
-      fDigitsManager->RemoveDigits(i);
-      fDigitsManager->RemoveDictionaries(i);      
-      fDigitsManager->ClearIndexes(i);
-
+      }
+      fR = MakeClusters(i);
+      fReturn = fR && fReturn;
     }
+  
+    //if (fR == kFALSE){
+    //  if(IsWritingClusters()) WriteClusters(i);
+    //  ResetRecPoints();
+    //}
+        
+    // Clear arrays of this chamber, to prepare for next event
+    fDigitsManager->ClearArrays(i);
+  }
+  
+  if(fReconstructor->IsWritingClusters()) WriteClusters(-1);
+
+  AliInfo(Form("Number of found clusters : %d", RecPoints()->GetEntriesFast())); 
 
   return fReturn;
 
@@ -508,182 +594,146 @@ Bool_t AliTRDclusterizer::Raw2Clusters(AliRawReader *rawReader)
   // Creates clusters from raw data
   //
 
-  AliTRDdataArrayI *digits = 0;
-  AliTRDdataArrayI *track0 = 0;
-  AliTRDdataArrayI *track1 = 0;
-  AliTRDdataArrayI *track2 = 0; 
+  return Raw2ClustersChamber(rawReader);
 
-  AliTRDSignalIndex *indexes = 0;
+}
+
+//_____________________________________________________________________________
+Bool_t AliTRDclusterizer::Raw2ClustersChamber(AliRawReader *rawReader)
+{
+  //
+  // Creates clusters from raw data
+  //
 
   // Create the digits manager
-  if (!fDigitsManager)
-    {
-      fDigitsManager = new AliTRDdigitsManager();
-      fDigitsManager->CreateArrays();
+  if (!fDigitsManager){
+    SetBit(knewDM, kTRUE);
+    fDigitsManager = new AliTRDdigitsManager(kTRUE);
+    fDigitsManager->CreateArrays();
+  }
+
+  fDigitsManager->SetUseDictionaries(TestBit(kLabels));
+
+  // ----- preparing tracklet output -----
+  if (fReconstructor->IsWritingTracklets()) {
+    AliDataLoader *trklLoader = AliRunLoader::Instance()->GetLoader("TRDLoader")->GetDataLoader("tracklets");
+    if (!trklLoader) {
+      AliError("Could not get the tracklets data loader, adding it now!");
+      trklLoader = new AliDataLoader("TRD.Tracklets.root","tracklets", "tracklets");
+      AliRunLoader::Instance()->GetLoader("TRDLoader")->AddDataLoader(trklLoader);
     }
+    if (!trklLoader->Tree())
+      AliRunLoader::Instance()->GetLoader("TRDLoader")->GetDataLoader("tracklets")->MakeTree();
+  }
 
-  AliTRDRawStreamV2 input(rawReader);
-  input.SetRawVersion( fRawVersion );
-  input.Init();
+  // tracklet container for raw tracklet writing
+  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
+  }
 
-  AliInfo(Form("Stream version: %s", input.IsA()->GetName()));
+  if(!fRawStream)
+    fRawStream = AliTRDrawStreamBase::GetRawStream(rawReader);
+  else
+    fRawStream->SetReader(rawReader);
 
-  // Loop through the digits
-  Int_t lastdet = -1;
-  Int_t det     =  0;
-  Int_t it      =  0;
-  while (input.Next()) 
-    {
+  SetBit(kHLT, fReconstructor->IsHLT());
 
-      det = input.GetDet();
-
-      if (det != lastdet) 
-       {
-       
-         if (lastdet != -1)
-           {
-             digits = fDigitsManager->GetDigits(lastdet);
-             Bool_t iclusterBranch = kFALSE;
-             if (indexes->HasEntry())
-               iclusterBranch = MakeClusters(lastdet);
-             if (iclusterBranch == kFALSE)
-               {
-                 WriteClusters(lastdet);
-                 ResetRecPoints();
-               }
-           }
-
-         if (digits)
-           {
-             fDigitsManager->RemoveDigits(lastdet);
-             fDigitsManager->RemoveDictionaries(lastdet);
-             fDigitsManager->ClearIndexes(lastdet);
-           }
-
-         lastdet = det;
-
-         // Add a container for the digits of this detector
-         digits = fDigitsManager->GetDigits(det);
-         track0 = fDigitsManager->GetDictionary(det,0);
-         track1 = fDigitsManager->GetDictionary(det,1);
-         track2 = fDigitsManager->GetDictionary(det,2);
-
-         // Allocate memory space for the digits buffer
-         if (digits->GetNtime() == 0) 
-           {
-             //AliDebug(5, Form("Alloc digits for det %d", det));
-             digits->Allocate(input.GetMaxRow(),input.GetMaxCol(), input.GetNumberOfTimeBins());
-             track0->Allocate(input.GetMaxRow(),input.GetMaxCol(), input.GetNumberOfTimeBins());
-             track1->Allocate(input.GetMaxRow(),input.GetMaxCol(), input.GetNumberOfTimeBins());
-             track2->Allocate(input.GetMaxRow(),input.GetMaxCol(), input.GetNumberOfTimeBins());
-           }
-         
-         indexes = fDigitsManager->GetIndexes(det);
-         indexes->SetSM(input.GetSM());
-         indexes->SetStack(input.GetStack());
-         indexes->SetLayer(input.GetLayer());
-         indexes->SetDetNumber(det);
-         if (indexes->IsAllocated() == kFALSE)
-           {
-             indexes->Allocate(input.GetMaxRow(), input.GetMaxCol(), input.GetNumberOfTimeBins());
-           }
-
-       }
-      
-      for (it = 0; it < 3; it++)
-       {
-         if ( input.GetTimeBin() + it < input.GetNumberOfTimeBins() )
-           {
-             if (input.GetSignals()[it] > 0)
-               {
-                 digits->SetDataUnchecked(input.GetRow(), input.GetCol(),
-                                          input.GetTimeBin() + it, input.GetSignals()[it]);
-
-                 indexes->AddIndexTBin(input.GetRow(), input.GetCol(),
-                                       input.GetTimeBin() + it);
-                 track0->SetDataUnchecked(input.GetRow(), input.GetCol(),
-                                          input.GetTimeBin() + it, 0);
-                 track1->SetDataUnchecked(input.GetRow(), input.GetCol(),
-                                          input.GetTimeBin() + it, 0);
-                 track2->SetDataUnchecked(input.GetRow(), input.GetCol(),
-                                          input.GetTimeBin() + it, 0);
-               }
-           }
-       }
+  if(TestBit(kHLT)){
+    fRawStream->SetSharedPadReadout(kFALSE);
+    fRawStream->SetNoErrorWarning();
+  }
 
-    }
+  AliDebug(1,Form("Stream version: %s", fRawStream->IsA()->GetName()));
+  
+  Int_t det    = 0;
+  while ((det = fRawStream->NextChamber(fDigitsManager,fTrackletContainer)) >= 0){
+    if (fDigitsManager->GetIndexes(det)->HasEntry())
+      MakeClusters(det);
 
-  if (lastdet != -1)
-    {
-      Bool_t iclusterBranch = kFALSE;
-      if (indexes->HasEntry()) 
-        {
-         iclusterBranch = MakeClusters(lastdet);
-        }
-      if (iclusterBranch == kFALSE)
-       {
-         WriteClusters(lastdet);
-         ResetRecPoints();
-       }
-      //MakeClusters(lastdet);
-      if (digits)
-       {
-         fDigitsManager->RemoveDigits(lastdet);
-         fDigitsManager->RemoveDictionaries(lastdet);
-         fDigitsManager->ClearIndexes(lastdet);
-       }
+    fDigitsManager->ClearArrays(det);
+
+    if (!fReconstructor->IsWritingTracklets()) continue;
+    if (*(fTrackletContainer[0]) > 0 || *(fTrackletContainer[1]) > 0) WriteTracklets(det);
+  }
+  
+  if (fReconstructor->IsWritingTracklets()) {
+    if (AliDataLoader *trklLoader = AliRunLoader::Instance()->GetLoader("TRDLoader")->GetDataLoader("tracklets")) {
+      trklLoader->WriteData("OVERWRITE");
+      trklLoader->Unload();
     }
+  }
+
+  if (fTrackletContainer){
+    delete [] fTrackletContainer[0];
+    delete [] fTrackletContainer[1];
+    delete [] fTrackletContainer;
+    fTrackletContainer = NULL;
+  }
 
-  delete fDigitsManager;
-  fDigitsManager = NULL;
+  if(fReconstructor->IsWritingClusters()) WriteClusters(-1);
+
+  if(!TestBit(knewDM)){
+    delete fDigitsManager;
+    fDigitsManager = NULL;
+    delete fRawStream;
+    fRawStream = NULL;
+  }
+
+  AliInfo(Form("Number of found clusters : %d", fNoOfClusters)); 
   return kTRUE;
 
 }
 
 //_____________________________________________________________________________
-Bool_t AliTRDclusterizer::Raw2ClustersChamber(AliRawReader *rawReader)
+UChar_t AliTRDclusterizer::GetStatus(Short_t &signal)
 {
   //
-  // Creates clusters from raw data
+  // Check if a pad is masked
   //
 
-  // Create the digits manager
-  if (!fDigitsManager)
-    {
-      fDigitsManager = new AliTRDdigitsManager();
-      fDigitsManager->CreateArrays();
-    }
-
-  fDigitsManager->SetUseDictionaries(fAddLabels);
-
-  AliTRDRawStreamV2 input(rawReader);
-  input.SetRawVersion( fRawVersion );
-  input.Init();
+  UChar_t status = 0;
 
-  AliInfo(Form("Stream version: %s", input.IsA()->GetName()));
-  
-  Int_t det    = 0;
-  while ((det = input.NextChamber(fDigitsManager)) >= 0)
-    {
-      Bool_t iclusterBranch = kFALSE;
-      if (fDigitsManager->GetIndexes(det)->HasEntry())
-       {
-         iclusterBranch = MakeClusters(det);
-       }
-      if (iclusterBranch == kFALSE)
-       {
-         WriteClusters(det);
-         ResetRecPoints();
-       }
-      fDigitsManager->RemoveDigits(det);
-      fDigitsManager->RemoveDictionaries(det);      
-      fDigitsManager->ClearIndexes(det);
+  if(signal>0 && TESTBIT(signal, 10)){
+    CLRBIT(signal, 10);
+    for(int ibit=0; ibit<4; ibit++){
+      if(TESTBIT(signal, 11+ibit)){
+        SETBIT(status, ibit);
+        CLRBIT(signal, 11+ibit);
+      } 
     }
+  }
+  return status;
+}
 
-  delete fDigitsManager;
-  fDigitsManager = NULL;
-  return kTRUE;
+//_____________________________________________________________________________
+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
+  //
+  out |= status << 3;
+}
+
+//_____________________________________________________________________________
+UChar_t AliTRDclusterizer::GetPadStatus(UChar_t encoding) const {
+  //
+  // return the staus encoding of the corrupted pad
+  //
+  return static_cast<UChar_t>(encoding >> 3);
+}
 
+//_____________________________________________________________________________
+Int_t AliTRDclusterizer::GetCorruption(UChar_t encoding) const {
+  //
+  // Return the position of the corruption
+  //
+  return encoding & 7;
 }
 
 //_____________________________________________________________________________
@@ -694,360 +744,366 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det)
   //
 
   // Get the digits
-  //   digits should be expanded beforehand!
-  //   digitsIn->Expand();
-  AliTRDdataArrayI *digitsIn = fDigitsManager->GetDigits(det);      
-
+  fDigits = (AliTRDarrayADC *) fDigitsManager->GetDigits(det); //mod
+  fBaseline = fDigitsManager->GetDigitsParam()->GetADCbaseline(det);
+  
   // This is to take care of switched off super modules
-  if (digitsIn->GetNtime() == 0) 
-    {
-      return kFALSE;
-    }
-
-  AliTRDSignalIndex *indexesIn = fDigitsManager->GetIndexes(det);
-  if (indexesIn->IsAllocated() == kFALSE)
-    {
-      AliError("Indexes do not exist!");
-      return kFALSE;      
-    }
-    
-  AliTRDcalibDB  *calibration = AliTRDcalibDB::Instance();
-  if (!calibration) 
-    {
-      AliFatal("No AliTRDcalibDB instance available\n");
-      return kFALSE;  
-    }
+  if (!fDigits->HasData()) return kFALSE;
 
-  AliTRDRecParam *recParam    = AliTRDRecParam::Instance();
-  if (!recParam) 
-    {
-      AliError("No AliTRDRecParam instance available\n");
-      return kFALSE;  
-    }
-
-  // ADC thresholds
-  // There is no ADC threshold anymore, and simParam should not be used in clusterizer. KO
-  Float_t ADCthreshold   = 0; 
+  fIndexes = fDigitsManager->GetIndexes(det);
+  if (fIndexes->IsAllocated() == kFALSE) {
+    AliError("Indexes do not exist!");
+    return kFALSE;      
+  }
 
-  // Threshold value for the maximum
-  Float_t maxThresh      = recParam->GetClusMaxThresh();
-  // Threshold value for the digit signal
-  Float_t sigThresh      = recParam->GetClusSigThresh();
+  AliTRDcalibDB* const calibration = AliTRDcalibDB::Instance();
+  if (!calibration) {
+    AliFatal("No AliTRDcalibDB instance available\n");
+    return kFALSE;  
+  }
 
-  // Iteration limit for unfolding procedure
-  const Float_t kEpsilon = 0.01;             
-  const Int_t   kNclus   = 3;  
-  const Int_t   kNsig    = 5;
+  if (!fReconstructor){
+    AliError("Reconstructor not set\n");
+    return kFALSE;
+  }
 
-  Int_t    iUnfold       = 0;  
-  Double_t ratioLeft     = 1.0;
-  Double_t ratioRight    = 1.0;
+  const AliTRDrecoParam *const recoParam = fReconstructor->GetRecoParam();
 
-  Double_t padSignal[kNsig];   
-  Double_t clusterSignal[kNclus];
+  fMaxThresh            = (Short_t)recoParam->GetClusMaxThresh();
+  fMaxThreshTest        = (Short_t)(recoParam->GetClusMaxThresh()/2+fBaseline);
+  fSigThresh            = (Short_t)recoParam->GetClusSigThresh();
+  fMinMaxCutSigma       = recoParam->GetMinMaxCutSigma();
+  fMinLeftRightCutSigma = recoParam->GetMinLeftRightCutSigma();
 
-  Int_t icham = indexesIn->GetChamber();
-  Int_t iplan = indexesIn->GetPlane();
-  Int_t isect = indexesIn->GetSM();
+  Int_t istack  = fIndexes->GetStack();
+  fLayer  = fIndexes->GetLayer();
+  Int_t isector = fIndexes->GetSM();
 
   // Start clustering in the chamber
 
-  Int_t idet  = AliTRDgeometry::GetDetector(iplan,icham,isect);
-  if (idet != det)
-    {
-      AliError("Strange Detector number Missmatch!");
-      return kFALSE;
-    }
+  fDet  = AliTRDgeometry::GetDetector(fLayer,istack,isector);
+  if (fDet != det) {
+    AliError("Strange Detector number Missmatch!");
+    return kFALSE;
+  }
+
+  AliDebug(2, Form("Det[%d] @ Sec[%d] Stk[%d] Ly[%d]", fDet, isector, istack, fLayer));
 
   // TRD space point transformation
   fTransform->SetDetector(det);
 
-  Int_t    ilayer  = AliGeomManager::kTRD1 + iplan;
-  Int_t    imodule = icham + AliTRDgeometry::Ncham() * isect;
-  UShort_t volid   = AliGeomManager::LayerToVolUID(ilayer,imodule); 
+  Int_t    iGeoLayer  = AliGeomManager::kTRD1 + fLayer;
+  Int_t    iGeoModule = istack + AliTRDgeometry::Nstack() * isector;
+  fVolid      = AliGeomManager::LayerToVolUID(iGeoLayer,iGeoModule); 
+
+  if(fReconstructor->IsProcessingTracklets() && fTrackletContainer)
+    AddTrackletsToArray();
 
-  Int_t nColMax    = digitsIn->GetNcol();
-  Int_t nTimeTotal = digitsIn->GetNtime();
+  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();
+  const AliTRDCalDet *calGainFactorDet = calibration->GetGainFactorDet();
   // Calibration object with pad wise values for the gain factors
-  AliTRDCalROC       *calGainFactorROC      = calibration->GetGainFactorROC(idet);
+  fCalGainFactorROC      = calibration->GetGainFactorROC(fDet);
   // Calibration value for chamber wise gain factor
-  Float_t             calGainFactorDetValue = calGainFactorDet->GetValue(idet);
-
-  Int_t nClusters = 0;
+  fCalGainFactorDetValue = calGainFactorDet->GetValue(fDet);
+
+  // Detector wise calibration object for the noise
+  const AliTRDCalDet *calNoiseDet = calibration->GetNoiseDet();
+  // Calibration object with pad wise values for the noise
+  fCalNoiseROC           = calibration->GetNoiseROC(fDet);
+  // Calibration value for chamber wise noise
+  fCalNoiseDetValue      = calNoiseDet->GetValue(fDet);
+  
+  // Calibration object with the pad status
+  fCalPadStatusROC       = calibration->GetPadStatusROC(fDet);
 
-  AliTRDdataArrayF *digitsOut = new AliTRDdataArrayF(digitsIn->GetNrow()
-                                                    ,digitsIn->GetNcol()
-                                                   ,digitsIn->GetNtime()); 
+  firstClusterROC = -1;
+  fClusterROC     =  0;
 
-  ResetHelperIndexes(indexesIn);
+  SetBit(kLUT, recoParam->UseLUT());
+  SetBit(kGAUS, recoParam->UseGAUS());
 
   // Apply the gain and the tail cancelation via digital filter
-  TailCancelation(digitsIn
-                ,digitsOut  
-                ,indexesIn
-                ,fIndexesOut
-                ,nTimeTotal
-                 ,ADCthreshold
-                 ,calGainFactorROC
-                 ,calGainFactorDetValue);      
-       
-  Int_t row  = 0;
-  Int_t col  = 0;
-  Int_t time = 0;
-  Int_t iPad = 0;
-    
-  fIndexesOut->ResetCounters();
-  while (fIndexesOut->NextRCTbinIndex(row, col, time))
-    {
+  if(recoParam->UseTailCancelation()) TailCancelation(recoParam);
 
-      Float_t signalM = TMath::Abs(digitsOut->GetDataUnchecked(row,col,time));
-           
-      // Look for the maximum
-      if (signalM >= maxThresh) 
-       {
-               
-         if (col + 1 >= nColMax || col-1 < 0)
-           continue;
-
-         Float_t signalL = TMath::Abs(digitsOut->GetDataUnchecked(row,col+1,time));
-         Float_t signalR = TMath::Abs(digitsOut->GetDataUnchecked(row,col-1,time));
-
-         if ((TMath::Abs(signalL) <= signalM) && 
-             (TMath::Abs(signalR) <  signalM)) 
-           {
-             if ((TMath::Abs(signalL) >= sigThresh) ||
-                 (TMath::Abs(signalR) >= sigThresh)) 
-               {
-                 // Maximum found, mark the position by a negative signal
-                 digitsOut->SetDataUnchecked(row,col,time,-signalM);
-                 fIndexesMaxima->AddIndexTBin(row,col,time);
-               }
-           }
-
-       }
+  MaxStruct curr, last;
+  Int_t nMaximas = 0, nCorrupted = 0;
 
+  // Here the clusterfining is happening
+  
+  for(curr.time = 0; curr.time < fTimeTotal; curr.time++){
+    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;
+      }
     }
-              
-  // The index to the first cluster of a given ROC
-  Int_t firstClusterROC = -1;
-  // The number of cluster in a given ROC
-  Int_t nClusterROC     =  0;
-
-  // Now check the maxima and calculate the cluster position
-  fIndexesMaxima->ResetCounters();
-  while (fIndexesMaxima->NextRCTbinIndex(row, col, time)) 
-    {
+  }
+  if(last.row>-1) CreateCluster(last);
+
+  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;
+
+}
 
-      // Maximum found ?             
-      if (digitsOut->GetDataUnchecked(row,col,time) < 0.0) 
-        {
-
-         for (iPad = 0; iPad < kNclus; iPad++) 
-            {
-             Int_t iPadCol = col - 1 + iPad;
-             clusterSignal[iPad] = TMath::Abs(digitsOut->GetDataUnchecked(row,iPadCol,time));
-           }
-
-         // Count the number of pads in the cluster
-         Int_t nPadCount = 0;
-         Int_t ii;
-         // Look to the left
-         ii = 0;
-         while (TMath::Abs(digitsOut->GetDataUnchecked(row,col-ii  ,time)) >= sigThresh) 
-            {
-             nPadCount++;
-             ii++;
-             if (col-ii   <        0) break;
-           }
-         // Look to the right
-         ii = 0;
-         while (TMath::Abs(digitsOut->GetDataUnchecked(row,col+ii+1,time)) >= sigThresh) 
-            {
-             nPadCount++;
-             ii++;
-             if (col+ii+1 >= nColMax) break;
-           }
-         nClusters++;
-
-         // Look for 5 pad cluster with minimum in the middle
-         Bool_t fivePadCluster = kFALSE;
-         if (col < (nColMax - 3)) 
-            {
-             if (digitsOut->GetDataUnchecked(row,col+2,time) < 0) 
-                {
-                 fivePadCluster = kTRUE;
-               }
-             if ((fivePadCluster) && (col < (nColMax - 5))) 
-                {
-                 if (digitsOut->GetDataUnchecked(row,col+4,time) >= sigThresh) 
-                    {
-                     fivePadCluster = kFALSE;
-                   }
-               }
-             if ((fivePadCluster) && (col >             1)) 
-                {
-                 if (digitsOut->GetDataUnchecked(row,col-2,time) >= sigThresh) 
-                    {
-                     fivePadCluster = kFALSE;
-                   }
-               }
-           }
-
-         // 5 pad cluster
-         // Modify the signal of the overlapping pad for the left part 
-         // of the cluster which remains from a previous unfolding
-         if (iUnfold) 
-            {
-             clusterSignal[0] *= ratioLeft;
-             iUnfold = 0;
-           }
-
-         // Unfold the 5 pad cluster
-         if (fivePadCluster) 
-            {
-             for (iPad = 0; iPad < kNsig; iPad++) 
-                {
-                 padSignal[iPad] = TMath::Abs(digitsOut->GetDataUnchecked(row
-                                                                         ,col-1+iPad
-                                                                         ,time));
-               }
-             // Unfold the two maxima and set the signal on 
-             // the overlapping pad to the ratio
-             ratioRight        = Unfold(kEpsilon,iplan,padSignal);
-             ratioLeft         = 1.0 - ratioRight; 
-             clusterSignal[2] *= ratioRight;
-             iUnfold = 1;
-           }
-
-         // The position of the cluster in COL direction relative to the center pad (pad units)
-          Double_t clusterPosCol = 0.0;
-         if (recParam->LUTOn()) 
-            {
-             // Calculate the position of the cluster by using the
-             // lookup table method
-             clusterPosCol = recParam->LUTposition(iplan
-                                                   ,clusterSignal[0]
-                                                   ,clusterSignal[1]
-                                                  ,clusterSignal[2]);
-           }
-         else 
-            {
-             // Calculate the position of the cluster by using the
-             // center of gravity method
-             for (Int_t i = 0; i < kNsig; i++) 
-                {
-                 padSignal[i] = 0.0;
-               }
-             padSignal[2] = TMath::Abs(digitsOut->GetDataUnchecked(row,col  ,time)); // Central pad
-             padSignal[1] = TMath::Abs(digitsOut->GetDataUnchecked(row,col-1,time)); // Left    pad
-             padSignal[3] = TMath::Abs(digitsOut->GetDataUnchecked(row,col+1,time)); // Right   pad
-             if ((col >           2) && 
-                 (TMath::Abs(digitsOut->GetDataUnchecked(row,col-2,time)) < padSignal[1])) 
-                {
-                 padSignal[0] = TMath::Abs(digitsOut->GetDataUnchecked(row,col-2,time));
-               }
-             if ((col < nColMax - 3) &&
-                 (TMath::Abs(digitsOut->GetDataUnchecked(row,col+2,time)) < padSignal[3])) 
-                {
-                 padSignal[4] = TMath::Abs(digitsOut->GetDataUnchecked(row,col+2,time));
-               }  
-             clusterPosCol = GetCOG(padSignal);
-           }
-
-         // Store the amplitudes of the pads in the cluster for later analysis
-         Short_t signals[7] = { 0, 0, 0, 0, 0, 0, 0 };
-         for (Int_t jPad = col-3; jPad <= col+3; jPad++) 
-            {
-             if ((jPad <          0) || 
-                 (jPad >= nColMax-1)) 
-                {
-                 continue;
-               }
-             signals[jPad-col+3] = TMath::Nint(TMath::Abs(digitsOut->GetDataUnchecked(row,jPad,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] = clusterSignal[0];
-         clusterXYZ[2] = clusterSignal[1];
-         clusterXYZ[3] = clusterSignal[2];
-         clusterXYZ[4] = 0.0;
-         clusterXYZ[5] = 0.0;
-          Int_t    clusterRCT[3];
-          clusterRCT[0] = row;
-          clusterRCT[1] = col;
-          clusterRCT[2] = 0;
-         fTransform->Transform(clusterXYZ,clusterRCT,((UInt_t) time),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]);
-         AliTRDcluster *cluster = new AliTRDcluster(idet
-                                                   ,clusterCharge
-                                                   ,clusterPos
-                                                   ,clusterSig
-                                                   ,0x0
-                                                   ,((Char_t) nPadCount)
-                                                   ,signals
-                                                   ,((UChar_t) col)
-                                                   ,((UChar_t) row)
-                                                   ,((UChar_t) time)
-                                                   ,clusterTimeBin
-                                                   ,clusterPosCol
-                                                   ,volid);
-
-         // Temporarily store the row, column and time bin of the center pad
-         // Used to later on assign the track indices
-         cluster->SetLabel( row,0);
-         cluster->SetLabel( col,1);
-         cluster->SetLabel(time,2);
-
-         RecPoints()->Add(cluster);
-
-         // Store the index of the first cluster in the current ROC
-         if (firstClusterROC < 0) 
-            {
-             firstClusterROC = RecPoints()->GetEntriesFast() - 1;
-           }
-
-         // Count the number of cluster in the current ROC
-         nClusterROC++;
-
-        } // if: Maximum found ?
+//_____________________________________________________________________________
+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.
+  //
 
+  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;
+
+  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;
+
+  UChar_t status[3]={
+    fCalPadStatusROC->GetStatus(Max.col-1, Max.row)
+   ,fCalPadStatusROC->GetStatus(Max.col,   Max.row)
+   ,fCalPadStatusROC->GetStatus(Max.col+1, Max.row)
+  };
+
+  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)) {
+       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(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) {
+      Signals[0]=0;
+      SetPadStatus(status[0], padStatus);
+      return kTRUE;
+    }
+    else if (status[1] && (!(status[0] || status[2])) && ((Signals[2] > fSigThresh) || (Signals[0] > fSigThresh))) {
+      Signals[1] = fMaxThresh;
+      SetPadStatus(status[1], padStatus);
+      return kTRUE;
     }
+  }
+  return kFALSE;
+}
+
+//_____________________________________________________________________________
+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;
+  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) {
+    gain = fCalGainFactorDetValue * fCalGainFactorROC->GetValue(ThisMax.col-2,ThisMax.row);
+    if (fDigits->GetData(ThisMax.row, ThisMax.col-2, ThisMax.time) - fBaseline >= fSigThresh * gain)
+      return kFALSE;
+  }
+  
+  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]};
+  
+  // Unfold the two maxima and set the signal on 
+  // the overlapping pad to the ratio
+  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 fRecPoints
+  //
+
+  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++;
+}
 
-  delete digitsOut;
+//_____________________________________________________________________________
+void AliTRDclusterizer::CalcAdditionalInfo(const MaxStruct &Max, Short_t *const signals, Int_t &nPadCount)
+{
+  // Look to the right
+  Int_t ii = 1;
+  while (fDigits->GetData(Max.row, Max.col-ii, Max.time) >= fSigThresh) {
+    nPadCount++;
+    ii++;
+    if (Max.col < ii) break;
+  }
+  // Look to the left
+  ii = 1;
+  while (fDigits->GetData(Max.row, Max.col+ii, Max.time) >= fSigThresh) {
+    nPadCount++;
+    ii++;
+    if (Max.col+ii >= fColMax) break;
+  }
 
-  if (fAddLabels) 
+  // Store the amplitudes of the pads in the cluster for later analysis
+  // and check whether one of these pads is masked in the database
+  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++)
     {
-      AddLabels(idet, firstClusterROC, nClusterROC);
+      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(fDigits->GetData(Max.Row,jPad,Max.Time));
+      }*/
+}
 
-  // Write the cluster and reset the array
-  WriteClusters(idet);
-  ResetRecPoints();
+//_____________________________________________________________________________
+void AliTRDclusterizer::AddClusterToArray(AliTRDcluster* cluster)
+{
+  //
+  // Add a cluster to the array
+  //
 
-  return kTRUE;
+  Int_t n = RecPoints()->GetEntriesFast();
+  if(n!=fNoOfClusters)AliError(Form("fNoOfClusters != RecPoints()->GetEntriesFast %i != %i \n", fNoOfClusters, n));
+  new((*RecPoints())[n]) AliTRDcluster(*cluster);
+}
 
+//_____________________________________________________________________________
+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(Int_t idet, Int_t firstClusterROC, Int_t nClusterROC)
+Bool_t AliTRDclusterizer::AddLabels()
 {
   //
   // Add the track indices to the found clusters
@@ -1065,29 +1121,29 @@ Bool_t AliTRDclusterizer::AddLabels(Int_t idet, Int_t firstClusterROC, Int_t nCl
   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
-  AliTRDdataArrayI *tracksIn = 0;
+  AliTRDarrayDictionary *tracksIn = 0;  //mod
   for (Int_t iDict = 0; iDict < kNdict; iDict++) {
 
     // tracksIn should be expanded beforehand!
-    tracksIn = 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);
+                               RecPoints()->UncheckedAt(firstClusterROC+iClusterROC);
       row  = cluster->GetLabel(0);
       col  = cluster->GetLabel(1);
       time = cluster->GetLabel(2);
 
       for (iPad = 0; iPad < kNclus; iPad++) {
-       Int_t iPadCol = col - 1 + iPad;
-       Int_t index   = tracksIn->GetDataUnchecked(row,iPadCol,time) - 1;
-       idxTracks[3*iPad+iDict + iClusterROC*kNtrack] = index;     
+        Int_t iPadCol = col - 1 + iPad;
+        Int_t index   = tracksIn->GetData(row,iPadCol,time);  //Modification of -1 in Track
+        idxTracks[3*iPad+iDict + iClusterROC*kNtrack] = index;     
       }
 
     }
@@ -1096,8 +1152,8 @@ Bool_t AliTRDclusterizer::AddLabels(Int_t idet, Int_t firstClusterROC, Int_t nCl
 
   // 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);
     cluster->SetLabel(-9999,0);
@@ -1115,28 +1171,7 @@ Bool_t AliTRDclusterizer::AddLabels(Int_t idet, Int_t firstClusterROC, Int_t nCl
 }
 
 //_____________________________________________________________________________
-Double_t AliTRDclusterizer::GetCOG(Double_t signal[5])
-{
-  //
-  // 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];
-
-  Double_t res = (0.0 * (-signal[0] + signal[4])
-                      + (-signal[1] + signal[3])) / sum;
-
-  return res;            
-
-}
-
-//_____________________________________________________________________________
-Double_t AliTRDclusterizer::Unfold(Double_t eps, Int_t plane, Double_t *padSignal)
+Float_t AliTRDclusterizer::Unfold(Double_t eps, Int_t layer, const Double_t *const padSignal) const
 {
   //
   // Method to unfold neighbouring maxima.
@@ -1169,19 +1204,19 @@ Double_t AliTRDclusterizer::Unfold(Double_t eps, Int_t plane, Double_t *padSigna
 
     // Cluster position according to charge ratio
     Double_t maxLeft  = (ratio*padSignal[2] - padSignal[0]) 
-                      / (padSignal[0] + padSignal[1] + ratio*padSignal[2]);
+                      / (padSignal[0] + padSignal[1] + ratio * padSignal[2]);
     Double_t maxRight = (padSignal[4] - (1-ratio)*padSignal[2]) 
                       / ((1.0 - ratio)*padSignal[2] + padSignal[3] + padSignal[4]);
 
     // Set cluster charge ratio
-    irc = calibration->PadResponse(1.0,maxLeft ,plane,newSignal);
+    irc = calibration->PadResponse(1.0, maxLeft, layer, newSignal);
     Double_t ampLeft  = padSignal[1] / newSignal[1];
-    irc = calibration->PadResponse(1.0,maxRight,plane,newSignal);
+    irc = calibration->PadResponse(1.0, maxRight, layer, newSignal);
     Double_t ampRight = padSignal[3] / newSignal[1];
 
     // Apply pad response to parameters
-    irc = calibration->PadResponse(ampLeft ,maxLeft ,plane,newLeftSignal );
-    irc = calibration->PadResponse(ampRight,maxRight,plane,newRightSignal);
+    irc = calibration->PadResponse(ampLeft ,maxLeft ,layer,newLeftSignal );
+    irc = calibration->PadResponse(ampRight,maxRight,layer,newRightSignal);
 
     // Calculate new overlapping ratio
     ratio = TMath::Min((Double_t) 1.0
@@ -1194,90 +1229,56 @@ Double_t AliTRDclusterizer::Unfold(Double_t eps, Int_t plane, Double_t *padSigna
 }
 
 //_____________________________________________________________________________
-void AliTRDclusterizer::TailCancelation(AliTRDdataArrayI *digitsIn
-                                     , AliTRDdataArrayF *digitsOut
-                                     , AliTRDSignalIndex *indexesIn
-                                     , AliTRDSignalIndex *indexesOut
-                                      , Int_t nTimeTotal
-                                     , Float_t ADCthreshold
-                                     , AliTRDCalROC *calGainFactorROC
-                                     , Float_t calGainFactorDetValue)
+void AliTRDclusterizer::TailCancelation(const AliTRDrecoParam* const recoParam)
 {
   //
-  // Applies the tail cancelation and gain factors: 
-  // Transform digitsIn to digitsOut
+  // Applies the tail cancelation
   //
 
   Int_t iRow  = 0;
   Int_t iCol  = 0;
   Int_t iTime = 0;
 
-  AliTRDRecParam *recParam = AliTRDRecParam::Instance();
-  if (!recParam) 
+  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))
     {
-      AliError("No AliTRDRecParam instance available\n");
-      return;
-    }
-
-  Double_t *inADC  = new Double_t[nTimeTotal];  // ADC data before tail cancellation
-  Double_t *outADC = new Double_t[nTimeTotal];  // ADC data after tail cancellation
-  indexesIn->ResetCounters();
-  while (indexesIn->NextRCIndex(iRow, iCol))
-    {
-      Float_t  calGainFactorROCValue = calGainFactorROC->GetValue(iCol,iRow);
-      Double_t gain                  = calGainFactorDetValue 
-                                     * calGainFactorROCValue;
-
-      for (iTime = 0; iTime < nTimeTotal; iTime++) 
-       {         
-         // Apply gain gain factor
-         inADC[iTime]   = digitsIn->GetDataUnchecked(iRow,iCol,iTime);
-         inADC[iTime]  /= gain;
-         outADC[iTime]  = inADC[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
-      if (recParam->TCOn()) 
-        {
-         DeConvExp(inADC,outADC,nTimeTotal,recParam->GetTCnexp());
-        }
-
-      indexesIn->ResetTbinCounter();
-      while (indexesIn->NextTbinIndex(iTime))
-       {
-         // Store the amplitude of the digit if above threshold
-         if (outADC[iTime] > ADCthreshold) 
-           {
-             digitsOut->SetDataUnchecked(iRow,iCol,iTime,outADC[iTime]);
-             indexesOut->AddIndexTBin(iRow,iCol,iTime);
-           }     
-       } // while itime
-
+      DeConvExp(fDigits->GetDataAddress(iRow,iCol),fTimeTotal,nexp);
+      
     } // while irow icol
-  
-  delete [] inADC;
-  delete [] outADC;
 
   return;
 
 }
 
 //_____________________________________________________________________________
-void AliTRDclusterizer::DeConvExp(Double_t *source, Double_t *target
-                                , Int_t n, 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;
@@ -1286,10 +1287,12 @@ void AliTRDclusterizer::DeConvExp(Double_t *source, Double_t *target
     c2 = 0.000;
   }
   if (nexp == 2) {   // 2 Exponentials
-    r1 = 1.156;
-    r2 = 0.130;
-    c1 = 0.114;
-    c2 = 0.624;
+    Double_t par[4];
+    fReconstructor->GetRecoParam()->GetTCParams(par);
+    r1 = par[0];//1.156;
+    r2 = par[1];//0.130;
+    c1 = par[2];//0.114;
+    c2 = par[3];//0.624;
   }
 
   coefficients[0] = c1;
@@ -1303,19 +1306,19 @@ void AliTRDclusterizer::DeConvExp(Double_t *source, Double_t *target
   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);
@@ -1338,22 +1341,46 @@ void AliTRDclusterizer::ResetRecPoints()
   //
 
   if (fRecPoints) {
-    fRecPoints->Delete();
+    fRecPoints->Clear();
+    fNoOfClusters = 0;
+    //    delete fRecPoints;
   }
-
 }
 
 //_____________________________________________________________________________
-TObjArray *AliTRDclusterizer::RecPoints() 
+TClonesArray *AliTRDclusterizer::RecPoints() 
 {
   //
   // Returns the list of rec points
   //
 
   if (!fRecPoints) {
-    fRecPoints = new TObjArray(400);
+    if(!(fRecPoints = AliTRDReconstructor::GetClusters())){
+      // determine number of clusters which has to be allocated
+      Float_t nclusters = fReconstructor->GetRecoParam()->GetNClusters();
+
+      fRecPoints = new TClonesArray("AliTRDcluster", Int_t(nclusters));
+    }
+    //SetClustersOwner(kTRUE);
+    AliTRDReconstructor::SetClusters(0x0);
   }
   return fRecPoints;
 
 }
+
+//_____________________________________________________________________________
+TClonesArray *AliTRDclusterizer::TrackletsArray() 
+{
+  //
+  // Returns the list of rec points
+  //
+
+  if (!fTracklets && fReconstructor->IsProcessingTracklets()) {
+    fTracklets = new TClonesArray("AliTRDcluster", 2*MAXTRACKLETSPERHC);
+    //SetClustersOwner(kTRUE);
+    //AliTRDReconstructor::SetTracklets(0x0);
+  }
+  return fTracklets;
+
+}
+