]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TRD/AliTRDclusterizerV1.cxx
First round of effc++ changes
[u/mrichter/AliRoot.git] / TRD / AliTRDclusterizerV1.cxx
index c5fff1f5e931a23ddb8536e8a19077d93ee39ac7..c2233e8dd007c51f60abfa128c6a516c4a8149fe 100644 (file)
@@ -1,3 +1,4 @@
+
 /**************************************************************************
  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
 #include "AliRun.h"
 #include "AliRunLoader.h"
 #include "AliLoader.h"
+#include "AliRawReader.h"
 
 #include "AliTRDclusterizerV1.h"
-#include "AliTRDmatrix.h"
 #include "AliTRDgeometry.h"
 #include "AliTRDdataArrayF.h"
 #include "AliTRDdataArrayI.h"
 #include "AliTRDdigitsManager.h"
-#include "AliTRDparameter.h"
 #include "AliTRDpadPlane.h"
+#include "AliTRDrawData.h"
+#include "AliTRDcalibDB.h"
+#include "AliTRDSimParam.h"
+#include "AliTRDRecParam.h"
+#include "AliTRDCommonParam.h"
+#include "AliTRDcluster.h"
 
 ClassImp(AliTRDclusterizerV1)
 
@@ -136,6 +142,21 @@ Bool_t AliTRDclusterizerV1::ReadDigits()
 
 }
 
+//_____________________________________________________________________________
+Bool_t AliTRDclusterizerV1::ReadDigits(AliRawReader* rawReader)
+{
+  //
+  // Reads the digits arrays from the ddl file
+  //
+
+  AliTRDrawData raw;
+
+  fDigitsManager = raw.Raw2Digits(rawReader);
+
+  return kTRUE;
+
+}
+
 //_____________________________________________________________________________
 Bool_t AliTRDclusterizerV1::MakeClusters()
 {
@@ -154,38 +175,57 @@ Bool_t AliTRDclusterizerV1::MakeClusters()
   */
 
   // Get the geometry
-  AliTRDgeometry *geo = AliTRDgeometry::GetGeometry(fRunLoader);
-
-  // Create a default parameter class if none is defined
-  if (!fPar) {
-    fPar = new AliTRDparameter("TRDparameter","Standard TRD parameter");
+  AliTRDgeometry *geo = AliTRDgeometry::GetGeometry(fRunLoader);  
+  AliTRDcalibDB* calibration = AliTRDcalibDB::Instance();
+  if (!calibration)
+  {
     printf("<AliTRDclusterizerV1::MakeCluster> ");
-    printf("Create the default parameter object.\n");
+    printf("ERROR getting instance of AliTRDcalibDB");
+    return kFALSE;  
   }
-  fPar->Init();
-
-  //Float_t timeBinSize = fPar->GetDriftVelocity()
-  //                    / fPar->GetSamplingFrequency();
-  // Half of ampl.region
-  //  const Float_t kAmWidth = AliTRDgeometry::AmThick()/2.; 
+  
+  AliTRDSimParam* simParam = AliTRDSimParam::Instance();
+  if (!simParam)
+  {
+    printf("<AliTRDclusterizerV1::MakeCluster> ");
+    printf("ERROR getting instance of AliTRDSimParam");
+    return kFALSE;  
+  }
+  
+  AliTRDRecParam* recParam = AliTRDRecParam::Instance();
+  if (!recParam)
+  {
+    printf("<AliTRDclusterizerV1::MakeCluster> ");
+    printf("ERROR getting instance of AliTRDRecParam");
+    return kFALSE;  
+  }
+  
+  AliTRDCommonParam* commonParam = AliTRDCommonParam::Instance();
+  if (!commonParam)
+  {
+    printf("<AliTRDclusterizerV1::MakeDigits> ");
+    printf("Could not get common params\n");
+    return kFALSE;
+  }
+    
+  Float_t ADCthreshold = simParam->GetADCthreshold();
 
-  Float_t omegaTau = fPar->GetOmegaTau();
   if (fVerbose > 0) {
-    printf("<AliTRDclusterizerV1::MakeCluster> ");
-    printf("OmegaTau = %f \n",omegaTau);
+    //printf("<AliTRDclusterizerV1::MakeCluster> ");
+    //printf("OmegaTau = %f \n",omegaTau);
     printf("<AliTRDclusterizerV1::MakeCluster> ");
     printf("Start creating clusters.\n");
   } 
 
-  AliTRDdataArrayI *digits;
+  AliTRDdataArrayI *digitsIn;
   AliTRDdataArrayI *track0;
   AliTRDdataArrayI *track1;
   AliTRDdataArrayI *track2; 
 
   // Threshold value for the maximum
-  Int_t maxThresh = fPar->GetClusMaxThresh();   
+  Float_t maxThresh = recParam->GetClusMaxThresh();
   // Threshold value for the digit signal
-  Int_t sigThresh = fPar->GetClusSigThresh();   
+  Float_t sigThresh = recParam->GetClusSigThresh();
   // Iteration limit for unfolding procedure
   const Float_t kEpsilon = 0.01;             
 
@@ -202,8 +242,7 @@ Bool_t AliTRDclusterizerV1::MakeClusters()
   Double_t padSignal[kNsig];   
   Double_t clusterSignal[kNclus];
   Double_t clusterPads[kNclus];   
-  Int_t    clusterDigit[kNclus];
-  Int_t    clusterTracks[kNtrack];   
+  Int_t    clusterTracks[kNtrack];
 
   Int_t    chamBeg = 0;
   Int_t    chamEnd = AliTRDgeometry::Ncham();
@@ -212,12 +251,22 @@ Bool_t AliTRDclusterizerV1::MakeClusters()
   Int_t    sectBeg = 0;
   Int_t    sectEnd = AliTRDgeometry::Nsect();
 
+  Int_t    nTimeTotal  = calibration->GetNumberOfTimeBins();
+
+  if (fVerbose > 0) {
+    printf("<AliTRDclusterizerV1::MakeCluster> ");
+    printf("Number of Time Bins = %d.\n",nTimeTotal);
+  }
+
   // Start clustering in every chamber
   for (Int_t icham = chamBeg; icham < chamEnd; icham++) {
     for (Int_t iplan = planBeg; iplan < planEnd; iplan++) {
       for (Int_t isect = sectBeg; isect < sectEnd; isect++) {
 
-        Int_t idet = geo->GetDetector(iplan,icham,isect);
+        Int_t idet    = geo->GetDetector(iplan,icham,isect);
+
+       Int_t nRowMax = commonParam->GetRowMax(iplan,icham,isect);
+       Int_t nColMax = commonParam->GetColMax(iplan);
 
         Int_t nClusters      = 0;
         Int_t nClusters2pad  = 0;
@@ -232,16 +281,15 @@ Bool_t AliTRDclusterizerV1::MakeClusters()
                 ,icham,iplan,isect);
        }
 
-        Int_t    nRowMax     = fPar->GetRowMax(iplan,icham,isect);
-        Int_t    nColMax     = fPar->GetColMax(iplan);
-        Int_t    nTimeBefore = fPar->GetTimeBefore();
-        Int_t    nTimeTotal  = fPar->GetTimeTotal();  
-
-        AliTRDpadPlane *padPlane = fPar->GetPadPlane(iplan,icham);
+        AliTRDpadPlane *padPlane = commonParam->GetPadPlane(iplan,icham);
 
         // Get the digits
-        digits = fDigitsManager->GetDigits(idet);
-        digits->Expand();
+        digitsIn = fDigitsManager->GetDigits(idet);
+        digitsIn->Expand();
+        AliTRDdataArrayF *digitsOut = new AliTRDdataArrayF(digitsIn->GetNrow(), digitsIn->GetNcol(), digitsIn->GetNtime());
+
+        Transform(digitsIn, digitsOut, idet, nRowMax, nColMax, nTimeTotal, ADCthreshold);
+
         track0 = fDigitsManager->GetDictionary(idet,0);
         track0->Expand();
         track1 = fDigitsManager->GetDictionary(idet,1);
@@ -252,21 +300,21 @@ Bool_t AliTRDclusterizerV1::MakeClusters()
         // Loop through the chamber and find the maxima 
         for ( row = 0;  row <  nRowMax;    row++) {
          for ( col = 2;  col <  nColMax;    col++) {
-           //for ( col = 4;  col <  nColMax-2;    col++) {
+            //for ( col = 4;  col <  nColMax-2;    col++) {
             for (time = 0; time < nTimeTotal; time++) {
 
-              Int_t signalL = TMath::Abs(digits->GetDataUnchecked(row,col  ,time));
-              Int_t signalM = TMath::Abs(digits->GetDataUnchecked(row,col-1,time));
-              Int_t signalR = TMath::Abs(digits->GetDataUnchecked(row,col-2,time));
+              Float_t signalL = TMath::Abs(digitsOut->GetDataUnchecked(row,col  ,time));
+              Float_t signalM = TMath::Abs(digitsOut->GetDataUnchecked(row,col-1,time));
+              Float_t signalR = TMath::Abs(digitsOut->GetDataUnchecked(row,col-2,time));
  
-//           // Look for the maximum
+//           // Lonok for the maximum
 //               if (signalM >= maxThresh) {
 //                 if (((signalL >= sigThresh) &&
 //                      (signalL <  signalM))  ||
 //                     ((signalR >= sigThresh) &&
 //                      (signalR <  signalM))) {
 //                   // Maximum found, mark the position by a negative signal
-//                   digits->SetDataUnchecked(row,col-1,time,-signalM);
+//                   digitsOut->SetDataUnchecked(row,col-1,time,-signalM);
 //             }
 //           }
              // Look for the maximum
@@ -274,10 +322,9 @@ Bool_t AliTRDclusterizerV1::MakeClusters()
                 if ( (TMath::Abs(signalL)<=signalM) && (TMath::Abs(signalR)<=signalM) && 
                     (TMath::Abs(signalL)+TMath::Abs(signalR))>sigThresh ) {
                   // Maximum found, mark the position by a negative signal
-                  digits->SetDataUnchecked(row,col-1,time,-signalM);
+                  digitsOut->SetDataUnchecked(row,col-1,time,-signalM);
                }
              }
-
             }  
           }    
         }      
@@ -288,15 +335,14 @@ Bool_t AliTRDclusterizerV1::MakeClusters()
             for ( col = 1;  col <  nColMax-1;  col++) {
 
               // Maximum found ?             
-              if (digits->GetDataUnchecked(row,col,time) < 0) {
+              if (digitsOut->GetDataUnchecked(row,col,time) < 0) {
 
                 Int_t iPad;
                 for (iPad = 0; iPad < kNclus; iPad++) {
                   Int_t iPadCol = col - 1 + iPad;
-                  clusterSignal[iPad]     = TMath::Abs(digits->GetDataUnchecked(row
+                  clusterSignal[iPad]     = TMath::Abs(digitsOut->GetDataUnchecked(row
                                                                                ,iPadCol
                                                                                ,time));
-                  clusterDigit[iPad]      = digits->GetIndexUnchecked(row,iPadCol,time);
                   clusterTracks[3*iPad  ] = track0->GetDataUnchecked(row,iPadCol,time) - 1;
                  clusterTracks[3*iPad+1] = track1->GetDataUnchecked(row,iPadCol,time) - 1;
                  clusterTracks[3*iPad+2] = track2->GetDataUnchecked(row,iPadCol,time) - 1;
@@ -305,14 +351,14 @@ Bool_t AliTRDclusterizerV1::MakeClusters()
                // Count the number of pads in the cluster
                 Int_t nPadCount = 0;
                 Int_t ii        = 0;
-                while (TMath::Abs(digits->GetDataUnchecked(row,col-ii  ,time))
+                while (TMath::Abs(digitsOut->GetDataUnchecked(row,col-ii  ,time))
                                                                   >= sigThresh) {
                   nPadCount++;
                   ii++;
                   if (col-ii   <        0) break;
                }
                 ii = 0;
-                while (TMath::Abs(digits->GetDataUnchecked(row,col+ii+1,time))
+                while (TMath::Abs(digitsOut->GetDataUnchecked(row,col+ii+1,time))
                                                                   >= sigThresh) {
                   nPadCount++;
                   ii++;
@@ -346,16 +392,16 @@ Bool_t AliTRDclusterizerV1::MakeClusters()
                 // Look for 5 pad cluster with minimum in the middle
                 Bool_t fivePadCluster = kFALSE;
                 if (col < nColMax-3) {
-                  if (digits->GetDataUnchecked(row,col+2,time) < 0) {
+                  if (digitsOut->GetDataUnchecked(row,col+2,time) < 0) {
                     fivePadCluster = kTRUE;
                  }
                   if ((fivePadCluster) && (col < nColMax-5)) {
-                    if (digits->GetDataUnchecked(row,col+4,time) >= sigThresh) {
+                    if (digitsOut->GetDataUnchecked(row,col+4,time) >= sigThresh) {
                       fivePadCluster = kFALSE;
                    }
                  }
                   if ((fivePadCluster) && (col >         1)) {
-                    if (digits->GetDataUnchecked(row,col-2,time) >= sigThresh) {
+                    if (digitsOut->GetDataUnchecked(row,col-2,time) >= sigThresh) {
                       fivePadCluster = kFALSE;
                    }
                  }
@@ -373,9 +419,9 @@ Bool_t AliTRDclusterizerV1::MakeClusters()
                // Unfold the 5 pad cluster
                 if (fivePadCluster) {
                   for (iPad = 0; iPad < kNsig; iPad++) {
-                    padSignal[iPad] = TMath::Abs(digits->GetDataUnchecked(row
-                                                                         ,col-1+iPad
-                                                                         ,time));
+                    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
@@ -386,7 +432,6 @@ Bool_t AliTRDclusterizerV1::MakeClusters()
                   iUnfold = 1;
                 }
 
-
                 Double_t clusterCharge = clusterSignal[0]
                                        + clusterSignal[1]
                                        + clusterSignal[2];
@@ -394,34 +439,30 @@ Bool_t AliTRDclusterizerV1::MakeClusters()
                // The position of the cluster
                 clusterPads[0] = row + 0.5;
                // Take the shift of the additional time bins into account
-                clusterPads[2] = time - nTimeBefore + 0.5;
+                clusterPads[2] = time + 0.5;
 
-                if (fPar->LUTOn()) {
+                
+                if (recParam->LUTOn()) {
                  // Calculate the position of the cluster by using the
                  // lookup table method
-                  clusterPads[1] =
-                                  fPar->LUTposition(iplan,clusterSignal[0]
-                                                          ,clusterSignal[1]
-                                                         ,clusterSignal[2]);
+                  clusterPads[1] = 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<5;i++) padSignal[i]=0;
-                 padSignal[2] = TMath::Abs(digits->GetDataUnchecked(row,col,time));   // central  pad
-                 padSignal[1] = TMath::Abs(digits->GetDataUnchecked(row,col-1,time)); // left     pad
-                 padSignal[3] = TMath::Abs(digits->GetDataUnchecked(row,col+1,time)); // right    pad
-                 if (col>2 &&TMath::Abs(digits->GetDataUnchecked(row,col-2,time)<padSignal[1])){
-                   padSignal[0] = TMath::Abs(digits->GetDataUnchecked(row,col-2,time));
+                 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(digits->GetDataUnchecked(row,col+2,time)<padSignal[3])){
-                   padSignal[4] = TMath::Abs(digits->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));
                  }               
                  clusterPads[1] =  GetCOG(padSignal);
-                 Double_t check = fPar->LUTposition(iplan,clusterSignal[0]
-                                                          ,clusterSignal[1]
-                                                         ,clusterSignal[2]);
-                 //              Float_t diff = clusterPads[1] -  check;
 
                }
 
@@ -431,31 +472,48 @@ Bool_t AliTRDclusterizerV1::MakeClusters()
                 Double_t clusterSigmaY2 = (q1*(q0+q2)+4*q0*q2) /
                                           (clusterCharge*clusterCharge);
 
-               // Calculate the position and the error
+
+               
+                // Calculate the position and the error
+               
+                // correct for t0
+               Int_t clusterTimeBin = TMath::Nint(time - calibration->GetT0(idet, col, row));
+
                 Double_t colSize = padPlane->GetColSize(col);
                 Double_t rowSize = padPlane->GetRowSize(row);
                 Double_t clusterPos[3];
-               clusterPos[0] = padPlane->GetColPos(col) + (clusterPads[1]-0.5)*colSize;  // MI change
-               clusterPos[1] = padPlane->GetRowPos(row) -0.5*rowSize; //MI change
-                clusterPos[2] = clusterPads[2];
+               clusterPos[0] = padPlane->GetColPos(col) - (clusterPads[1]+0.5)*colSize;  // MI change
+               clusterPos[1] = padPlane->GetRowPos(row) - 0.5*rowSize; //MI change
+                clusterPos[2] = CalcXposFromTimebin(clusterPads[2], idet, col, row);
                 Double_t clusterSig[2];
                 clusterSig[0] = (clusterSigmaY2 + 1./12.) * colSize*colSize;
                 clusterSig[1] = rowSize * rowSize / 12.;                                       
+                
+                
                 // Add the cluster to the output array 
-                AddCluster(clusterPos
-                         ,idet
+                AliTRDcluster * cluster = AddCluster(clusterPos
+                          ,clusterTimeBin
+                          ,idet
                          ,clusterCharge
                          ,clusterTracks
                          ,clusterSig
-                          ,iType,clusterPads[1]);
-
+                         ,iType,clusterPads[1]);
+               //
+               //
+               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)));
+               }
+               cluster->SetSignals(signals);
               }
             } 
           }   
-        }     
+        }
+
+        delete digitsOut;
 
-       // Compress the arrays
-        digits->Compress(1,0);
+        // Compress the arrays
         track0->Compress(1,0);
        track1->Compress(1,0);
         track2->Compress(1,0);
@@ -472,10 +530,13 @@ Bool_t AliTRDclusterizerV1::MakeClusters()
     printf("Done.\n");
   }
 
+  //delete digitsIn;
+
   return kTRUE;
 
 }
 
+//_____________________________________________________________________________
 Double_t AliTRDclusterizerV1::GetCOG(Double_t signal[5])
 {
   //
@@ -486,8 +547,6 @@ Double_t AliTRDclusterizerV1::GetCOG(Double_t signal[5])
   return res;            
 }
 
-
-
 //_____________________________________________________________________________
 Double_t AliTRDclusterizerV1::Unfold(Double_t eps, Int_t plane, Double_t* padSignal)
 {
@@ -498,6 +557,14 @@ Double_t AliTRDclusterizerV1::Unfold(Double_t eps, Int_t plane, Double_t* padSig
   // The resulting ratio is then returned to the calling method.
   //
 
+  AliTRDcalibDB* calibration = AliTRDcalibDB::Instance();
+  if (!calibration)
+  {
+    printf("<AliTRDclusterizerMI::Unfold> ");
+    printf("ERROR getting instance of AliTRDcalibDB");
+    return kFALSE;  
+  }
+  
   Int_t   irc                = 0;
   Int_t   itStep             = 0;      // Count iteration steps
 
@@ -521,14 +588,14 @@ Double_t AliTRDclusterizerV1::Unfold(Double_t eps, Int_t plane, Double_t* padSig
                       / ((1-ratio)*padSignal[2] + padSignal[3] + padSignal[4]);
 
     // Set cluster charge ratio
-    irc = fPar->PadResponse(1.0,maxLeft ,plane,newSignal);
+    irc = calibration->PadResponse(1.0,maxLeft ,plane,newSignal);
     Double_t ampLeft  = padSignal[1] / newSignal[1];
-    irc = fPar->PadResponse(1.0,maxRight,plane,newSignal);
+    irc = calibration->PadResponse(1.0,maxRight,plane,newSignal);
     Double_t ampRight = padSignal[3] / newSignal[1];
 
     // Apply pad response to parameters
-    irc = fPar->PadResponse(ampLeft ,maxLeft ,plane,newLeftSignal );
-    irc = fPar->PadResponse(ampRight,maxRight,plane,newRightSignal);
+    irc = calibration->PadResponse(ampLeft ,maxLeft ,plane,newLeftSignal );
+    irc = calibration->PadResponse(ampRight,maxRight,plane,newRightSignal);
 
     // Calculate new overlapping ratio
     ratio = TMath::Min((Double_t)1.0,newLeftSignal[2] / 
@@ -540,3 +607,141 @@ Double_t AliTRDclusterizerV1::Unfold(Double_t eps, Int_t plane, Double_t* padSig
 
 }
 
+//_____________________________________________________________________________
+void AliTRDclusterizerV1::Transform(AliTRDdataArrayI* digitsIn,
+                                   AliTRDdataArrayF* digitsOut,
+                                   Int_t idet, Int_t nRowMax,
+                                   Int_t nColMax, Int_t nTimeTotal,
+                                   Float_t ADCthreshold)
+{
+
+  //
+  // Apply gain factor
+  // Apply tail cancellation: Transform digitsIn to digitsOut
+  //
+
+
+  AliTRDRecParam* recParam = AliTRDRecParam::Instance();
+  if (!recParam)
+  {
+    printf("<AliTRDclusterizerV1::Transform> ");
+    printf("ERROR getting instance of AliTRDRecParam");
+    return;
+  }
+  AliTRDcalibDB* calibration = AliTRDcalibDB::Instance();
+
+  Double_t *inADC  = new Double_t[nTimeTotal];  // adc data before tail cancellation
+  Double_t *outADC = new Double_t[nTimeTotal];  // adc data after tail cancellation
+
+  if (fVerbose > 0) {
+    printf("<AliTRDclusterizerV1::Transform> ");
+    printf("Tail cancellation (nExp = %d) for detector %d.\n",
+          recParam->GetTCnexp(),idet);
+  }
+
+  for (Int_t iRow  = 0; iRow  <  nRowMax;   iRow++ ) {
+    for (Int_t iCol  = 0; iCol  <  nColMax;   iCol++ ) {
+      for (Int_t iTime = 0; iTime < nTimeTotal; iTime++) {
+       //
+       // add gain
+       //
+       Double_t gain = calibration->GetGainFactor(idet, iCol, iRow);
+       if (gain==0) {
+         AliError("Not a valid gain\n");
+       }
+       inADC[iTime]  = digitsIn->GetDataUnchecked(iRow, iCol, iTime);
+
+        inADC[iTime] /= gain;
+        outADC[iTime] = inADC[iTime];
+      }
+
+      // Apply the tail cancelation via the digital filter
+      if (recParam->TCOn())
+      {
+       DeConvExp(inADC,outADC,nTimeTotal,recParam->GetTCnexp());
+      }
+
+      for (Int_t iTime = 0; iTime < nTimeTotal; iTime++) {
+       // Store the amplitude of the digit if above threshold
+       if (outADC[iTime] > ADCthreshold) {
+         if (fVerbose > 1)
+         {
+           printf("  iRow = %d, iCol = %d, iTime = %d, adc = %f\n"
+                  ,iRow,iCol,iTime,outADC[iTime]);
+         }
+         digitsOut->SetDataUnchecked(iRow,iCol,iTime,outADC[iTime]);
+       }
+
+      }
+
+    }
+
+  }
+
+  delete [] inADC;
+  delete [] outADC;
+
+  return;
+
+}
+
+
+//_____________________________________________________________________________
+void AliTRDclusterizerV1::DeConvExp(Double_t *source, Double_t *target,
+                                   Int_t n, Int_t nexp) 
+{
+  //
+  // Tail Cancellation by Deconvolution for PASA v4 TRF
+  //
+
+  Double_t rates[2];
+  Double_t coefficients[2];
+
+  // initialize (coefficient = alpha, rates = lambda)
+
+  Double_t R1 = 1.0;
+  Double_t R2 = 1.0;
+  Double_t C1 = 0.5;
+  Double_t C2 = 0.5;
+
+  if (nexp == 1) {   // 1 Exponentials
+    R1 = 1.156;
+    R2 = 0.130;
+    C1 = 0.066;
+    C2 = 0.000;
+  }
+  if (nexp == 2) {   // 2 Exponentials
+    R1 = 1.156;
+    R2 = 0.130;
+    C1 = 0.114;
+    C2 = 0.624;
+  }
+
+  coefficients[0] = C1;
+  coefficients[1] = C2;
+
+  Double_t Dt = 0.100;
+
+  rates[0] = TMath::Exp(-Dt/(R1));
+  rates[1] = TMath::Exp(-Dt/(R2));
+  
+  Int_t i, k;
+  Double_t reminder[2];
+  Double_t correction, result;
+
+  /* attention: computation order is important */
+  correction=0.0;
+
+  for ( k=0; k<nexp; k++ ) reminder[k]=0.0;
+
+  for ( i=0; i<n; i++ ) {
+    result = ( source[i] - correction );    // no rescaling
+    target[i] = result;
+
+    for ( k=0; k<nexp; k++ ) reminder[k] = rates[k] *
+                              ( reminder[k] + coefficients[k] * result);
+    correction=0.0;
+    for ( k=0; k<nexp; k++ ) correction += reminder[k];
+  }
+
+}