Merge AliTRDRecParam AliTRDrecoParam
authorcblume <cblume@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 28 Feb 2008 11:53:37 +0000 (11:53 +0000)
committercblume <cblume@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 28 Feb 2008 11:53:37 +0000 (11:53 +0000)
TRD/AliTRDRecParam.cxx [deleted file]
TRD/AliTRDRecParam.h [deleted file]
TRD/AliTRDclusterizer.cxx
TRD/AliTRDclusterizer.h
TRD/AliTRDrecoParam.cxx
TRD/AliTRDrecoParam.h
TRD/TRDrecLinkDef.h
TRD/libTRDrec.pkg

diff --git a/TRD/AliTRDRecParam.cxx b/TRD/AliTRDRecParam.cxx
deleted file mode 100644 (file)
index 3026c1f..0000000
+++ /dev/null
@@ -1,398 +0,0 @@
-/**************************************************************************
- * 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$ */
-
-///////////////////////////////////////////////////////////////////////////////
-//                                                                           //
-// Class containing constant reconstruction parameters                       //
-//                                                                           //
-// Request an instance with AliTRDRecParam::Instance()                       //
-// Then request the needed values                                            //
-//                                                                           //
-///////////////////////////////////////////////////////////////////////////////
-
-#include "AliTRDRecParam.h"
-
-ClassImp(AliTRDRecParam)
-
-AliTRDRecParam* AliTRDRecParam::fgInstance = 0;
-Bool_t AliTRDRecParam::fgTerminated = kFALSE;
-
-//_ singleton implementation __________________________________________________
-AliTRDRecParam* AliTRDRecParam::Instance() 
-{
-  //
-  // Singleton implementation
-  // Returns an instance of this class, it is created if neccessary
-  // 
-  
-  if (fgTerminated != kFALSE) {
-    return 0;
-  }
-
-  if (fgInstance == 0) {
-    fgInstance = new AliTRDRecParam();
-  }  
-
-  return fgInstance;
-
-}
-
-//_____________________________________________________________________________
-void AliTRDRecParam::Terminate()
-{
-  //
-  // Singleton implementation
-  // Deletes the instance of this class and sets the terminated flag,
-  // instances cannot be requested anymore
-  // This function can be called several times.
-  //
-  
-  fgTerminated = kTRUE;
-  
-  if (fgInstance != 0) {
-    delete fgInstance;
-    fgInstance = 0;
-  }
-
-}
-
-//_____________________________________________________________________________
-AliTRDRecParam::AliTRDRecParam()
-  :TObject()
-  ,fClusMaxThresh(0)
-  ,fClusSigThresh(0)
-  ,fLUTOn(kFALSE)
-  ,fLUTbin(0)
-  ,fLUT(0)
-  ,fTCOn(kFALSE)
-  ,fTCnexp(0)
-{
-  //
-  // Constructor
-  //
-    
-  Init();
-
-}
-
-//_____________________________________________________________________________
-AliTRDRecParam::~AliTRDRecParam() 
-{
-  //
-  // Destructor
-  //
-  
-  if (fLUT) {
-    delete [] fLUT;
-    fLUT = 0;
-  }
-
-}
-
-//_____________________________________________________________________________
-AliTRDRecParam::AliTRDRecParam(const AliTRDRecParam &p)
-  :TObject(p)
-  ,fClusMaxThresh(p.fClusMaxThresh)
-  ,fClusSigThresh(p.fClusSigThresh)
-  ,fLUTOn(p.fLUTOn)
-  ,fLUTbin(p.fLUTbin)
-  ,fLUT(0)
-  ,fTCOn(p.fTCOn)
-  ,fTCnexp(p.fTCnexp)
-{
-  //
-  // Copy constructor
-  //
-
-  if (((AliTRDRecParam &) p).fLUT) {
-    delete [] ((AliTRDRecParam &) p).fLUT;
-  }
-  ((AliTRDRecParam &) p).fLUT = new Float_t[fLUTbin];
-  for (Int_t iBin = 0; iBin < fLUTbin; iBin++) {
-    ((AliTRDRecParam &) p).fLUT[iBin] = fLUT[iBin];
-  }                                                                             
-
-}
-
-//_____________________________________________________________________________
-AliTRDRecParam &AliTRDRecParam::operator=(const AliTRDRecParam &p)
-{
-  //
-  // Assignment operator
-  //
-
-  if (this != &p) {
-    ((AliTRDRecParam &) p).Copy(*this);
-  }
-
-  return *this;
-
-}
-
-//_____________________________________________________________________________
-void AliTRDRecParam::Copy(TObject &p) const
-{
-  //
-  // Copy function
-  //
-  
-  AliTRDRecParam* target = dynamic_cast<AliTRDRecParam*> (&p);
-  if (!target) {
-    return;
-  }  
-
-  target->fLUTOn         = fLUTOn;
-  target->fLUTbin        = fLUTbin;
-      
-  target->fClusMaxThresh = fClusMaxThresh;
-  target->fClusSigThresh = fClusSigThresh;
-  
-  target->fTCOn          = fTCOn;
-  target->fTCnexp        = fTCnexp;
-
-  if (target->fLUT) {
-    delete [] target->fLUT;
-  }
-  target->fLUT = new Float_t[fLUTbin];
-  for (Int_t iBin = 0; iBin < fLUTbin; iBin++) {
-    target->fLUT[iBin] = fLUT[iBin];
-  }
-
-}
-
-//_____________________________________________________________________________
-void AliTRDRecParam::Init() 
-{
-  //
-  // Constructor helper
-  //
-  
-  // The default parameter for the clustering
-  fClusMaxThresh = 4.5;
-  fClusSigThresh = 3.5;
-
-  // Use the LUT
-  fLUTOn         = kTRUE;
-
-  // Create the LUT
-  FillLUT();
-
-  // The tail cancelation
-  fTCOn          = kTRUE;
-
-  // The number of exponentials
-  fTCnexp        = 1;
-
-}
-
-//_____________________________________________________________________________
-void AliTRDRecParam::FillLUT()
-{
-  //
-  // Create the LUT
-  //
-
-  const Int_t kNlut = 128;
-
-  fLUTbin = kNplan * kNlut;
-
-  // The lookup table from Bogdan
-  Float_t lut[kNplan][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 Float_t[fLUTbin];
-
-  for (Int_t iplan = 0; iplan < kNplan; iplan++) {
-    for (Int_t ilut  = 0; ilut  <  kNlut; ilut++  ) {
-      fLUT[iplan*kNlut+ilut] = lut[iplan][ilut];
-    }
-  }
-
-}
-
-//_____________________________________________________________________________
-Double_t AliTRDRecParam::LUTposition(Int_t iplane, 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[kNplan] = { 0.006492, 0.006377, 0.006258
-                          , 0.006144, 0.006030, 0.005980 };
-  Double_t xMax[kNplan] = { 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[iplane] + 0.000005;
-    xmax = xMax[iplane] - 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[iplane*kNlut+ix];
-    }
-       
-  } 
-  else {
-
-    pos = 0.0;
-
-  }
-
-  return pos;
-
-}
diff --git a/TRD/AliTRDRecParam.h b/TRD/AliTRDRecParam.h
deleted file mode 100644 (file)
index 1329f56..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef AliTRDRECPARAM_H
-#define AliTRDRECPARAM_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-///////////////////////////////////////////////////////////////////////////////
-//                                                                           //
-// Class containing constant reconstruction parameters                       //
-//                                                                           //
-///////////////////////////////////////////////////////////////////////////////
-
-/* $Id$ */
-
-#include "TObject.h"
-
-class AliTRDRecParam : public TObject {
-
- public:
-
-  static  AliTRDRecParam *Instance();
-  static  void Terminate();
-  
-  enum { kNplan =   6
-       , kNcham =   5
-       , kNsect =  18
-       , kNdet  = 540 };
-    
-  AliTRDRecParam(const AliTRDRecParam &p);   
-  AliTRDRecParam &operator=(const AliTRDRecParam &p);
-  virtual void     Copy(TObject &p) const;
-  
-  virtual void     SetLUT(Int_t lutOn = 1)                        { fLUTOn         = lutOn;  };
-  virtual void     SetClusMaxThresh(Float_t thresh)               { fClusMaxThresh = thresh; };
-  virtual void     SetClusSigThresh(Float_t thresh)               { fClusSigThresh = thresh; };
-          void     SetTailCancelation(Int_t tcOn = 1)             { fTCOn          = tcOn;   };
-          void     SetNexponential(Int_t nexp)                    { fTCnexp        = nexp;   };
-          Bool_t   LUTOn() const                                  { return fLUTOn;           };
-  virtual Float_t  GetClusMaxThresh() const                       { return fClusMaxThresh;   };
-  virtual Float_t  GetClusSigThresh() const                       { return fClusSigThresh;   };
-          Bool_t   TCOn() const                                   { return fTCOn;            };
-          Int_t    GetTCnexp() const                              { return fTCnexp;          };
-    
-  virtual Double_t LUTposition(Int_t iplane, Double_t ampL, Double_t ampC, Double_t ampR) const;
-  
- protected:
-
-  static  AliTRDRecParam *fgInstance; //  Instance of this class (singleton implementation)
-  static  Bool_t   fgTerminated;      //  Defines if this class has already been terminated and
-                                      //  therefore does not return instances in GetInstance anymore
-    
-          void     Init();
-  virtual void     FillLUT();
-  
-          // Clusterization parameter
-          Float_t  fClusMaxThresh;    //  Threshold value for cluster maximum
-          Float_t  fClusSigThresh;    //  Threshold value for cluster signal
-    
-          Int_t    fLUTOn;            //  Switch for the lookup table method
-          Int_t    fLUTbin;           //  Number of bins of the LUT
-          Float_t *fLUT;              //! The lookup table
-  
-          Int_t    fTCOn;             //  Switch for the tail cancelation
-          Int_t    fTCnexp;           //  Number of exponentials, digital filter
-  
- private:
-
-  // This is a singleton, constructor is private!  
-  AliTRDRecParam();
-  virtual ~AliTRDRecParam();
-  
-  ClassDef(AliTRDRecParam,1)          //  The reconstruction parameter
-
-};
-
-#endif
index 528034d..961403e 100644 (file)
@@ -36,6 +36,7 @@
 
 #include "AliTRDclusterizer.h"
 #include "AliTRDcluster.h"
+#include "AliTRDReconstructor.h"
 #include "AliTRDgeometry.h"
 #include "AliTRDdataArrayF.h"
 #include "AliTRDdataArrayI.h"
 #include "AliTRDdigitsManager.h"
 #include "AliTRDrawData.h"
 #include "AliTRDcalibDB.h"
-#include "AliTRDSimParam.h"
-#include "AliTRDRecParam.h"
+#include "AliTRDrecoParam.h"
 #include "AliTRDCommonParam.h"
 #include "AliTRDtransform.h"
 #include "AliTRDSignalIndex.h"
 #include "AliTRDrawStreamBase.h"
-// #include "AliTRDRawStream.h"
-// #include "AliTRDRawStreamV2.h"
 #include "AliTRDfeeParam.h"
 
 #include "Cal/AliTRDCalROC.h"
@@ -70,6 +68,8 @@ AliTRDclusterizer::AliTRDclusterizer()
   ,fIndexesOut(NULL)
   ,fIndexesMaxima(NULL)
   ,fTransform(new AliTRDtransform(0))
+  ,fLUTbin(0)
+  ,fLUT(NULL)
 {
   //
   // AliTRDclusterizer default constructor
@@ -91,6 +91,8 @@ AliTRDclusterizer::AliTRDclusterizer(const Text_t *name, const Text_t *title)
   ,fIndexesOut(NULL)
   ,fIndexesMaxima(NULL)
   ,fTransform(new AliTRDtransform(0))
+  ,fLUTbin(0)
+  ,fLUT(NULL)
 {
   //
   // AliTRDclusterizer constructor
@@ -100,6 +102,8 @@ AliTRDclusterizer::AliTRDclusterizer(const Text_t *name, const Text_t *title)
 
   fRawVersion = AliTRDfeeParam::Instance()->GetRAWversion();
 
+  FillLUT();
+
 }
 
 //_____________________________________________________________________________
@@ -114,11 +118,15 @@ AliTRDclusterizer::AliTRDclusterizer(const AliTRDclusterizer &c)
   ,fIndexesOut(NULL)
   ,fIndexesMaxima(NULL)
   ,fTransform(NULL)
+  ,fLUTbin(0)
+  ,fLUT(0)
 {
   //
   // AliTRDclusterizer copy constructor
   //
 
+  FillLUT();
+
 }
 
 //_____________________________________________________________________________
@@ -158,6 +166,12 @@ AliTRDclusterizer::~AliTRDclusterizer()
       fTransform     = NULL;
     }
 
+  if (fLUT) 
+    {
+      delete [] fLUT;
+      fLUT           = NULL;
+    }
+
 }
 
 //_____________________________________________________________________________
@@ -190,6 +204,8 @@ void AliTRDclusterizer::Copy(TObject &c) const
   ((AliTRDclusterizer &) c).fIndexesOut    = NULL;
   ((AliTRDclusterizer &) c).fIndexesMaxima = NULL;
   ((AliTRDclusterizer &) c).fTransform     = NULL;
+  ((AliTRDclusterizer &) c).fLUTbin        = 0;
+  ((AliTRDclusterizer &) c).fLUT           = NULL;
 
 }
 
@@ -510,138 +526,8 @@ Bool_t AliTRDclusterizer::Raw2Clusters(AliRawReader *rawReader)
   // Creates clusters from raw data
   //
 
-//   AliTRDdataArrayS *digits = 0;
-//   AliTRDdataArrayI *track0 = 0;
-//   AliTRDdataArrayI *track1 = 0;
-//   AliTRDdataArrayI *track2 = 0; 
-
-//   AliTRDSignalIndex *indexes = 0;
-
-//   // Create the digits manager
-//   if (!fDigitsManager)
-//     {
-//       fDigitsManager = new AliTRDdigitsManager();
-//       fDigitsManager->CreateArrays();
-//     }
-
-// //   AliTRDRawStreamV2 input(rawReader);
-// //   input.SetRawVersion( fRawVersion );
-// //   input.Init();
-//   AliTRDrawStreamBase &input = *AliTRDrawStreamBase::GetRawStream(rawReader);
+  return Raw2ClustersChamber(rawReader);
 
-//   AliInfo(Form("Stream version: %s", input.IsA()->GetName()));
-
-//   // Loop through the digits
-//   Int_t lastdet = -1;
-//   Int_t det     =  0;
-//   Int_t it      =  0;
-//   while (input.Next()) 
-//     {
-
-//       det = input.GetDet();
-
-//       if (det != lastdet) 
-//     {
-       
-//       if (lastdet != -1)
-//         {
-//           digits = (AliTRDdataArrayS *) 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 = (AliTRDdataArrayS *) fDigitsManager->GetDigits(det);
-//       track0 = (AliTRDdataArrayI *) fDigitsManager->GetDictionary(det,0);
-//       track1 = (AliTRDdataArrayI *) fDigitsManager->GetDictionary(det,1);
-//       track2 = (AliTRDdataArrayI *) fDigitsManager->GetDictionary(det,2);
-
-//       // Allocate memory space for the digits buffer
-//       if (!digits->HasData()) 
-//         {
-//           //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 (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);
-//     }
-//     }
-
-//   delete fDigitsManager;
-//   fDigitsManager = NULL;
-//   return kTRUE;
-
-return Raw2ClustersChamber(rawReader);
 }
 
 //_____________________________________________________________________________
@@ -660,9 +546,6 @@ Bool_t AliTRDclusterizer::Raw2ClustersChamber(AliRawReader *rawReader)
 
   fDigitsManager->SetUseDictionaries(fAddLabels);
 
-//   AliTRDRawStreamV2 input(rawReader);
-//   input.SetRawVersion( fRawVersion );
-//   input.Init();
   AliTRDrawStreamBase *pinput = AliTRDrawStreamBase::GetRawStream(rawReader);
   AliTRDrawStreamBase &input = *pinput;
 
@@ -727,21 +610,14 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det)
       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; 
 
   // Threshold value for the maximum
-  Float_t maxThresh      = recParam->GetClusMaxThresh();
+  Float_t maxThresh      = AliTRDReconstructor::RecoParam()->GetClusMaxThresh();
   // Threshold value for the digit signal
-  Float_t sigThresh      = recParam->GetClusSigThresh();
+  Float_t sigThresh      = AliTRDReconstructor::RecoParam()->GetClusSigThresh();
 
   // Iteration limit for unfolding procedure
   const Float_t kEpsilon = 0.01;             
@@ -933,14 +809,13 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det)
 
          // The position of the cluster in COL direction relative to the center pad (pad units)
           Double_t clusterPosCol = 0.0;
-         if (recParam->LUTOn()) 
+         if (AliTRDReconstructor::RecoParam()->LUTOn()) 
             {
              // Calculate the position of the cluster by using the
              // lookup table method
-             clusterPosCol = recParam->LUTposition(iplan
-                                                   ,clusterSignal[0]
-                                                   ,clusterSignal[1]
-                                                  ,clusterSignal[2]);
+             clusterPosCol = LUTposition(iplan,clusterSignal[0]
+                                               ,clusterSignal[1]
+                                              ,clusterSignal[2]);
            }
          else 
             {
@@ -1226,13 +1101,6 @@ void AliTRDclusterizer::TailCancelation(AliTRDdataArrayS *digitsIn
   Int_t iCol  = 0;
   Int_t iTime = 0;
 
-  AliTRDRecParam *recParam = AliTRDRecParam::Instance();
-  if (!recParam) 
-    {
-      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();
@@ -1251,9 +1119,9 @@ void AliTRDclusterizer::TailCancelation(AliTRDdataArrayS *digitsIn
        }
 
       // Apply the tail cancelation via the digital filter
-      if (recParam->TCOn()) 
+      if (AliTRDReconstructor::RecoParam()->TCOn()) 
         {
-         DeConvExp(inADC,outADC,nTimeTotal,recParam->GetTCnexp());
+         DeConvExp(inADC,outADC,nTimeTotal,AliTRDReconstructor::RecoParam()->GetTCnexp());
         }
 
       indexesIn->ResetTbinCounter();
@@ -1371,3 +1239,201 @@ TObjArray *AliTRDclusterizer::RecPoints()
   return fRecPoints;
 
 }
+
+//_____________________________________________________________________________
+void AliTRDclusterizer::FillLUT()
+{
+  //
+  // Create the LUT
+  //
+
+  const Int_t kNlut = 128;
+
+  fLUTbin = AliTRDgeometry::kNplan * kNlut;
+
+  // The lookup table from Bogdan
+  Float_t lut[AliTRDgeometry::kNplan][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 iplan = 0; iplan < AliTRDgeometry::kNplan; iplan++) {
+    for (Int_t ilut  = 0; ilut  <  kNlut; ilut++  ) {
+      fLUT[iplan*kNlut+ilut] = lut[iplan][ilut];
+    }
+  }
+
+}
+
+//_____________________________________________________________________________
+Double_t AliTRDclusterizer::LUTposition(Int_t iplane, 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::kNplan] = { 0.006492, 0.006377, 0.006258
+                                          , 0.006144, 0.006030, 0.005980 };
+  Double_t xMax[AliTRDgeometry::kNplan] = { 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[iplane] + 0.000005;
+    xmax = xMax[iplane] - 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[iplane*kNlut+ix];
+    }
+       
+  } 
+  else {
+
+    pos = 0.0;
+
+  }
+
+  return pos;
+
+}
index 87d2822..280f515 100644 (file)
@@ -79,6 +79,8 @@ class AliTRDclusterizer : public TNamed {
                                 , Float_t calGainFactorDetValue);
   virtual Double_t Unfold(Double_t eps, Int_t plane, Double_t *padSignal);
           Double_t GetCOG(Double_t signal[5]) const; 
+          void     FillLUT();
+          Double_t LUTposition(Int_t iplane, Double_t ampL, Double_t ampC, Double_t ampR) const;
 
   virtual void     ResetHelperIndexes(AliTRDSignalIndex *indexesIn);
 
@@ -96,7 +98,10 @@ class AliTRDclusterizer : public TNamed {
 
   AliTRDtransform     *fTransform;           //! Transforms the reconstructed space points
 
-  ClassDef(AliTRDclusterizer,5)              //  TRD clusterfinder
+  Int_t                fLUTbin;              //  Number of bins of the LUT
+  Double_t            *fLUT;                 //! The lookup table
+
+  ClassDef(AliTRDclusterizer,6)              //  TRD clusterfinder
 
 };
 
index 4ce768d..bd90e08 100644 (file)
@@ -47,6 +47,11 @@ AliTRDrecoParam::AliTRDrecoParam()
   ,fkChi2Z(30./*14.*//*12.5*/)
   ,fkChi2Y(.25)
   ,fkTrackLikelihood(-15.)
+  ,fClusMaxThresh(4.5)
+  ,fClusSigThresh(3.5)
+  ,fLUTOn(kTRUE)
+  ,fTCOn(kTRUE)
+  ,fTCnexp(1)
 {
   //
   // Default constructor
index 323b50b..f072b2c 100644 (file)
@@ -46,35 +46,55 @@ class AliTRDrecoParam : public AliDetectorRecoParam
        Double_t GetPlaneQualityThreshold() const { return fkPlaneQualityThreshold; }
 
        Double_t GetTrackLikelihood() const       { return fkTrackLikelihood;       }
+
+        Double_t GetClusMaxThresh() const         { return fClusMaxThresh;   };
+        Double_t GetClusSigThresh() const         { return fClusSigThresh;   };
+        Int_t    GetTCnexp() const                { return fTCnexp;          };
+        Bool_t   LUTOn() const                    { return fLUTOn;           };
+        Bool_t   TCOn() const                     { return fTCOn;            };
        
        static   AliTRDrecoParam *GetLowFluxParam();
         static   AliTRDrecoParam *GetHighFluxParam();
-       void     SetClusterSharing(Bool_t share = kTRUE) {fkClusterSharing = share;}
-       void     SetPIDMethod(Int_t pid=1)        { fkPIDMethod = pid ? 1 : 0;}
-       
+
+       void     SetClusterSharing(Bool_t share = kTRUE) { fkClusterSharing = share;  };
+       void     SetPIDMethod(Int_t pid = 1)             { fkPIDMethod = pid ? 1 : 0; };
+        void     SetLUT(Int_t lutOn = 1)                 { fLUTOn           = lutOn;  };
+        void     SetClusMaxThresh(Float_t thresh)        { fClusMaxThresh   = thresh; };
+        void     SetClusSigThresh(Float_t thresh)        { fClusSigThresh   = thresh; };
+        void     SetTailCancelation(Int_t tcOn = 1)      { fTCOn            = tcOn;   };
+        void     SetNexponential(Int_t nexp)             { fTCnexp          = nexp;   };
+
  private:
 
-       Bool_t   fkClusterSharing;        // Toggle cluster sharing
-       Int_t    fkPIDMethod;             // PID method selector 0(LQ) 1(NN)
-       Double_t fkMaxTheta;              // Maximum theta
-       Double_t fkMaxPhi;                // Maximum phi
+       // Tracking parameters
+       Bool_t    fkClusterSharing;        // Toggle cluster sharing
+       Int_t     fkPIDMethod;             // PID method selector 0(LQ) 1(NN)
+       Double_t  fkMaxTheta;              // Maximum theta
+       Double_t  fkMaxPhi;                // Maximum phi
 
-       Double_t fkRoad0y;                // Road for middle cluster
-       Double_t fkRoad0z;                // Road for middle cluster
+       Double_t  fkRoad0y;                // Road for middle cluster
+       Double_t  fkRoad0z;                // Road for middle cluster
 
-       Double_t fkRoad1y;                // Road in y for seeded cluster
-       Double_t fkRoad1z;                // Road in z for seeded cluster
+       Double_t  fkRoad1y;                // Road in y for seeded cluster
+       Double_t  fkRoad1z;                // Road in z for seeded cluster
 
-       Double_t fkRoad2y;                // Road in y for extrapolated cluster
-       Double_t fkRoad2z;                // Road in z for extrapolated cluster
+       Double_t  fkRoad2y;                // Road in y for extrapolated cluster
+       Double_t  fkRoad2z;                // Road in z for extrapolated cluster
        
-       Double_t fkPlaneQualityThreshold; // Quality threshold
-       Double_t fkFindable;              // Ratio of clusters from a track in one chamber which are at minimum supposed to be found.
-       Double_t fkChi2Z;                 // Max chi2 on the z direction for seeding clusters fit
-       Double_t fkChi2Y;                 // Max chi2 on the y direction for seeding clusters Rieman fit
-       Double_t fkTrackLikelihood;       // Track likelihood for tracklets Rieman fit
+       Double_t  fkPlaneQualityThreshold; // Quality threshold
+       Double_t  fkFindable;              // Ratio of clusters from a track in one chamber which are at minimum supposed to be found.
+       Double_t  fkChi2Z;                 // Max chi2 on the z direction for seeding clusters fit
+       Double_t  fkChi2Y;                 // Max chi2 on the y direction for seeding clusters Rieman fit
+       Double_t  fkTrackLikelihood;       // Track likelihood for tracklets Rieman fit
 
-       ClassDef(AliTRDrecoParam, 1)      // Reconstruction parameters for TRD detector
+        // Clusterization parameter
+        Double_t  fClusMaxThresh;          // Threshold value for cluster maximum
+        Double_t  fClusSigThresh;          // Threshold value for cluster signal
+        Int_t     fLUTOn;                  // Switch for the lookup table method  
+        Int_t     fTCOn;                   // Switch for the tail cancelation
+        Int_t     fTCnexp;                 // Number of exponentials, digital filter
+  
+       ClassDef(AliTRDrecoParam, 2)       // Reconstruction parameters for TRD detector
 
 };
 #endif
index 12ba855..2e19f43 100644 (file)
@@ -21,7 +21,6 @@
 #pragma link C++ class  AliTRDpidESD+;
 
 #pragma link C++ class  AliTRDReconstructor+;
-#pragma link C++ class  AliTRDRecParam+;
 
 #pragma link C++ class  AliTRDrecoParam+;
 #pragma link C++ class  AliTRDseedV1+;
index 0535a70..0490862 100644 (file)
@@ -7,7 +7,6 @@ SRCS= AliTRDcluster.cxx \
       AliTRDseed.cxx \
       AliTRDpropagationLayer.cxx \
       AliTRDpidESD.cxx \
-      AliTRDRecParam.cxx \
       AliTRDReconstructor.cxx \
       AliTRDtrackingAnalysis.cxx \
       AliTRDrecoParam.cxx \