Introduce parameter class and regions of interest for merging
authorcblume <cblume@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 25 Mar 2002 20:00:44 +0000 (20:00 +0000)
committercblume <cblume@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 25 Mar 2002 20:00:44 +0000 (20:00 +0000)
TRD/AliTRDdigitizer.cxx
TRD/AliTRDdigitizer.h

index cebf457..f414f94 100644 (file)
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.33  2002/02/12 17:32:03  cblume
+Rearrange the deleting of the list of sdigitsmanager
+
 Revision 1.32  2002/02/12 16:07:21  cblume
 Add new constructor
 
@@ -184,6 +187,7 @@ Add new TRD classes
 #include "AliTRDsegmentArray.h"
 #include "AliTRDdigitsManager.h"
 #include "AliTRDgeometry.h"
+#include "AliTRDparameter.h"
 
 ClassImp(AliTRDdigitizer)
 
@@ -194,58 +198,20 @@ AliTRDdigitizer::AliTRDdigitizer()
   // AliTRDdigitizer default constructor
   //
 
-  fInputFile          = NULL;
-  fDigitsManager      = NULL;
-  fSDigitsManagerList = NULL;
-  fSDigitsManager     = NULL;
-  fTRD                = NULL;
-  fGeo                = NULL;
-  fPRFsmp             = NULL;
-  fTRFsmp             = NULL;
-  fCTsmp              = NULL;
-
+  fInputFile          = 0;
+  fDigitsManager      = 0;
+  fSDigitsManagerList = 0;
+  fSDigitsManager     = 0;
+  fTRD                = 0;
+  fGeo                = 0;
+  fPar                = 0;
   fMasks              = 0;
-
   fEvent              = 0;
-  fGasGain            = 0.0;
-  fNoise              = 0.0;
-  fChipGain           = 0.0;
-  fADCoutRange        = 0.0;
-  fADCinRange         = 0.0;
-  fADCthreshold       = 0;
-  fDiffusionOn        = 0;
-  fDiffusionT         = 0.0;
-  fDiffusionL         = 0.0;
-  fElAttachOn         = 0;
-  fElAttachProp       = 0.0;
-  fExBOn              = 0;
-  fOmegaTau           = 0.0;
-  fPRFOn              = 0;
-  fTRFOn              = 0;
-  fCTOn               = 0;
-  fTCOn               = 0;
-  fDriftVelocity      = 0.0;
-  fPadCoupling        = 0.0;
-  fTimeCoupling       = 0.0;
-  fTimeBinWidth       = 0.0;
-  fField              = 0.0;
-  fTiltingAngle       = 0.0;
-
-  fPRFbin             = 0;
-  fPRFlo              = 0.0;
-  fPRFhi              = 0.0;
-  fPRFwid             = 0.0;
-  fPRFpad             = 0;
-  fTRFbin             = 0;
-  fTRFlo              = 0.0;
-  fTRFhi              = 0.0;
-  fTRFwid             = 0.0;
-  fTCnexp             = 0;
-
   fCompress           = kTRUE;
   fDebug              = 0;
   fSDigits            = kFALSE;
   fSDigitsScale       = 0.0;
+  fMergeSignalOnly    = kFALSE;
 
 }
 
@@ -257,27 +223,22 @@ AliTRDdigitizer::AliTRDdigitizer(const Text_t *name, const Text_t *title)
   // AliTRDdigitizer constructor
   //
 
-  fInputFile          = NULL;
-
-  fDigitsManager      = NULL;
-  fSDigitsManager     = NULL;
-  fSDigitsManagerList = NULL;
-
-  fTRD                = NULL;
-  fGeo                = NULL;
-  fPRFsmp             = NULL;
-  fTRFsmp             = NULL;
-  fCTsmp              = NULL;
-
+  fInputFile          = 0;
+  fDigitsManager      = 0;
+  fSDigitsManagerList = 0;
+  fSDigitsManager     = 0;
+  fTRD                = 0;
+  fGeo                = 0;
+  fPar                = 0;
   fMasks              = 0;
-
   fEvent              = 0;
-
   fCompress           = kTRUE;
   fDebug              = 0;
   fSDigits            = kFALSE;
+  fMergeSignalOnly    = kFALSE;
 
-  Init();
+  // For the summable digits
+  fSDigitsScale       = 100.;
 
 }
 
@@ -290,27 +251,22 @@ AliTRDdigitizer::AliTRDdigitizer(AliRunDigitizer *manager
   // AliTRDdigitizer constructor
   //
 
-  fInputFile          = NULL;
-
-  fDigitsManager      = NULL;
-  fSDigitsManager     = NULL;
-  fSDigitsManagerList = NULL;
-
-  fTRD                = NULL;
-  fGeo                = NULL;
-  fPRFsmp             = NULL;
-  fTRFsmp             = NULL;
-  fCTsmp              = NULL;
-
+  fInputFile          = 0;
+  fDigitsManager      = 0;
+  fSDigitsManagerList = 0;
+  fSDigitsManager     = 0;
+  fTRD                = 0;
+  fGeo                = 0;
+  fPar                = 0;
   fMasks              = 0;
-
   fEvent              = 0;
-
   fCompress           = kTRUE;
   fDebug              = 0;
   fSDigits            = kFALSE;
+  fMergeSignalOnly    = kFALSE;
 
-  Init();
+  // For the summable digits
+  fSDigitsScale       = 100.;
 
 }
 
@@ -322,27 +278,22 @@ AliTRDdigitizer::AliTRDdigitizer(AliRunDigitizer *manager)
   // AliTRDdigitizer constructor
   //
 
-  fInputFile          = NULL;
-
-  fDigitsManager      = NULL;
-  fSDigitsManager     = NULL;
-  fSDigitsManagerList = NULL;
-
-  fTRD                = NULL;
-  fGeo                = NULL;
-  fPRFsmp             = NULL;
-  fTRFsmp             = NULL;
-  fCTsmp              = NULL;
-
+  fInputFile          = 0;
+  fDigitsManager      = 0;
+  fSDigitsManagerList = 0;
+  fSDigitsManager     = 0;
+  fTRD                = 0;
+  fGeo                = 0;
+  fPar                = 0;
   fMasks              = 0;
-
   fEvent              = 0;
-
   fCompress           = kTRUE;
   fDebug              = 0;
   fSDigits            = kFALSE;
+  fMergeSignalOnly    = kFALSE;
 
-  Init();
+  // For the summable digits
+  fSDigitsScale       = 100.;
 
 }
 
@@ -367,37 +318,22 @@ AliTRDdigitizer::~AliTRDdigitizer()
   if (fInputFile) {
     fInputFile->Close();
     delete fInputFile;
-    fInputFile = NULL;
+    fInputFile = 0;
   }
 
   if (fDigitsManager) {
     delete fDigitsManager;
-    fDigitsManager = NULL;
+    fDigitsManager = 0;
   }
 
   if (fSDigitsManager) {
     delete fSDigitsManager;
-    fSDigitsManager = NULL;
+    fSDigitsManager = 0;
   }
 
   if (fSDigitsManagerList) {
     delete fSDigitsManagerList;
-    fSDigitsManagerList = NULL;
-  }
-
-  if (fTRFsmp) {
-    delete [] fTRFsmp;
-    fTRFsmp = NULL;
-  }
-
-  if (fPRFsmp) {
-    delete [] fPRFsmp;
-    fPRFsmp = NULL;
-  }
-
-  if (fCTsmp) {
-    delete [] fCTsmp;
-    fCTsmp  = NULL;
+    fSDigitsManagerList = 0;
   }
 
   if (fMasks) {
@@ -426,193 +362,23 @@ void AliTRDdigitizer::Copy(TObject &d)
   // Copy function
   //
 
-  Int_t iBin;
-
-  ((AliTRDdigitizer &) d).fInputFile          = NULL;
-  ((AliTRDdigitizer &) d).fSDigitsManagerList = NULL;
-  ((AliTRDdigitizer &) d).fSDigitsManager     = NULL;
-  ((AliTRDdigitizer &) d).fDigitsManager      = NULL;
-  ((AliTRDdigitizer &) d).fTRD                = NULL;
-  ((AliTRDdigitizer &) d).fGeo                = NULL;
-
+  ((AliTRDdigitizer &) d).fInputFile          = 0;
+  ((AliTRDdigitizer &) d).fSDigitsManagerList = 0;
+  ((AliTRDdigitizer &) d).fSDigitsManager     = 0;
+  ((AliTRDdigitizer &) d).fDigitsManager      = 0;
+  ((AliTRDdigitizer &) d).fTRD                = 0;
+  ((AliTRDdigitizer &) d).fGeo                = 0;
   ((AliTRDdigitizer &) d).fMasks              = 0;
-
   ((AliTRDdigitizer &) d).fEvent              = 0;
-
-  ((AliTRDdigitizer &) d).fGasGain            = fGasGain;
-  ((AliTRDdigitizer &) d).fNoise              = fNoise;
-  ((AliTRDdigitizer &) d).fChipGain           = fChipGain;
-  ((AliTRDdigitizer &) d).fADCoutRange        = fADCoutRange;
-  ((AliTRDdigitizer &) d).fADCinRange         = fADCinRange;
-  ((AliTRDdigitizer &) d).fADCthreshold       = fADCthreshold;
-  ((AliTRDdigitizer &) d).fDiffusionOn        = fDiffusionOn; 
-  ((AliTRDdigitizer &) d).fDiffusionT         = fDiffusionT;
-  ((AliTRDdigitizer &) d).fDiffusionL         = fDiffusionL;
-  ((AliTRDdigitizer &) d).fElAttachOn         = fElAttachOn;
-  ((AliTRDdigitizer &) d).fElAttachProp       = fElAttachProp;
-  ((AliTRDdigitizer &) d).fExBOn              = fExBOn;
-  ((AliTRDdigitizer &) d).fOmegaTau           = fOmegaTau;
-  ((AliTRDdigitizer &) d).fLorentzFactor      = fLorentzFactor;
-  ((AliTRDdigitizer &) d).fDriftVelocity      = fDriftVelocity;
-  ((AliTRDdigitizer &) d).fPadCoupling        = fPadCoupling;
-  ((AliTRDdigitizer &) d).fTimeCoupling       = fTimeCoupling;
-  ((AliTRDdigitizer &) d).fTimeBinWidth       = fTimeBinWidth;
-  ((AliTRDdigitizer &) d).fField              = fField;
-  ((AliTRDdigitizer &) d).fPRFOn              = fPRFOn;
-  ((AliTRDdigitizer &) d).fTRFOn              = fTRFOn;
-  ((AliTRDdigitizer &) d).fCTOn               = fCTOn;
-  ((AliTRDdigitizer &) d).fTCOn               = fTCOn;
-  ((AliTRDdigitizer &) d).fTiltingAngle       = fTiltingAngle;
-
+  ((AliTRDdigitizer &) d).fPar                = 0;
   ((AliTRDdigitizer &) d).fCompress           = fCompress;
   ((AliTRDdigitizer &) d).fDebug              = fDebug  ;
   ((AliTRDdigitizer &) d).fSDigits            = fSDigits;
   ((AliTRDdigitizer &) d).fSDigitsScale       = fSDigitsScale;
-
-  ((AliTRDdigitizer &) d).fPRFbin             = fPRFbin;
-  ((AliTRDdigitizer &) d).fPRFlo              = fPRFlo;
-  ((AliTRDdigitizer &) d).fPRFhi              = fPRFhi;
-  ((AliTRDdigitizer &) d).fPRFwid             = fPRFwid;
-  ((AliTRDdigitizer &) d).fPRFpad             = fPRFpad;
-  if (((AliTRDdigitizer &) d).fPRFsmp) delete [] ((AliTRDdigitizer &) d).fPRFsmp;
-  ((AliTRDdigitizer &) d).fPRFsmp = new Float_t[fPRFbin];
-  for (iBin = 0; iBin < fPRFbin; iBin++) {
-    ((AliTRDdigitizer &) d).fPRFsmp[iBin] = fPRFsmp[iBin];
-  }                                                                             
-  ((AliTRDdigitizer &) d).fTRFbin             = fTRFbin;
-  ((AliTRDdigitizer &) d).fTRFlo              = fTRFlo;
-  ((AliTRDdigitizer &) d).fTRFhi              = fTRFhi;
-  ((AliTRDdigitizer &) d).fTRFwid             = fTRFwid;
-  if (((AliTRDdigitizer &) d).fTRFsmp) delete [] ((AliTRDdigitizer &) d).fTRFsmp;
-  ((AliTRDdigitizer &) d).fTRFsmp = new Float_t[fTRFbin];
-  for (iBin = 0; iBin < fTRFbin; iBin++) {
-    ((AliTRDdigitizer &) d).fTRFsmp[iBin] = fTRFsmp[iBin];
-  }                                      
-
-  if (((AliTRDdigitizer &) d).fCTsmp)  delete [] ((AliTRDdigitizer &) d).fCTsmp;
-  ((AliTRDdigitizer &) d).fCTsmp  = new Float_t[fTRFbin];
-  for (iBin = 0; iBin < fTRFbin; iBin++) {
-    ((AliTRDdigitizer &) d).fCTsmp[iBin]  = fCTsmp[iBin];
-  }                                      
-
-  ((AliTRDdigitizer &) d).fTCnexp             = fTCnexp;
+  ((AliTRDdigitizer &) d).fMergeSignalOnly    = fMergeSignalOnly;
                                       
 }
 
-//_____________________________________________________________________________
-Float_t AliTRDdigitizer::CrossTalk(Float_t time)
-{
-  //
-  // Applies the pad-pad capacitive cross talk
-  //
-
-  Int_t iBin = ((Int_t) ((time - fTRFlo) / fTRFwid)); 
-  if ((iBin >= 0) && (iBin < fTRFbin)) {
-    return fCTsmp[iBin];
-  }
-  else {
-    return 0.0;
-  }    
-
-}
-
-//_____________________________________________________________________________
-Int_t AliTRDdigitizer::Diffusion(Float_t driftlength, Float_t *xyz)
-{
-  //
-  // Applies the diffusion smearing to the position of a single electron
-  //
-
-  Float_t driftSqrt = TMath::Sqrt(driftlength);
-  Float_t sigmaT = driftSqrt * fDiffusionT;
-  Float_t sigmaL = driftSqrt * fDiffusionL;
-  xyz[0] = gRandom->Gaus(xyz[0], sigmaL * fLorentzFactor);
-  xyz[1] = gRandom->Gaus(xyz[1], sigmaT * fLorentzFactor);
-  xyz[2] = gRandom->Gaus(xyz[2], sigmaT);
-
-  return 1;
-
-}
-
-//_____________________________________________________________________________
-Int_t AliTRDdigitizer::ExB(Float_t driftlength, Float_t *xyz)
-{
-  //
-  // Applies E x B effects to the position of a single electron
-  //
-
-  xyz[0] = xyz[0];
-  xyz[1] = xyz[1] + fOmegaTau * driftlength;
-  xyz[2] = xyz[2];
-
-  return 1;
-
-}
-
-//_____________________________________________________________________________
-Int_t AliTRDdigitizer::PadResponse(Float_t signal, Float_t dist
-                                 , Int_t plane, Float_t *pad)
-{
-  //
-  // Applies the pad response
-  //
-
-  const Int_t kNplan = AliTRDgeometry::kNplan;
-
-  Int_t iBin  = ((Int_t) (( - dist - fPRFlo) / fPRFwid));
-  Int_t iOff  = plane * fPRFbin;
-
-  Int_t iBin0 = iBin - fPRFpad + iOff;
-  Int_t iBin1 = iBin           + iOff;
-  Int_t iBin2 = iBin + fPRFpad + iOff;
-
-  if ((iBin0 >= 0) && (iBin2 < (fPRFbin*kNplan))) {
-
-    pad[0] = signal * fPRFsmp[iBin0];
-    pad[1] = signal * fPRFsmp[iBin1];
-    pad[2] = signal * fPRFsmp[iBin2];
-
-    return 1;
-
-  }
-  else {
-
-    return 0;
-
-  }
-
-}
-
-//_____________________________________________________________________________
-Float_t AliTRDdigitizer::TimeResponse(Float_t time)
-{
-  //
-  // Applies the preamp shaper time response
-  //
-
-  Int_t iBin = ((Int_t) ((time - fTRFlo) / fTRFwid)); 
-  if ((iBin >= 0) && (iBin < fTRFbin)) {
-    return fTRFsmp[iBin];
-  }
-  else {
-    return 0.0;
-  }    
-
-}
-
-//_____________________________________________________________________________
-Float_t AliTRDdigitizer::Col0Tilted(Float_t col0, Float_t rowOffset
-                                  , Int_t plane)
-{
-  //
-  // Calculates col0 for tilted pads
-  //
-
-  Float_t diff = fTiltingAngle * rowOffset;
-  return (col0 + TMath::Power(-1.0,plane) * diff);
-
-}
-
 //_____________________________________________________________________________
 void AliTRDdigitizer::Exec(Option_t* option)
 {
@@ -634,14 +400,36 @@ void AliTRDdigitizer::Exec(Option_t* option)
     printf("Called with debug option %d\n",fDebug);
   }
 
+  // Connect the AliRoot file containing Geometry, Kine, and Hits
+  fInputFile = (TFile *) fManager->GetInputTreeTRDS(0)->GetCurrentFile();
+  if (!fInputFile) {
+    if (fDebug > 0) {
+      printf("<AliTRDdigitizer::Exec> ");
+      printf("Cannot open the input file %s.\n",fInputFile->GetName());
+    }
+  }
+
+  if (gAlice) {
+    delete gAlice;
+    gAlice = 0;
+  }
+  gAlice = (AliRun *) fInputFile->Get("gAlice");
+  if (gAlice) {
+    if (fDebug > 0) {
+      printf("<AliTRDdigitizer::Exec> ");
+      printf("AliRun object found on file.\n");
+    }
+  }
+  else {
+    printf("<AliTRDdigitizer::Exec> ");
+    printf("Could not find AliRun object.\n");
+  }
+
   Int_t nInput = fManager->GetNinputs();
   fMasks = new Int_t[nInput];
   for (iInput = 0; iInput < nInput; iInput++) {
     fMasks[iInput] = fManager->GetMask(iInput);
   }
-  
-  // Set the event number
-  fEvent = gAlice->GetEvNumber();
 
   // Initialization
   InitDetector();
@@ -687,480 +475,6 @@ void AliTRDdigitizer::Exec(Option_t* option)
 
 }
 
-//_____________________________________________________________________________
-Bool_t AliTRDdigitizer::Init()
-{
-  //
-  // Initializes the digitization procedure with standard values
-  //
-
-  // The default parameter for the digitization
-  fGasGain        = 2800.;
-  fChipGain       = 6.1;
-  fNoise          = 1000.;
-  fADCoutRange    = 1023.;          // 10-bit ADC
-  fADCinRange     = 1000.;          // 1V input range
-  fADCthreshold   = 1;
-
-  // For the summable digits
-  fSDigitsScale   = 100.;
-
-  // The drift velocity (cm / mus)
-  fDriftVelocity  = 1.5;
-
-  // Diffusion on
-  fDiffusionOn    = 1;
-
-  // E x B effects
-  fExBOn          = 0;
-
-  // Propability for electron attachment
-  fElAttachOn     = 0;
-  fElAttachProp   = 0.0;
-
-  // The pad response function
-  fPRFOn          = 1;
-
-  // The time response function
-  fTRFOn          = 1;
-
-  // The cross talk
-  fCTOn           = 0;
-
-  // The tail cancelation
-  fTCOn           = 1;
-  
-  // The number of exponentials
-  fTCnexp         = 2;
-
-  // The pad coupling factor (same number as for the TPC)
-  fPadCoupling    = 0.5;
-
-  // The time coupling factor (same number as for the TPC)
-  fTimeCoupling   = 0.4;
-
-  // The tilting angle for the readout pads
-  SetTiltingAngle(5.0);
-
-  return kTRUE;
-
-}
-
-//_____________________________________________________________________________
-Bool_t AliTRDdigitizer::ReInit()
-{
-  //
-  // Reinitializes the digitization procedure after a change in the parameter
-  //
-
-  if (!fGeo) {
-    printf("AliTRDdigitizer::ReInit -- ");
-    printf("No geometry defined. Run InitDetector() first\n");
-    return kFALSE;
-  }
-
-  // Calculate the time bin width in ns
-  fTimeBinWidth   = fGeo->GetTimeBinSize() / fDriftVelocity * 1000.0;
-
-  // The range and the binwidth for the sampled TRF 
-  fTRFbin = 100;
-  // Start 0.2 mus before the signal
-  fTRFlo  = -0.2 * fDriftVelocity;
-  // End the maximum driftlength after the signal 
-  fTRFhi  = AliTRDgeometry::DrThick() 
-          + fGeo->GetTimeAfter() * fGeo->GetTimeBinSize();
-  fTRFwid = (fTRFhi - fTRFlo) / ((Float_t) fTRFbin);
-
-  // Transverse and longitudinal diffusion coefficients (Xe/CO2)
-  fDiffusionT     = GetDiffusionT(fDriftVelocity,fField);
-  fDiffusionL     = GetDiffusionL(fDriftVelocity,fField);
-
-  // omega * tau.= tan(Lorentz-angle)
-  fOmegaTau       = GetOmegaTau(fDriftVelocity,fField);
-
-  // The Lorentz factor
-  if (fExBOn) {
-    fLorentzFactor = 1.0 / (1.0 + fOmegaTau*fOmegaTau);
-  }
-  else {
-    fLorentzFactor = 1.0;
-  }
-
-  return kTRUE;
-
-}
-
-//_____________________________________________________________________________
-void AliTRDdigitizer::SampleTRF()
-{
-  //
-  // Samples the time response function
-  //
-  // New TRF from Venelin Angelov, simulated with CADENCE
-  // Pad-ground capacitance = 25 pF
-  // Pad-pad cross talk capacitance = 6 pF   
-  //
-
-  Int_t   ipos1;
-  Int_t   ipos2;
-  Float_t diff;
-
-  const Int_t kNpasa     = 252;
-
-  Float_t time[kNpasa]   = { -0.220000, -0.210000, -0.200000, -0.190000 
-                           , -0.180000, -0.170000, -0.160000, -0.150000 
-                           , -0.140000, -0.130000, -0.120000, -0.110000 
-                           , -0.100000, -0.090000, -0.080000, -0.070000 
-                           , -0.060000, -0.050000, -0.040000, -0.030000 
-                           , -0.020000, -0.010000, -0.000000,  0.010000 
-                           ,  0.020000,  0.030000,  0.040000,  0.050000 
-                           ,  0.060000,  0.070000,  0.080000,  0.090000 
-                           ,  0.100000,  0.110000,  0.120000,  0.130000 
-                           ,  0.140000,  0.150000,  0.160000,  0.170000 
-                           ,  0.180000,  0.190000,  0.200000,  0.210000 
-                           ,  0.220000,  0.230000,  0.240000,  0.250000 
-                           ,  0.260000,  0.270000,  0.280000,  0.290000 
-                           ,  0.300000,  0.310000,  0.320000,  0.330000 
-                           ,  0.340000,  0.350000,  0.360000,  0.370000 
-                           ,  0.380000,  0.390000,  0.400000,  0.410000 
-                           ,  0.420000,  0.430000,  0.440000,  0.450000 
-                           ,  0.460000,  0.470000,  0.480000,  0.490000 
-                           ,  0.500000,  0.510000,  0.520000,  0.530000 
-                           ,  0.540000,  0.550000,  0.560000,  0.570000 
-                           ,  0.580000,  0.590000,  0.600000,  0.610000 
-                           ,  0.620000,  0.630000,  0.640000,  0.650000 
-                           ,  0.660000,  0.670000,  0.680000,  0.690000 
-                           ,  0.700000,  0.710000,  0.720000,  0.730000 
-                           ,  0.740000,  0.750000,  0.760000,  0.770000 
-                           ,  0.780000,  0.790000,  0.800000,  0.810000 
-                           ,  0.820000,  0.830000,  0.840000,  0.850000 
-                           ,  0.860000,  0.870000,  0.880000,  0.890000 
-                           ,  0.900000,  0.910000,  0.920000,  0.930000 
-                           ,  0.940000,  0.950000,  0.960000,  0.970000 
-                           ,  0.980000,  0.990000,  1.000000,  1.010000 
-                           ,  1.020000,  1.030000,  1.040000,  1.050000 
-                           ,  1.060000,  1.070000,  1.080000,  1.090000 
-                           ,  1.100000,  1.110000,  1.120000,  1.130000 
-                           ,  1.140000,  1.150000,  1.160000,  1.170000 
-                           ,  1.180000,  1.190000,  1.200000,  1.210000 
-                           ,  1.220000,  1.230000,  1.240000,  1.250000 
-                           ,  1.260000,  1.270000,  1.280000,  1.290000 
-                           ,  1.300000,  1.310000,  1.320000,  1.330000 
-                           ,  1.340000,  1.350000,  1.360000,  1.370000 
-                           ,  1.380000,  1.390000,  1.400000,  1.410000 
-                           ,  1.420000,  1.430000,  1.440000,  1.450000 
-                           ,  1.460000,  1.470000,  1.480000,  1.490000 
-                           ,  1.500000,  1.510000,  1.520000,  1.530000 
-                           ,  1.540000,  1.550000,  1.560000,  1.570000 
-                           ,  1.580000,  1.590000,  1.600000,  1.610000 
-                           ,  1.620000,  1.630000,  1.640000,  1.650000 
-                           ,  1.660000,  1.670000,  1.680000,  1.690000 
-                           ,  1.700000,  1.710000,  1.720000,  1.730000 
-                           ,  1.740000,  1.750000,  1.760000,  1.770000 
-                           ,  1.780000,  1.790000,  1.800000,  1.810000 
-                           ,  1.820000,  1.830000,  1.840000,  1.850000 
-                           ,  1.860000,  1.870000,  1.880000,  1.890000 
-                           ,  1.900000,  1.910000,  1.920000,  1.930000 
-                           ,  1.940000,  1.950000,  1.960000,  1.970000 
-                           ,  1.980000,  1.990000,  2.000000,  2.010000 
-                           ,  2.020000,  2.030000,  2.040000,  2.050000 
-                           ,  2.060000,  2.070000,  2.080000,  2.090000 
-                           ,  2.100000,  2.110000,  2.120000,  2.130000 
-                           ,  2.140000,  2.150000,  2.160000,  2.170000 
-                           ,  2.180000,  2.190000,  2.200000,  2.210000 
-                           ,  2.220000,  2.230000,  2.240000,  2.250000 
-                           ,  2.260000,  2.270000,  2.280000,  2.290000 };
-
-  Float_t signal[kNpasa] = {  0.000000,  0.000000,  0.000000,  0.000000 
-                           ,  0.000000,  0.000000,  0.000000,  0.000396 
-                           ,  0.005096,  0.022877,  0.061891,  0.126614 
-                           ,  0.215798,  0.324406,  0.444507,  0.566817 
-                           ,  0.683465,  0.787089,  0.873159,  0.937146 
-                           ,  0.979049,  0.999434,  1.000000,  0.983579 
-                           ,  0.954134,  0.913364,  0.866365,  0.813703 
-                           ,  0.759910,  0.706116,  0.653454,  0.603624 
-                           ,  0.556625,  0.514156,  0.475085,  0.439977 
-                           ,  0.408834,  0.380578,  0.355549,  0.333352 
-                           ,  0.313647,  0.296093,  0.280351,  0.266195 
-                           ,  0.253397,  0.241789,  0.231257,  0.221574 
-                           ,  0.212627,  0.204417,  0.196772,  0.189581 
-                           ,  0.182956,  0.176784,  0.171008,  0.165515 
-                           ,  0.160419,  0.155606,  0.151076,  0.146716 
-                           ,  0.142639,  0.138845,  0.135221,  0.131767 
-                           ,  0.128482,  0.125368,  0.122424,  0.119592 
-                           ,  0.116931,  0.114326,  0.111891,  0.109513 
-                           ,  0.107248,  0.105096,  0.103058,  0.101019 
-                           ,  0.099151,  0.097282,  0.095527,  0.093715 
-                           ,  0.092129,  0.090544,  0.088958,  0.087429 
-                           ,  0.086014,  0.084598,  0.083239,  0.081880 
-                           ,  0.080634,  0.079388,  0.078143,  0.077010 
-                           ,  0.075878,  0.074745,  0.073669,  0.072593 
-                           ,  0.071574,  0.070612,  0.069649,  0.068686 
-                           ,  0.067780,  0.066874,  0.066025,  0.065176 
-                           ,  0.064326,  0.063533,  0.062684,  0.061948 
-                           ,  0.061212,  0.060419,  0.059740,  0.059003 
-                           ,  0.058324,  0.057644,  0.057022,  0.056342 
-                           ,  0.055663,  0.055096,  0.054473,  0.053851 
-                           ,  0.053284,  0.052718,  0.052152,  0.051585 
-                           ,  0.051019,  0.050566,  0.050000,  0.049490 
-                           ,  0.048981,  0.048528,  0.048018,  0.047508 
-                           ,  0.047055,  0.046602,  0.046149,  0.045696 
-                           ,  0.045300,  0.044904,  0.044451,  0.044054 
-                           ,  0.043658,  0.043205,  0.042865,  0.042469 
-                           ,  0.042072,  0.041733,  0.041336,  0.040997 
-                           ,  0.040657,  0.040260,  0.039921,  0.039581 
-                           ,  0.039241,  0.038958,  0.038618,  0.038335 
-                           ,  0.037995,  0.037656,  0.037373,  0.037089 
-                           ,  0.036806,  0.036467,  0.036183,  0.035900 
-                           ,  0.035617,  0.035334,  0.035108,  0.034824 
-                           ,  0.034541,  0.034315,  0.034032,  0.033805 
-                           ,  0.033522,  0.033296,  0.033069,  0.032786 
-                           ,  0.032559,  0.032333,  0.032106,  0.031880 
-                           ,  0.031653,  0.031427,  0.031200,  0.030974 
-                           ,  0.030804,  0.030578,  0.030351,  0.030125 
-                           ,  0.029955,  0.029785,  0.029558,  0.029332 
-                           ,  0.029162,  0.028992,  0.028766,  0.028596 
-                           ,  0.028426,  0.028199,  0.028086,  0.027860 
-                           ,  0.027746,  0.027633,  0.027463,  0.027293 
-                           ,  0.027180,  0.027067,  0.026954,  0.026954 
-                           ,  0.026840,  0.026727,  0.026727,  0.026614 
-                           ,  0.026614,  0.026614,  0.026557,  0.026501 
-                           ,  0.026501,  0.026501,  0.026501,  0.026501 
-                           ,  0.026501,  0.026501,  0.026501,  0.026387 
-                           ,  0.026387,  0.026387,  0.026387,  0.026387 
-                           ,  0.026387,  0.026387,  0.026387,  0.026387 
-                           ,  0.026387,  0.026387,  0.026387,  0.026387 
-                           ,  0.026387,  0.026274,  0.026274,  0.026274 
-                           ,  0.026274,  0.026274,  0.026274,  0.026274 
-                           ,  0.026274,  0.026274,  0.026274,  0.026274 
-                           ,  0.026274,  0.026274,  0.026274,  0.026161 };
-
-  Float_t xtalk[kNpasa]  = {  0.000000,  0.000000,  0.000000,  0.000000 
-                           ,  0.000000,  0.000000,  0.000000,  0.000113 
-                           ,  0.000793,  0.003058,  0.007305,  0.013194 
-                           ,  0.019706,  0.025821,  0.030634,  0.033465 
-                           ,  0.034145,  0.032729,  0.029615,  0.025198 
-                           ,  0.019989,  0.014496,  0.009003,  0.003964 
-                           , -0.000510, -0.004190, -0.007191, -0.009400 
-                           , -0.010872, -0.011835, -0.012288, -0.012288 
-                           , -0.012005, -0.011495, -0.010872, -0.010136 
-                           , -0.009343, -0.008607, -0.007871, -0.007191 
-                           , -0.006512, -0.005946, -0.005379, -0.004926 
-                           , -0.004473, -0.004077, -0.003737, -0.003398 
-                           , -0.003114, -0.002831, -0.002605, -0.002378 
-                           , -0.002208, -0.002039, -0.001869, -0.001699 
-                           , -0.001585, -0.001472, -0.001359, -0.001246 
-                           , -0.001132, -0.001019, -0.001019, -0.000906 
-                           , -0.000906, -0.000793, -0.000793, -0.000680 
-                           , -0.000680, -0.000680, -0.000566, -0.000566 
-                           , -0.000566, -0.000566, -0.000453, -0.000453 
-                           , -0.000453, -0.000453, -0.000453, -0.000453 
-                           , -0.000340, -0.000340, -0.000340, -0.000340 
-                           , -0.000340, -0.000340, -0.000340, -0.000340 
-                           , -0.000340, -0.000340, -0.000340, -0.000340 
-                           , -0.000340, -0.000227, -0.000227, -0.000227 
-                           , -0.000227, -0.000227, -0.000227, -0.000227 
-                           , -0.000227, -0.000227, -0.000227, -0.000227 
-                           , -0.000227, -0.000227, -0.000227, -0.000227 
-                           , -0.000227, -0.000227, -0.000227, -0.000227 
-                           , -0.000227, -0.000227, -0.000227, -0.000227 
-                           , -0.000227, -0.000227, -0.000227, -0.000227 
-                           , -0.000227, -0.000227, -0.000227, -0.000227 
-                           , -0.000227, -0.000227, -0.000227, -0.000227 
-                           , -0.000227, -0.000227, -0.000227, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113, -0.000113 
-                           , -0.000113, -0.000113, -0.000113,  0.000000 
-                           ,  0.000000,  0.000000,  0.000000,  0.000000 
-                           ,  0.000000,  0.000000,  0.000000,  0.000000 
-                           ,  0.000000,  0.000000,  0.000000,  0.000000 
-                           ,  0.000000,  0.000000,  0.000000,  0.000000 
-                           ,  0.000000,  0.000000,  0.000000,  0.000000 
-                           ,  0.000000,  0.000000,  0.000000,  0.000000 
-                           ,  0.000000,  0.000000,  0.000000,  0.000000 
-                           ,  0.000000,  0.000000,  0.000000,  0.000000 
-                           ,  0.000000,  0.000000,  0.000000,  0.000000 
-                           ,  0.000000,  0.000000,  0.000000,  0.000000 };
-
-  // increase CrossTalk to measurements
-  for (Int_t ipasa = 0; ipasa < kNpasa; ipasa++) {
-    xtalk[ipasa] *= 1.75;
-  }
-
-  if (fTRFsmp) delete [] fTRFsmp;
-  fTRFsmp = new Float_t[fTRFbin];
-  if (fCTsmp)  delete [] fCTsmp;
-  fCTsmp  = new Float_t[fTRFbin];
-
-  Float_t loTRF    = TMath::Max(fTRFlo / fDriftVelocity,time[0]);
-  Float_t hiTRF    = TMath::Min(fTRFhi / fDriftVelocity,time[kNpasa-1]);
-  Float_t binWidth = (hiTRF - loTRF) / ((Float_t) fTRFbin);
-
-  // Take the linear interpolation
-  for (Int_t iBin = 0; iBin < fTRFbin; iBin++) {
-
-    Float_t bin = (((Float_t) iBin) + 0.5) * binWidth + loTRF;
-    ipos1 = ipos2 = 0;
-    diff  = 0;
-    do {
-      diff = bin - time[ipos2++];
-    } while (diff > 0);
-    ipos2--;
-    if (ipos2 >= kNpasa) ipos2 = kNpasa - 1;
-    ipos1 = ipos2 - 1;
-
-    fTRFsmp[iBin] = signal[ipos2] 
-                  + diff * (signal[ipos2] - signal[ipos1]) 
-                         / (  time[ipos2] -   time[ipos1]);
-
-    fCTsmp[iBin]  = xtalk[ipos2] 
-                  + diff * (xtalk[ipos2]  -  xtalk[ipos1]) 
-                         / (  time[ipos2] -   time[ipos1]);
-
-  }
-
-}
-
-//_____________________________________________________________________________
-void AliTRDdigitizer::SamplePRF()
-{
-  //
-  // Samples the pad response function
-  //
-
-  const Int_t kNplan  = AliTRDgeometry::kNplan;
-  const Int_t kPRFbin = 61;
-
-  Float_t prf[kNplan][kPRFbin] = { { 0.018570, 0.022270, 0.026710, 0.032010
-                                   , 0.038350, 0.045920, 0.054930, 0.065650
-                                   , 0.078370, 0.093420, 0.111150, 0.131940
-                                   , 0.156160, 0.184160, 0.216220, 0.252470
-                                   , 0.292860, 0.337030, 0.384330, 0.433750
-                                   , 0.484010, 0.533630, 0.581150, 0.625200
-                                   , 0.664710, 0.698860, 0.727130, 0.749230
-                                   , 0.765050, 0.774540, 0.777700, 0.774540
-                                   , 0.765050, 0.749230, 0.727130, 0.698860
-                                   , 0.664710, 0.625200, 0.581150, 0.533630
-                                   , 0.484010, 0.433750, 0.384330, 0.337030
-                                   , 0.292860, 0.252470, 0.216220, 0.184160
-                                   , 0.156160, 0.131940, 0.111150, 0.093420
-                                   , 0.078370, 0.065650, 0.054930, 0.045920
-                                   , 0.038350, 0.032010, 0.026710, 0.022270
-                                  , 0.018570                               }
-                                 , { 0.015730, 0.019040, 0.023030, 0.027840
-                                   , 0.033650, 0.040650, 0.049060, 0.059160
-                                   , 0.071260, 0.085710, 0.102910, 0.123270
-                                   , 0.147240, 0.175220, 0.207590, 0.244540
-                                   , 0.286090, 0.331920, 0.381350, 0.433290
-                                   , 0.486290, 0.538710, 0.588870, 0.635280
-                                   , 0.676760, 0.712460, 0.741890, 0.764810
-                                   , 0.781150, 0.790930, 0.794180, 0.790930
-                                   , 0.781150, 0.764810, 0.741890, 0.712460
-                                   , 0.676760, 0.635280, 0.588870, 0.538710
-                                   , 0.486290, 0.433290, 0.381350, 0.331920
-                                   , 0.286090, 0.244540, 0.207590, 0.175220
-                                   , 0.147240, 0.123270, 0.102910, 0.085710
-                                   , 0.071260, 0.059160, 0.049060, 0.040650
-                                   , 0.033650, 0.027840, 0.023030, 0.019040
-                                  , 0.015730                               }
-                                , { 0.013330, 0.016270, 0.019850, 0.024210
-                                   , 0.029510, 0.035960, 0.043790, 0.053280
-                                   , 0.064740, 0.078580, 0.095190, 0.115070
-                                   , 0.138700, 0.166570, 0.199120, 0.236660
-                                   , 0.279260, 0.326660, 0.378140, 0.432540
-                                   , 0.488260, 0.543440, 0.596200, 0.644900
-                                   , 0.688240, 0.725380, 0.755840, 0.779470
-                                   , 0.796260, 0.806280, 0.809610, 0.806280
-                                   , 0.796260, 0.779470, 0.755840, 0.725380
-                                   , 0.688240, 0.644900, 0.596200, 0.543440
-                                   , 0.488260, 0.432540, 0.378140, 0.326660
-                                   , 0.279260, 0.236660, 0.199120, 0.166570
-                                   , 0.138700, 0.115070, 0.095190, 0.078580
-                                   , 0.064740, 0.053280, 0.043790, 0.035960
-                                   , 0.029510, 0.024210, 0.019850, 0.016270
-                                  , 0.013330                               }
-                                 , { 0.011280, 0.013890, 0.017090, 0.021030
-                                   , 0.025870, 0.031800, 0.039060, 0.047940
-                                   , 0.058790, 0.071980, 0.087990, 0.107330
-                                   , 0.130550, 0.158220, 0.190850, 0.228870
-                                   , 0.272410, 0.321270, 0.374740, 0.431560
-                                   , 0.489960, 0.547870, 0.603180, 0.654080
-                                   , 0.699190, 0.737640, 0.769030, 0.793260
-                                   , 0.810410, 0.820620, 0.824010, 0.820620
-                                   , 0.810410, 0.793260, 0.769030, 0.737640
-                                   , 0.699190, 0.654080, 0.603180, 0.547870
-                                   , 0.489960, 0.431560, 0.374740, 0.321270
-                                   , 0.272410, 0.228870, 0.190850, 0.158220
-                                   , 0.130550, 0.107330, 0.087990, 0.071980
-                                   , 0.058790, 0.047940, 0.039060, 0.031800
-                                   , 0.025870, 0.021030, 0.017090, 0.013890
-                                  , 0.011280                               }
-                                 , { 0.009550, 0.011860, 0.014720, 0.018270
-                                   , 0.022660, 0.028100, 0.034820, 0.043120
-                                   , 0.053340, 0.065900, 0.081280, 0.100040
-                                   , 0.122800, 0.150180, 0.182800, 0.221170
-                                   , 0.265550, 0.315790, 0.371180, 0.430370
-                                   , 0.491430, 0.552030, 0.609840, 0.662860
-                                   , 0.709630, 0.749290, 0.781490, 0.806220
-                                   , 0.823650, 0.834000, 0.837430, 0.834000
-                                   , 0.823650, 0.806220, 0.781490, 0.749290
-                                   , 0.709630, 0.662860, 0.609840, 0.552030
-                                   , 0.491430, 0.430370, 0.371180, 0.315790
-                                   , 0.265550, 0.221170, 0.182800, 0.150180
-                                   , 0.122800, 0.100040, 0.081280, 0.065900
-                                   , 0.053340, 0.043120, 0.034820, 0.028100
-                                   , 0.022660, 0.018270, 0.014720, 0.011860
-                                  , 0.009550                               }
-                                 , { 0.008080, 0.010120, 0.012670, 0.015860
-                                   , 0.019840, 0.024820, 0.031030, 0.038760
-                                   , 0.048370, 0.060300, 0.075040, 0.093200
-                                   , 0.115430, 0.142450, 0.174980, 0.213610
-                                   , 0.258720, 0.310250, 0.367480, 0.429010
-                                   , 0.492690, 0.555950, 0.616210, 0.671280
-                                   , 0.719600, 0.760350, 0.793250, 0.818380
-                                   , 0.836020, 0.846460, 0.849920, 0.846460
-                                   , 0.836020, 0.818380, 0.793250, 0.760350
-                                   , 0.719600, 0.671280, 0.616210, 0.555950
-                                   , 0.492690, 0.429010, 0.367480, 0.310250
-                                   , 0.258720, 0.213610, 0.174980, 0.142450
-                                   , 0.115430, 0.093200, 0.075040, 0.060300
-                                   , 0.048370, 0.038760, 0.031030, 0.024820
-                                   , 0.019840, 0.015860, 0.012670, 0.010120
-                                  , 0.008080                               } };
-
-  fPRFlo  = -1.5;
-  fPRFhi  =  1.5;
-  fPRFbin = kPRFbin;
-  fPRFwid = (fPRFhi - fPRFlo) / ((Float_t) fPRFbin);
-  fPRFpad = ((Int_t) (1.0 / fPRFwid));
-
-  if (fPRFsmp) delete [] fPRFsmp;
-  fPRFsmp = new Float_t[kNplan*fPRFbin];
-  for (Int_t iPla = 0; iPla < kNplan; iPla++) {
-    for (Int_t iBin = 0; iBin < fPRFbin; iBin++) {
-      fPRFsmp[iPla*kPRFbin+iBin] = prf[iPla][iBin];
-    }
-  } 
-
-}
-
 //_____________________________________________________________________________
 Bool_t AliTRDdigitizer::Open(const Char_t *file, Int_t nEvent)
 {
@@ -1169,7 +483,7 @@ Bool_t AliTRDdigitizer::Open(const Char_t *file, Int_t nEvent)
   //
 
   // Connect the AliRoot file containing Geometry, Kine, and Hits
-  fInputFile = (TFile*) gROOT->GetListOfFiles()->FindObject(file);
+  fInputFile = (TFile *) gROOT->GetListOfFiles()->FindObject(file);
   if (!fInputFile) {
     if (fDebug > 0) {
       printf("<AliTRDdigitizer::Open> ");
@@ -1184,7 +498,7 @@ Bool_t AliTRDdigitizer::Open(const Char_t *file, Int_t nEvent)
     }
   }
 
-  gAlice = (AliRun*) fInputFile->Get("gAlice");
+  gAlice = (AliRun *) fInputFile->Get("gAlice");
   if (gAlice) {
     if (fDebug > 0) {
       printf("<AliTRDdigitizer::Open> ");
@@ -1224,7 +538,7 @@ Bool_t AliTRDdigitizer::InitDetector()
   //
 
   // Get the pointer to the detector class and check for version 1
-  fTRD = (AliTRD*) gAlice->GetDetector("TRD");
+  fTRD = (AliTRD *) gAlice->GetDetector("TRD");
   if (fTRD->IsVersion() != 1) {
     printf("<AliTRDdigitizer::InitDetector> ");
     printf("TRD must be version 1 (slow simulator).\n");
@@ -1238,9 +552,6 @@ Bool_t AliTRDdigitizer::InitDetector()
     printf("Geometry version %d\n",fGeo->IsVersion());
   }
 
-  // The magnetic field strength in Tesla
-  fField = 0.2 * gAlice->Field()->Factor();
-
   // Create a digits manager
   fDigitsManager = new AliTRDdigitsManager();
   fDigitsManager->SetSDigits(fSDigits);
@@ -1251,7 +562,7 @@ Bool_t AliTRDdigitizer::InitDetector()
   // The list for the input s-digits manager to be merged
   fSDigitsManagerList = new TList();
 
-  return ReInit();
+  return kTRUE;
 
 }
 
@@ -1313,27 +624,30 @@ Bool_t AliTRDdigitizer::MakeDigits()
   AliTRDdataArrayI *digits  = 0;
   AliTRDdataArrayI *dictionary[kNDict];
 
+  // Create a default parameter class if none is defined
+  if (!fPar) {
+    fPar = new AliTRDparameter("TRDparameter","Standard TRD parameter");
+    if (fDebug > 0) {
+      printf("<AliTRDdigitizer::MakeDigits> ");
+      printf("Create the default parameter object\n");
+    }
+  }
+
   // Create a container for the amplitudes
   AliTRDsegmentArray *signalsArray 
                      = new AliTRDsegmentArray("AliTRDdataArrayF"
                                              ,AliTRDgeometry::Ndet());
 
-  if (fTRFOn) {
-    timeTRDbeg = ((Int_t) (-fTRFlo / fGeo->GetTimeBinSize())) - 1;
-    timeTRDend = ((Int_t) ( fTRFhi / fGeo->GetTimeBinSize())) - 1;
+  if (fPar->TRFOn()) {
+    timeTRDbeg = ((Int_t) (-fPar->GetTRFlo() / fPar->GetTimeBinSize())) - 1;
+    timeTRDend = ((Int_t) ( fPar->GetTRFhi() / fPar->GetTimeBinSize())) - 1;
     if (fDebug > 0) {
       printf("<AliTRDdigitizer::MakeDigits> ");
       printf("Sample the TRF between -%d and %d\n",timeTRDbeg,timeTRDend);
     }
   }
 
-  Float_t elAttachProp = fElAttachProp / 100.; 
-
-  // Create the sampled PRF
-  SamplePRF();
-
-  // Create the sampled TRF
-  SampleTRF();
+  Float_t elAttachProp = fPar->GetElAttachProp() / 100.; 
 
   if (!fGeo) {
     printf("<AliTRDdigitizer::MakeDigits> ");
@@ -1383,18 +697,18 @@ Bool_t AliTRDdigitizer::MakeDigits()
       Int_t   plane       = fGeo->GetPlane(detector);
       Int_t   sector      = fGeo->GetSector(detector);
       Int_t   chamber     = fGeo->GetChamber(detector);
-      Int_t   nRowMax     = fGeo->GetRowMax(plane,chamber,sector);
-      Int_t   nColMax     = fGeo->GetColMax(plane);
-      Int_t   nTimeMax    = fGeo->GetTimeMax();
-      Int_t   nTimeBefore = fGeo->GetTimeBefore();
-      Int_t   nTimeAfter  = fGeo->GetTimeAfter();
-      Int_t   nTimeTotal  = fGeo->GetTimeTotal();
-      Float_t row0        = fGeo->GetRow0(plane,chamber,sector);
-      Float_t col0        = fGeo->GetCol0(plane);
-      Float_t time0       = fGeo->GetTime0(plane);
-      Float_t rowPadSize  = fGeo->GetRowPadSize(plane,chamber,sector);
-      Float_t colPadSize  = fGeo->GetColPadSize(plane);
-      Float_t timeBinSize = fGeo->GetTimeBinSize();
+      Int_t   nRowMax     = fPar->GetRowMax(plane,chamber,sector);
+      Int_t   nColMax     = fPar->GetColMax(plane);
+      Int_t   nTimeMax    = fPar->GetTimeMax();
+      Int_t   nTimeBefore = fPar->GetTimeBefore();
+      Int_t   nTimeAfter  = fPar->GetTimeAfter();
+      Int_t   nTimeTotal  = fPar->GetTimeTotal();
+      Float_t row0        = fPar->GetRow0(plane,chamber,sector);
+      Float_t col0        = fPar->GetCol0(plane);
+      Float_t time0       = fPar->GetTime0(plane);
+      Float_t rowPadSize  = fPar->GetRowPadSize(plane,chamber,sector);
+      Float_t colPadSize  = fPar->GetColPadSize(plane);
+      Float_t timeBinSize = fPar->GetTimeBinSize();
       Float_t divideRow   = 1.0 / rowPadSize;
       Float_t divideCol   = 1.0 / colPadSize;
       Float_t divideTime  = 1.0 / timeBinSize;
@@ -1484,7 +798,7 @@ Bool_t AliTRDdigitizer::MakeDigits()
         // the position relativ to the wire. This non-isochronity needs still
         // to be implemented.
         Float_t driftlengthL = TMath::Abs(driftlength + kAmWidth);
-        if (fExBOn) driftlengthL /= TMath::Sqrt(fLorentzFactor);
+        if (fPar->ExBOn()) driftlengthL /= TMath::Sqrt(fPar->GetLorentzFactor());
 
         // Loop over all electrons of this hit
         // TR photons produce hits with negative charge
@@ -1496,19 +810,19 @@ Bool_t AliTRDdigitizer::MakeDigits()
           xyz[2] = rot[2];
 
           // Electron attachment
-          if (fElAttachOn) {
+          if (fPar->ElAttachOn()) {
             if (gRandom->Rndm() < (driftlengthL * elAttachProp)) 
               continue;
           }
 
           // Apply the diffusion smearing
-          if (fDiffusionOn) {
-            if (!(Diffusion(driftlengthL,xyz))) continue;
+          if (fPar->DiffusionOn()) {
+            if (!(fPar->Diffusion(driftlengthL,xyz))) continue;
          }
 
           // Apply E x B effects (depends on drift direction)
-          if (fExBOn) { 
-            if (!(ExB(driftlength+kAmWidth,xyz))) continue;   
+          if (fPar->ExBOn()) { 
+            if (!(fPar->ExB(driftlength+kAmWidth,xyz))) continue;   
          }
 
           // The electron position after diffusion and ExB in pad coordinates 
@@ -1519,7 +833,7 @@ Bool_t AliTRDdigitizer::MakeDigits()
           Float_t rowOffset = ((((Float_t) rowE) + 0.5) * rowPadSize) - rowDist;
 
           // The pad column (rphi-direction)
-          Float_t col0tilt  =  Col0Tilted(col0,rowOffset,plane);
+          Float_t col0tilt  = fPar->Col0Tilted(col0,rowOffset,plane);
           Float_t colDist   = xyz[1] - col0tilt;
           Int_t   colE      = ((Int_t) (colDist * divideCol));
           if ((colE < 0) || (colE >= nColMax)) continue;   
@@ -1552,14 +866,14 @@ Bool_t AliTRDdigitizer::MakeDigits()
           do {
             ggRndm = gRandom->Rndm();
          } while (ggRndm <= 0);
-          Int_t signal = (Int_t) (-fGasGain * TMath::Log(ggRndm));
+          Int_t signal = (Int_t) (-fPar->GetGasGain() * TMath::Log(ggRndm));
 
           // Apply the pad response 
-          if (fPRFOn) {
+          if (fPar->PRFOn()) {
            // The distance of the electron to the center of the pad 
            // in units of pad width
             Float_t dist = - colOffset * divideCol;
-            if (!(PadResponse(signal,dist,plane,padSignal))) continue;
+            if (!(fPar->PadResponse(signal,dist,plane,padSignal))) continue;
          }
          else {
             padSignal[0] = 0.0;
@@ -1578,11 +892,11 @@ Bool_t AliTRDdigitizer::MakeDigits()
             Float_t timeResponse = 1.0;
             Float_t crossTalk    = 0.0;
             Float_t time         = (iTimeBin - timeE) * timeBinSize + timeOffset;
-            if (fTRFOn) {
-              timeResponse = TimeResponse(time);
+            if (fPar->TRFOn()) {
+              timeResponse = fPar->TimeResponse(time);
            }
-            if (fCTOn) {
-              crossTalk    = CrossTalk(time);
+            if (fPar->CTOn()) {
+              crossTalk    = fPar->CrossTalk(time);
             }
 
             signalOld[0] = 0.0;
@@ -1643,7 +957,9 @@ Bool_t AliTRDdigitizer::MakeDigits()
   }
 
   // The total conversion factor
-  Float_t convert = kEl2fC * fPadCoupling * fTimeCoupling * fChipGain;
+  Float_t convert = kEl2fC * fPar->GetPadCoupling() 
+                           * fPar->GetTimeCoupling() 
+                           * fPar->GetChipGain();
 
   // Loop through all chambers to finalize the digits
   for (Int_t iDet = 0; iDet < AliTRDgeometry::Ndet(); iDet++) {
@@ -1651,10 +967,10 @@ Bool_t AliTRDdigitizer::MakeDigits()
     Int_t plane       = fGeo->GetPlane(iDet);
     Int_t sector      = fGeo->GetSector(iDet);
     Int_t chamber     = fGeo->GetChamber(iDet);
-    Int_t nRowMax     = fGeo->GetRowMax(plane,chamber,sector);
-    Int_t nColMax     = fGeo->GetColMax(plane);
-    Int_t nTimeMax    = fGeo->GetTimeMax();
-    Int_t nTimeTotal  = fGeo->GetTimeTotal();
+    Int_t nRowMax     = fPar->GetRowMax(plane,chamber,sector);
+    Int_t nColMax     = fPar->GetColMax(plane);
+    Int_t nTimeMax    = fPar->GetTimeMax();
+    Int_t nTimeTotal  = fPar->GetTimeTotal();
 
     Double_t *inADC  = new Double_t[nTimeTotal];
     Double_t *outADC = new Double_t[nTimeTotal];
@@ -1704,7 +1020,7 @@ Bool_t AliTRDdigitizer::MakeDigits()
               signalAmp *= fSDigitsScale;
               signalAmp  = TMath::Min(signalAmp,(Float_t) 1.0e9);
               Int_t adc  = (Int_t) signalAmp;
-              nDigits++;
+              if (adc > 0) nDigits++;
               digits->SetDataUnchecked(iRow,iCol,iTime,adc);
            }
 
@@ -1715,30 +1031,31 @@ Bool_t AliTRDdigitizer::MakeDigits()
             for (iTime = 0; iTime < nTimeTotal; iTime++) {         
               Float_t signalAmp = signals->GetDataUnchecked(iRow,iCol,iTime);
               // Add the noise
-              signalAmp  = TMath::Max((Double_t) gRandom->Gaus(signalAmp,fNoise),0.0);
+              signalAmp  = TMath::Max((Double_t) gRandom->Gaus(signalAmp,fPar->GetNoise()),0.0);
               // Convert to mV
               signalAmp *= convert;
              // Convert to ADC counts. Set the overflow-bit fADCoutRange if the 
              // signal is larger than fADCinRange
               Int_t adc  = 0;
-              if (signalAmp >= fADCinRange) {
-                adc = ((Int_t) fADCoutRange);
+              if (signalAmp >= fPar->GetADCinRange()) {
+                adc = ((Int_t) fPar->GetADCoutRange());
              }
               else {
-                adc = ((Int_t) (signalAmp * (fADCoutRange / fADCinRange)));
+                adc = ((Int_t) (signalAmp * (fPar->GetADCoutRange() 
+                                           / fPar->GetADCinRange())));
              }
               inADC[iTime]  = adc;
               outADC[iTime] = adc;
            }
 
            // Apply the tail cancelation via the digital filter
-            if (fTCOn) {
-              DeConvExp(inADC,outADC,nTimeTotal,fTCnexp);
+            if (fPar->TCOn()) {
+              DeConvExp(inADC,outADC,nTimeTotal,fPar->GetTCnexp());
            }
 
             for (iTime = 0; iTime < nTimeTotal; iTime++) {   
               // Store the amplitude of the digit if above threshold
-              if (outADC[iTime] > fADCthreshold) {
+              if (outADC[iTime] > fPar->GetADCthreshold()) {
                 if (fDebug > 2) {
                   printf("  iRow = %d, iCol = %d, iTime = %d, adc = %f\n"
                         ,iRow,iCol,iTime,outADC[iTime]);
@@ -1835,19 +1152,23 @@ Bool_t AliTRDdigitizer::ConvertSDigits()
   Int_t iCol;
   Int_t iTime;
 
-  if (fDebug > 0) {
-    this->Dump();
+  if (!fPar) {    
+    fPar = new AliTRDparameter("TRDparameter","Standard parameter");
+    if (fDebug > 0) {
+      printf("<AliTRDdigitizer::ConvertSDigits> ");
+      printf("Create the default parameter object\n");
+    }
   }
 
   Double_t sDigitsScale = 1.0 / GetSDigitsScale();
-  Double_t noise        = GetNoise();
-  Double_t padCoupling  = GetPadCoupling();
-  Double_t timeCoupling = GetTimeCoupling();
-  Double_t chipGain     = GetChipGain();
+  Double_t noise        = fPar->GetNoise();
+  Double_t padCoupling  = fPar->GetPadCoupling();
+  Double_t timeCoupling = fPar->GetTimeCoupling();
+  Double_t chipGain     = fPar->GetChipGain();
   Double_t convert      = kEl2fC * padCoupling * timeCoupling * chipGain;;
-  Double_t adcInRange   = GetADCinRange();
-  Double_t adcOutRange  = GetADCoutRange();
-  Int_t    adcThreshold = GetADCthreshold();
+  Double_t adcInRange   = fPar->GetADCinRange();
+  Double_t adcOutRange  = fPar->GetADCoutRange();
+  Int_t    adcThreshold = fPar->GetADCthreshold();
 
   AliTRDdataArrayI *digitsIn;
   AliTRDdataArrayI *digitsOut;
@@ -1865,9 +1186,9 @@ Bool_t AliTRDdigitizer::ConvertSDigits()
     Int_t plane      = fGeo->GetPlane(iDet);
     Int_t sector     = fGeo->GetSector(iDet);
     Int_t chamber    = fGeo->GetChamber(iDet);
-    Int_t nRowMax    = fGeo->GetRowMax(plane,chamber,sector);
-    Int_t nColMax    = fGeo->GetColMax(plane);
-    Int_t nTimeTotal = fGeo->GetTimeTotal();
+    Int_t nRowMax    = fPar->GetRowMax(plane,chamber,sector);
+    Int_t nColMax    = fPar->GetColMax(plane);
+    Int_t nTimeTotal = fPar->GetTimeTotal();
 
     Double_t *inADC  = new Double_t[nTimeTotal];
     Double_t *outADC = new Double_t[nTimeTotal];
@@ -1907,8 +1228,8 @@ Bool_t AliTRDdigitizer::ConvertSDigits()
        }
 
        // Apply the tail cancelation via the digital filter
-        if (fTCOn) {
-          DeConvExp(inADC,outADC,nTimeTotal,fTCnexp);
+        if (fPar->TCOn()) {
+          DeConvExp(inADC,outADC,nTimeTotal,fPar->GetTCnexp());
        }
 
         for (iTime = 0; iTime < nTimeTotal; iTime++) {   
@@ -1957,6 +1278,14 @@ Bool_t AliTRDdigitizer::MergeSDigits()
   // Number of track dictionary arrays
   const Int_t kNDict = AliTRDdigitsManager::kNDict;
 
+  if (!fPar) {
+    fPar = new AliTRDparameter("TRDparameter","Standard parameter");
+    if (fDebug > 0) {
+      printf("<AliTRDdigitizer::MergeSDigits> ");
+      printf("Create the default parameter object\n");
+    }
+  }
+
   Int_t iDict = 0;
   Int_t jDict = 0;
 
@@ -1996,9 +1325,9 @@ Bool_t AliTRDdigitizer::MergeSDigits()
       Int_t plane      = fGeo->GetPlane(iDet);
       Int_t sector     = fGeo->GetSector(iDet);
       Int_t chamber    = fGeo->GetChamber(iDet);
-      Int_t nRowMax    = fGeo->GetRowMax(plane,chamber,sector);
-      Int_t nColMax    = fGeo->GetColMax(plane);
-      Int_t nTimeTotal = fGeo->GetTimeTotal();
+      Int_t nRowMax    = fPar->GetRowMax(plane,chamber,sector);
+      Int_t nColMax    = fPar->GetColMax(plane);
+      Int_t nTimeTotal = fPar->GetTimeTotal();
 
       // Loop through the pixels of one detector and add the signals
       digitsA = fSDigitsManager->GetDigits(iDet);
@@ -2012,37 +1341,49 @@ Bool_t AliTRDdigitizer::MergeSDigits()
         dictionaryB[iDict]->Expand();
       }
 
-      if (fDebug > 0) {
-        printf("<AliTRDdigitizer::MergeSDigits> ");
-        printf("Merge detector %d of input no.%d\n",iDet,iMerge+1);
+      // Merge only detectors that contain a signal
+      Bool_t doMerge = kTRUE;
+      if (fMergeSignalOnly) {
+        if (digitsA->GetOverThreshold(0) == 0) {
+          doMerge = kFALSE;
+       }
       }
 
-      for (Int_t iRow  = 0; iRow  <  nRowMax;   iRow++ ) {
-        for (Int_t iCol  = 0; iCol  <  nColMax;   iCol++ ) {
-          for (Int_t iTime = 0; iTime < nTimeTotal; iTime++) {         
+      if (doMerge) {
 
-           // Add the amplitudes of the summable digits 
-            Int_t ampA = digitsA->GetDataUnchecked(iRow,iCol,iTime);
-            Int_t ampB = digitsB->GetDataUnchecked(iRow,iCol,iTime);
-            ampA += ampB;
-            digitsA->SetDataUnchecked(iRow,iCol,iTime,ampA);
+        if (fDebug > 0) {
+          printf("<AliTRDdigitizer::MergeSDigits> ");
+          printf("Merge detector %d of input no.%d\n",iDet,iMerge+1);
+        }
 
-           // Add the mask to the track id if defined.
-            for (iDict = 0; iDict < kNDict; iDict++) {
-              Int_t trackB = dictionaryB[iDict]->GetDataUnchecked(iRow,iCol,iTime);
-              if ((fMasks) && (trackB > 0)) {
-                for (jDict = 0; jDict < kNDict; jDict++) { 
-                  Int_t trackA = dictionaryA[iDict]->GetDataUnchecked(iRow,iCol,iTime);
-                  if (trackA == 0) {
-                    trackA = trackB + fMasks[iMerge];
-                    dictionaryA[iDict]->SetDataUnchecked(iRow,iCol,iTime,trackA);
-                 }
-               }
+        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 the amplitudes of the summable digits 
+              Int_t ampA = digitsA->GetDataUnchecked(iRow,iCol,iTime);
+              Int_t ampB = digitsB->GetDataUnchecked(iRow,iCol,iTime);
+              ampA += ampB;
+              digitsA->SetDataUnchecked(iRow,iCol,iTime,ampA);
+
+            // Add the mask to the track id if defined.
+              for (iDict = 0; iDict < kNDict; iDict++) {
+                Int_t trackB = dictionaryB[iDict]->GetDataUnchecked(iRow,iCol,iTime);
+                if ((fMasks) && (trackB > 0)) {
+                  for (jDict = 0; jDict < kNDict; jDict++) { 
+                    Int_t trackA = dictionaryA[iDict]->GetDataUnchecked(iRow,iCol,iTime);
+                    if (trackA == 0) {
+                      trackA = trackB + fMasks[iMerge];
+                      dictionaryA[iDict]->SetDataUnchecked(iRow,iCol,iTime,trackA);
+                   }
+                 }
+               }
              }
-           }
 
+           }
          }
-       }
+        }
+
       }
 
       if (fCompress) {
@@ -2119,112 +1460,6 @@ Bool_t AliTRDdigitizer::WriteDigits()
 
 }
 
-//_____________________________________________________________________________
-void AliTRDdigitizer::SetTiltingAngle(Float_t v)
-{
-  //
-  // Set the tilting angle for the readout pads
-  //
-
-  fTiltingAngle = TMath::Tan(TMath::Pi()/180.0 * v);
-
-}
-
-//_____________________________________________________________________________
-Float_t AliTRDdigitizer::GetTiltingAngle() const
-{
-  //
-  // Get the tilting angle for the readout pads
-  //
-
-  return TMath::ATan(180.0/TMath::Pi() * fTiltingAngle);
-
-}
-
-//_____________________________________________________________________________
-Float_t AliTRDdigitizer::GetDiffusionL(Float_t vd, Float_t b)
-{
-  //
-  // Returns the longitudinal diffusion coefficient for a given drift 
-  // velocity <vd> and a B-field <b> for Xe/CO2 (15%).
-  // The values are according to a GARFIELD simulation.
-  //
-
-  const Int_t kNb = 5;
-  Float_t p0[kNb] = {  0.007440,  0.007493,  0.007513,  0.007672,  0.007831 };
-  Float_t p1[kNb] = {  0.019252,  0.018912,  0.018636,  0.018012,  0.017343 };
-  Float_t p2[kNb] = { -0.005042, -0.004926, -0.004867, -0.004650, -0.004424 };
-  Float_t p3[kNb] = {  0.000195,  0.000189,  0.000195,  0.000182,  0.000169 };
-
-  Int_t ib = ((Int_t) (10 * (b - 0.15)));
-  ib       = TMath::Max(  0,ib);
-  ib       = TMath::Min(kNb,ib);
-
-  Float_t diff = p0[ib] 
-               + p1[ib] * vd
-               + p2[ib] * vd*vd
-               + p3[ib] * vd*vd*vd;
-
-  return diff;
-
-}
-
-//_____________________________________________________________________________
-Float_t AliTRDdigitizer::GetDiffusionT(Float_t vd, Float_t b)
-{
-  //
-  // Returns the transverse diffusion coefficient for a given drift 
-  // velocity <vd> and a B-field <b> for Xe/CO2 (15%).
-  // The values are according to a GARFIELD simulation.
-  //
-
-  const Int_t kNb = 5;
-  Float_t p0[kNb] = {  0.009550,  0.009599,  0.009674,  0.009757,  0.009850 };
-  Float_t p1[kNb] = {  0.006667,  0.006539,  0.006359,  0.006153,  0.005925 };
-  Float_t p2[kNb] = { -0.000853, -0.000798, -0.000721, -0.000635, -0.000541 };
-  Float_t p3[kNb] = {  0.000131,  0.000122,  0.000111,  0.000098,  0.000085 };
-
-  Int_t ib = ((Int_t) (10 * (b - 0.15)));
-  ib       = TMath::Max(  0,ib);
-  ib       = TMath::Min(kNb,ib);
-
-  Float_t diff = p0[ib] 
-               + p1[ib] * vd
-               + p2[ib] * vd*vd
-               + p3[ib] * vd*vd*vd;
-
-  return diff;
-
-}
-
-//_____________________________________________________________________________
-Float_t AliTRDdigitizer::GetOmegaTau(Float_t vd, Float_t b)
-{
-  //
-  // Returns omega*tau (tan(Lorentz-angle)) for a given drift velocity <vd> 
-  // and a B-field <b> for Xe/CO2 (15%).
-  // The values are according to a GARFIELD simulation.
-  //
-
-  const Int_t kNb = 5;
-  Float_t p0[kNb] = {  0.004810,  0.007412,  0.010252,  0.013409,  0.016888 };
-  Float_t p1[kNb] = {  0.054875,  0.081534,  0.107333,  0.131983,  0.155455 };
-  Float_t p2[kNb] = { -0.008682, -0.012896, -0.016987, -0.020880, -0.024623 };
-  Float_t p3[kNb] = {  0.000155,  0.000238,  0.000330,  0.000428,  0.000541 };
-
-  Int_t ib = ((Int_t) (10 * (b - 0.15)));
-  ib       = TMath::Max(  0,ib);
-  ib       = TMath::Min(kNb,ib);
-
-  Float_t alphaL = p0[ib] 
-                 + p1[ib] * vd
-                 + p2[ib] * vd*vd
-                 + p3[ib] * vd*vd*vd;
-
-  return TMath::Tan(alphaL);
-
-}
-
 //_____________________________________________________________________________
 void AliTRDdigitizer::DeConvExp(Double_t *source, Double_t *target
                               , Int_t n, Int_t nexp) 
index e1464e0..4b73fd7 100644 (file)
@@ -15,6 +15,7 @@ class AliRunDigitizer;
 class AliTRD;
 class AliTRDdigitsManager;
 class AliTRDgeometry;
+class AliTRDparameter;
 
 ///////////////////////////////////////////////////////
 //  Produces digits from the hits information        //
@@ -33,9 +34,7 @@ class AliTRDdigitizer : public AliDigitizer {
   AliTRDdigitizer &operator=(const AliTRDdigitizer &d);
 
   virtual void         Copy(TObject &d);
-  virtual Bool_t       Init();
   virtual Bool_t       InitDetector();
-  virtual Bool_t       ReInit();
   virtual void         Exec(Option_t* option = 0);  
   virtual Bool_t       Open(const Char_t *file, Int_t nEvent = 0);
   virtual Bool_t       MakeBranch(const Char_t *file = 0);
@@ -47,60 +46,22 @@ class AliTRDdigitizer : public AliDigitizer {
   virtual Bool_t       SDigits2Digits();
   virtual Bool_t       WriteDigits();
 
-  virtual void         SetGasGain(Float_t gasgain)          { fGasGain        = gasgain;  };
-  virtual void         SetNoise(Float_t noise)              { fNoise          = noise;    };
-  virtual void         SetChipGain(Float_t chipgain)        { fChipGain       = chipgain; };
-  virtual void         SetADCoutRange(Float_t range)        { fADCoutRange    = range;    };
-  virtual void         SetADCinRange(Float_t range)         { fADCinRange     = range;    };
-  virtual void         SetADCthreshold(Int_t thresh)        { fADCthreshold   = thresh;   };
-  virtual void         SetDiffusion(Int_t diffOn = 1)       { fDiffusionOn    = diffOn;   };
-  virtual void         SetElAttach(Int_t elOn = 1)          { fElAttachOn     = elOn;     };
-  virtual void         SetElAttachProp(Float_t prop)        { fElAttachProp   = prop;     };
-  virtual void         SetExB(Int_t exbOn = 1)              { fExBOn          = exbOn;    };
-  virtual void         SetPadResponse(Int_t prfOn = 1)      { fPRFOn          = prfOn;    };
-  virtual void         SetTimeResponse(Int_t trfOn = 1)     { fTRFOn          = trfOn;   
-                                                              ReInit();                   };
-  virtual void         SetCrossTalk(Int_t ctOn = 1)         { fCTOn           = ctOn;   
-                                                              ReInit();                   };
-  virtual void         SetTailCancelation(Int_t tcOn = 1)   { fTCOn           = tcOn;     };
-  virtual void         SetNexponential(Int_t nexp)          { fTCnexp         = nexp;     };
-  virtual void         SetDriftVelocity(Float_t v)          { fDriftVelocity  = v;       
-                                                              ReInit();                   };
-  virtual void         SetPadCoupling(Float_t v)            { fPadCoupling    = v;        };
-  virtual void         SetTimeCoupling(Float_t v)           { fTimeCoupling   = v;        };
-  virtual void         SetTiltingAngle(Float_t v);
-  virtual void         SetCompress(Int_t c = 1)             { fCompress       = c;        };
-  virtual void         SetDebug(Int_t v = 1)                { fDebug          = v;        };
-  virtual void         SetSDigits(Int_t v = 1)              { fSDigits        = v;        };
-  virtual void         SetSDigitsScale(Float_t s)           { fSDigitsScale   = s;        };
-  virtual void         SetEvent(Int_t v = 0)                { fEvent          = v;        };
-  virtual void         SetManager(AliTRDdigitsManager *man) { fDigitsManager  = man;      };   
-  virtual void         SetGeometry(AliTRDgeometry *geo)     { fGeo            = geo;      };
-
-  AliTRDdigitsManager *Digits() const                       { return fDigitsManager;      };
-
-          Float_t      GetGasGain() const                   { return fGasGain;            };
-          Float_t      GetNoise() const                     { return fNoise;              };
-          Float_t      GetChipGain() const                  { return fChipGain;           };
-          Float_t      GetADCoutRange() const               { return fADCoutRange;        };
-          Float_t      GetADCinRange() const                { return fADCinRange;         };
-          Int_t        GetADCthreshold() const              { return fADCthreshold;       };
-          Float_t      GetDiffusionT() const                { return fDiffusionT;         };
-          Float_t      GetDiffusionL() const                { return fDiffusionL;         };
-          Float_t      GetElAttachProp() const              { return fElAttachProp;       };
-          Int_t        GetExB() const                       { return fExBOn;              };
-          Float_t      GetOmegaTau() const                  { return fOmegaTau;           };
-          Float_t      GetDriftVelocity() const             { return fDriftVelocity;      };
-          Float_t      GetPadCoupling() const               { return fPadCoupling;        };
-          Float_t      GetTimeCoupling() const              { return fTimeCoupling;       };
-          Bool_t       GetCompress() const                  { return fCompress;           };
-          Bool_t       GetSDigits() const                   { return fSDigits;            };
-          Float_t      GetSDigitsScale() const              { return fSDigitsScale;       };
-          Float_t      GetTimeBinWidth() const              { return fTimeBinWidth;       };
-          Float_t      GetTiltingAngle() const;
-  virtual Float_t      GetDiffusionL(Float_t vd, Float_t b);
-  virtual Float_t      GetDiffusionT(Float_t vd, Float_t b);
-  virtual Float_t      GetOmegaTau(Float_t vd, Float_t b);
+  virtual void         SetCompress(Int_t c = 1)             { fCompress        = c;   };
+  virtual void         SetDebug(Int_t v = 1)                { fDebug           = v;   };
+  virtual void         SetSDigits(Int_t v = 1)              { fSDigits         = v;   };
+  virtual void         SetSDigitsScale(Float_t s)           { fSDigitsScale    = s;   };
+  virtual void         SetEvent(Int_t v = 0)                { fEvent           = v;   };
+  virtual void         SetManager(AliTRDdigitsManager *man) { fDigitsManager   = man; };   
+  virtual void         SetGeometry(AliTRDgeometry *geo)     { fGeo             = geo; };
+  virtual void         SetParameter(AliTRDparameter *par)   { fPar             = par; };
+  virtual void         SetMergeSignalOnly(Bool_t m = kTRUE) { fMergeSignalOnly = m;   };
+
+  AliTRDdigitsManager *Digits()                       const { return fDigitsManager; };
+
+          Bool_t       GetCompress()                  const { return fCompress;      };
+          Bool_t       GetSDigits()                   const { return fSDigits;       };
+          Float_t      GetSDigitsScale()              const { return fSDigitsScale;  };
+  AliTRDparameter     *GetParameter()                 const { return fPar;           };
 
  protected:
 
@@ -110,67 +71,21 @@ class AliTRDdigitizer : public AliDigitizer {
   TList               *fSDigitsManagerList; //! List of managers of input s-digits
   AliTRD              *fTRD;                //! TRD detector class
   AliTRDgeometry      *fGeo;                //! TRD geometry
-  
+  AliTRDparameter     *fPar;                //  TRD digitization parameter object
   Int_t                fEvent;              //! Event number
-
   Int_t               *fMasks;              //! Masks for the merging
-
-  Float_t              fField;              //  Magnetic field
-  Float_t              fGasGain;            //  Gas gain
-  Float_t              fNoise;              //  Electronics noise
-  Float_t              fChipGain;           //  Electronics gain
-  Float_t              fADCoutRange;        //  ADC output range (number of channels)
-  Float_t              fADCinRange;         //  ADC input range (input charge)
-  Int_t                fADCthreshold;       //  ADC threshold in ADC channel
-  Int_t                fDiffusionOn;        //  Switch for the diffusion
-  Float_t              fDiffusionT;         //  Diffusion in transverse direction
-  Float_t              fDiffusionL;         //  Diffusion in longitudinal direction
-  Int_t                fElAttachOn;         //  Switch for the electron attachment
-  Float_t              fElAttachProp;       //  Propability for electron attachment (for 1m)
-  Int_t                fExBOn;              //  Switch for the ExB effects
-  Float_t              fOmegaTau;           //  Tangens of the Lorentz angle 
-  Float_t              fLorentzFactor;      //  Factor due to Lorentz force
-  Int_t                fPRFOn;              //  Switch for the pad response
-  Float_t             *fPRFsmp;             //! Sampled pad response
-  Int_t                fPRFbin;             //  Number of bins for the PRF
-  Float_t              fPRFlo;              //  Lower boundary of the PRF
-  Float_t              fPRFhi;              //  Higher boundary of the PRF
-  Float_t              fPRFwid;             //  Bin width of the sampled PRF
-  Int_t                fPRFpad;             //  Distance to next pad in PRF
-  Int_t                fTRFOn;              //  Switch for the time response
-  Float_t             *fTRFsmp;             //! Integrated time response
-  Int_t                fTRFbin;             //  Number of bins for the TRF
-  Float_t              fTRFlo;              //  Lower boundary of the TRF
-  Float_t              fTRFhi;              //  Higher boundary of the TRF
-  Float_t              fTRFwid;             //  Bin width of the integrated TRF
-  Int_t                fCTOn;               //  Switch for cross talk
-  Float_t             *fCTsmp;              //! Integrated cross talk
-  Int_t                fTCOn;               //  Switch for the tail cancelation
-  Int_t                fTCnexp;             //  Number of exponential of the digital filter
-  Float_t              fDriftVelocity;      //  Drift velocity (cm / mus)
-  Float_t              fTimeBinWidth;       //  Time bin width in ns
-  Float_t              fPadCoupling;        //  Pad coupling factor
-  Float_t              fTimeCoupling;       //  Time coupling factor (image charge of moving ions)
-  Float_t              fTiltingAngle;       //  Tilting angle of the readout pads
   Bool_t               fCompress;           //  Switch to keep only compressed data in memory
   Int_t                fDebug;              //  Sets the debug level
   Bool_t               fSDigits;            //  Switch for the summable digits
   Float_t              fSDigitsScale;       //  Scale factor for the summable digits 
+  Bool_t               fMergeSignalOnly;    //  Merge only detectors that contain a signal
 
  private:
 
-  virtual Float_t      Col0Tilted(Float_t col0, Float_t rowOffset, Int_t plane);
-  virtual Float_t      CrossTalk(Float_t time); 
-  virtual Int_t        Diffusion(Float_t driftlength, Float_t *xyz);
-  virtual Int_t        ExB(Float_t driftlength, Float_t *xyz);  
-  virtual Int_t        PadResponse(Float_t signal, Float_t dist, Int_t plane, Float_t *pad);
-  virtual Float_t      TimeResponse(Float_t time);  
   virtual void         DeConvExp(Double_t *source, Double_t *target, Int_t n, Int_t nexp);
   virtual Bool_t       CheckDetector(Int_t plane, Int_t chamber, Int_t sector);
-  virtual void         SamplePRF();
-  virtual void         SampleTRF();
 
-  ClassDef(AliTRDdigitizer,6)               //  Produces TRD-Digits
+  ClassDef(AliTRDdigitizer,7)               //  Produces TRD-Digits
 
 };