Introduce the digits parameter class which is supposed to store digits information...
[u/mrichter/AliRoot.git] / TRD / AliTRDSimParam.cxx
index 01fa56b..3016a80 100644 (file)
 
 /* $Id$ */
 
-///////////////////////////////////////////////////////////////////////////////
-//                                                                           //
-// Class containing constant simulation parameters                           //
-//                                                                           //
-// Request an instance with AliTRDSimParam::Instance()                 //
-// Then request the needed values                                            //
-//                                                                           //
-///////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+//                                                                        //
+// Class containing constant simulation parameters                        //
+//                                                                        //
+// Request an instance with AliTRDSimParam::Instance()                    //
+// Then request the needed values                                         //
+//                                                                        //
+////////////////////////////////////////////////////////////////////////////
 
 #include <TMath.h>
 
 #include "AliRun.h"
 
 #include "AliTRDSimParam.h"
+#include "AliTRDCommonParam.h"
 
 ClassImp(AliTRDSimParam)
 
-AliTRDSimParam* AliTRDSimParam::fgInstance = 0;
-Bool_t AliTRDSimParam::fgTerminated = kFALSE;
+AliTRDSimParam *AliTRDSimParam::fgInstance   = 0;
+Bool_t          AliTRDSimParam::fgTerminated = kFALSE;
 
 //_ singleton implementation __________________________________________________
 AliTRDSimParam* AliTRDSimParam::Instance()
@@ -43,138 +44,127 @@ AliTRDSimParam* AliTRDSimParam::Instance()
   // Returns an instance of this class, it is created if neccessary
   // 
   
-  if (fgTerminated != kFALSE)
+  if (fgTerminated != kFALSE) {
     return 0;
+  }
 
-  if (fgInstance == 0)
+  if (fgInstance == 0) {
     fgInstance = new AliTRDSimParam();
-  
+  }  
+
   return fgInstance;
+
 }
 
+//_ singleton implementation __________________________________________________
 void AliTRDSimParam::Terminate()
 {
   //
   // Singleton implementation
-  // Deletes the instance of this class and sets the terminated flag, instances cannot be requested anymore
+  // 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)
-  {
+  if (fgInstance != 0) {
     delete fgInstance;
     fgInstance = 0;
   }
+
 }
 
 //_____________________________________________________________________________
 AliTRDSimParam::AliTRDSimParam()
+  :TObject()
+  ,fGasGain(0.0)
+  ,fNoise(0.0)
+  ,fChipGain(0.0)
+  ,fADCoutRange(0.0)
+  ,fADCinRange(0.0)
+  ,fADCbaseline(0)
+  ,fDiffusionOn(kFALSE)
+  ,fElAttachOn(kFALSE)
+  ,fElAttachProp(0.0)
+  ,fTRFOn(kFALSE)
+  ,fTRFsmp(0)
+  ,fTRFbin(0)
+  ,fTRFlo(0.0)
+  ,fTRFhi(0.0)
+  ,fTRFwid(0.0)
+  ,fCTOn(kFALSE)
+  ,fCTsmp(0)
+  ,fPadCoupling(0.0)
+  ,fTimeCoupling(0.0)
+  ,fTimeStructOn(kFALSE)
+  ,fPRFOn(kFALSE)
+  ,fNTimeBins(0)
 {
   //
-  // default constructor
+  // Default constructor
   //
   
-  fGasGain            = 0.0;
-  fNoise              = 0.0;
-  fChipGain           = 0.0;
-  
-  fADCoutRange        = 0.0;
-  fADCinRange         = 0.0;
-  fADCthreshold       = 0;
-  fADCbaseline        = 0;        
-  
-  fDiffusionOn        = kFALSE;
-  
-  fElAttachOn         = kFALSE;
-  fElAttachProp       = 0.0;
-  
-  fTRFOn              = kFALSE;
-  fTRFsmp             = 0;
-  fTRFbin             = 0;
-  fTRFlo              = 0.0;
-  fTRFhi              = 0.0;
-  fTRFwid             = 0.0;
-  
-  fCTOn               = kFALSE;
-  fCTsmp              = 0;
-  
-  fTCOn               = kFALSE;
-  
-  fTCnexp             = 0;
-  
-  fAnodeWireOffset    = 0.0;
-  fPadCoupling        = 0.0;
-  fTimeCoupling       = 0.0;
-  fTimeStructOn       = kFALSE;
-  
-  fPRFOn              = kFALSE;
-  
   Init();
+
 }
 
 //_____________________________________________________________________________
 void AliTRDSimParam::Init()
 {
   // 
-  // default initializiation
+  // Default initializiation
   //
   
   // The default parameter for the digitization
-  fGasGain        = 4000.;
-  fChipGain       = 12.4;
-  fNoise          = 1000.;
-  fADCoutRange    = 1023.;          // 10-bit ADC
-  fADCinRange     = 2000.;          // 2V input range
-  fADCthreshold   = 1;
-  fADCbaseline    = 0;
+  fGasGain           = 4000.0;
+  fChipGain          =   12.4;
+  fNoise             = 1250.0;
+  fADCoutRange       = 1023.0;          // 10-bit ADC
+  fADCinRange        = 2000.0;          // 2V input range
+  // Go back to 0 again, just to be consistent with reconstruction
+  fADCbaseline       =      0;
+  //fADCbaseline       =   10;
 
   // Diffusion on
-  fDiffusionOn    = kTRUE;
+  fDiffusionOn       = kTRUE;
   
   // Propability for electron attachment
-  fElAttachOn     = kFALSE;
-  fElAttachProp   = 0.0;
+  fElAttachOn        = kFALSE;
+  fElAttachProp      = 0.0;
 
   // The time response function
-  fTRFOn          = kTRUE;
+  fTRFOn             = kTRUE;
 
   // The cross talk
-  fCTOn           = kTRUE;
-
-  // The tail cancelation
-  fTCOn           = kTRUE;
-  
-  // The number of exponentials
-  fTCnexp         = 1;
+  fCTOn              = kTRUE;
 
   // The pad coupling factor
-  //fPadCoupling    = 0.3;
-  // Use 0.46 instead which reproduces better the test beam
-  // data, even tough it is not understood why.
-  fPadCoupling    = 0.46;
+  // Use 0.46, instead of the theroetical value 0.3, since it reproduces better 
+  // the test beam data, even tough it is not understood why.
+  fPadCoupling       = 0.46;
 
   // The time coupling factor (same number as for the TPC)
-  fTimeCoupling   = 0.4;
-
-  // Distance of first Anode wire from first pad edge
-  fAnodeWireOffset = 0.25;
+  fTimeCoupling      = 0.4;
 
   // Use drift time maps
-  fTimeStructOn = kTRUE;
+  fTimeStructOn      = kTRUE;
   
   // The pad response function
-  fPRFOn          = kTRUE;
+  fPRFOn             = kTRUE;
+
+  // The number of time bins
+  fNTimeBins         = 24;
 
   ReInit();
+
 }
 
 //_____________________________________________________________________________
 AliTRDSimParam::~AliTRDSimParam() 
 {
   //
-  // destructor
+  // Destructor
   //
   
   if (fTRFsmp) {
@@ -186,18 +176,58 @@ AliTRDSimParam::~AliTRDSimParam()
     delete [] fCTsmp;
     fCTsmp  = 0;
   }
+
 }
 
 //_____________________________________________________________________________
-AliTRDSimParam::AliTRDSimParam(const AliTRDSimParam &p):TObject(p)
+AliTRDSimParam::AliTRDSimParam(const AliTRDSimParam &p)
+  :TObject(p)
+  ,fGasGain(p.fGasGain)
+  ,fNoise(p.fNoise)
+  ,fChipGain(p.fChipGain)
+  ,fADCoutRange(p.fADCoutRange)
+  ,fADCinRange(p.fADCinRange)
+  ,fADCbaseline(p.fADCbaseline)
+  ,fDiffusionOn(p.fDiffusionOn)
+  ,fElAttachOn(p.fElAttachOn)
+  ,fElAttachProp(p.fElAttachProp)
+  ,fTRFOn(p.fTRFOn)
+  ,fTRFsmp(0)
+  ,fTRFbin(p.fTRFbin)
+  ,fTRFlo(p.fTRFlo)
+  ,fTRFhi(p.fTRFhi)
+  ,fTRFwid(p.fTRFwid)
+  ,fCTOn(p.fCTOn)
+  ,fCTsmp(0)
+  ,fPadCoupling(p.fPadCoupling)
+  ,fTimeCoupling(p.fTimeCoupling)
+  ,fTimeStructOn(p.fTimeStructOn)
+  ,fPRFOn(p.fPRFOn)
+  ,fNTimeBins(p.fNTimeBins)
 {
   //
-  // copy constructor
+  // Copy constructor
   //
 
-  ((AliTRDSimParam &) p).Copy(*this);
-}
+  Int_t iBin = 0;
+
+  if (((AliTRDSimParam &) p).fTRFsmp) {
+    delete [] ((AliTRDSimParam &) p).fTRFsmp;
+  }
+  ((AliTRDSimParam &) p).fTRFsmp = new Float_t[fTRFbin];
+  for (iBin = 0; iBin < fTRFbin; iBin++) {
+    ((AliTRDSimParam &) p).fTRFsmp[iBin] = fTRFsmp[iBin];
+  }                                                                             
 
+  if (((AliTRDSimParam &) p).fCTsmp) {
+    delete [] ((AliTRDSimParam &) p).fCTsmp;
+  }
+  ((AliTRDSimParam &) p).fCTsmp  = new Float_t[fTRFbin];
+  for (iBin = 0; iBin < fTRFbin; iBin++) {
+    ((AliTRDSimParam &) p).fCTsmp[iBin] = fCTsmp[iBin];
+  }                                                                             
+
+}
 
 //_____________________________________________________________________________
 AliTRDSimParam &AliTRDSimParam::operator=(const AliTRDSimParam &p)
@@ -206,8 +236,12 @@ AliTRDSimParam &AliTRDSimParam::operator=(const AliTRDSimParam &p)
   // Assignment operator
   //
 
-  if (this != &p) ((AliTRDSimParam &) p).Copy(*this);
+  if (this != &p) {
+    ((AliTRDSimParam &) p).Copy(*this);
+  }
+
   return *this;
+
 }
 
 //_____________________________________________________________________________
@@ -217,53 +251,47 @@ void AliTRDSimParam::Copy(TObject &p) const
   // Copy function
   //
   
-  AliTRDSimParam* target = dynamic_cast<AliTRDSimParam*> (&p);
-  if (!target)
+  AliTRDSimParam *target = dynamic_cast<AliTRDSimParam *> (&p);
+  if (!target) {
     return;
+  }
 
   target->fGasGain            = fGasGain;
-  //target->fField              = fField;
   target->fNoise              = fNoise;
-  target->fChipGain           = fChipGain;
-  
+  target->fChipGain           = fChipGain;  
   target->fADCoutRange        = fADCoutRange;
   target->fADCinRange         = fADCinRange;
-  target->fADCthreshold       = fADCthreshold;
   target->fADCbaseline        = fADCbaseline; 
-  
   target->fDiffusionOn        = fDiffusionOn; 
-  
   target->fElAttachOn         = fElAttachOn;
   target->fElAttachProp       = fElAttachProp;
-  
   target->fTRFOn              = fTRFOn;
-  if (target->fTRFsmp) 
-    delete[] target->fTRFsmp;
-  target->fTRFsmp = new Float_t[fTRFbin];
-  for (Int_t iBin = 0; iBin < fTRFbin; iBin++) {
-    target->fTRFsmp[iBin] = fTRFsmp[iBin];
-  }
   target->fTRFbin             = fTRFbin;
   target->fTRFlo              = fTRFlo;
   target->fTRFhi              = fTRFhi;
   target->fTRFwid             = fTRFwid;
-  
   target->fCTOn               = fCTOn;
-  if (target->fCTsmp) 
+  target->fPadCoupling        = fPadCoupling;
+  target->fTimeCoupling       = fTimeCoupling;
+  target->fPRFOn              = fPRFOn;
+  target->fNTimeBins          = fNTimeBins;
+
+  if (target->fTRFsmp) {
+    delete[] target->fTRFsmp;
+  }
+  target->fTRFsmp = new Float_t[fTRFbin];
+  for (Int_t iBin = 0; iBin < fTRFbin; iBin++) {
+    target->fTRFsmp[iBin] = fTRFsmp[iBin];
+  }
+
+  if (target->fCTsmp) {
     delete[] target->fCTsmp;
+  }
   target->fCTsmp  = new Float_t[fTRFbin];
   for (Int_t iBin = 0; iBin < fTRFbin; iBin++) {
     target->fCTsmp[iBin]  = fCTsmp[iBin];
   }
   
-  target->fTCOn               = fTCOn;
-  target->fTCnexp             = fTCnexp;
-
-  target->fAnodeWireOffset    = fAnodeWireOffset;
-  target->fPadCoupling        = fPadCoupling;
-  target->fTimeCoupling       = fTimeCoupling;
-  
-  target->fPRFOn              = fPRFOn;
 }
 
 //_____________________________________________________________________________
@@ -273,263 +301,151 @@ void AliTRDSimParam::ReInit()
   // Reinitializes the parameter class after a change
   //
 
-  // The range and the binwidth for the sampled TRF 
-  fTRFbin = 100;
-  // Start 0.2 mus before the signal
-  fTRFlo  = -0.2;
-  // End the maximum drift time after the signal 
-  fTRFhi  = 2.2;
-  // 
+  if      (AliTRDCommonParam::Instance()->IsXenon()) {
+    // The range and the binwidth for the sampled TRF 
+    fTRFbin = 200;
+    // Start 0.2 mus before the signal
+    fTRFlo  = -0.4;
+    // End the maximum drift time after the signal 
+    fTRFhi  =  3.58;
+    // Standard gas gain
+    fGasGain = 4000.0;
+  }
+  else if (AliTRDCommonParam::Instance()->IsArgon()) {
+    // The range and the binwidth for the sampled TRF 
+    fTRFbin  =  50;
+    // Start 0.2 mus before the signal
+    fTRFlo   =  0.02;
+    // End the maximum drift time after the signal 
+    fTRFhi   =  1.98;
+    // Higher gas gain
+    fGasGain = 8000.0;
+  }
+  else {
+    AliFatal("Not a valid gas mixture!");
+    exit(1);
+  }
   fTRFwid = (fTRFhi - fTRFlo) / ((Float_t) fTRFbin);
 
   // Create the sampled TRF
   SampleTRF();
+
 }
 
 //_____________________________________________________________________________
 void AliTRDSimParam::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   
+  // Samples the new time response function.
   //
 
-  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;
+  Int_t ipasa = 0;
+
+  // Xenon
+  // From Antons measurements with Fe55 source, adjusted by C. Lippmann.
+  // time bins are -0.4, -0.38, -0.36, ...., 3.54, 3.56, 3.58 microseconds
+  const Int_t kNpasa     = 200;  // kNpasa should be equal to fTRFbin!
+  Float_t xtalk[kNpasa];
+  Float_t signal[kNpasa]     = { 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000
+                              , 0.0002, 0.0007, 0.0026, 0.0089, 0.0253, 0.0612, 0.1319
+                              , 0.2416, 0.3913, 0.5609, 0.7295, 0.8662, 0.9581, 1.0000
+                              , 0.9990, 0.9611, 0.8995, 0.8269, 0.7495, 0.6714, 0.5987
+                              , 0.5334, 0.4756, 0.4249, 0.3811, 0.3433, 0.3110, 0.2837
+                              , 0.2607, 0.2409, 0.2243, 0.2099, 0.1974, 0.1868, 0.1776
+                              , 0.1695, 0.1627, 0.1566, 0.1509, 0.1457, 0.1407, 0.1362
+                              , 0.1317, 0.1274, 0.1233, 0.1196, 0.1162, 0.1131, 0.1102
+                              , 0.1075, 0.1051, 0.1026, 0.1004, 0.0979, 0.0956, 0.0934
+                              , 0.0912, 0.0892, 0.0875, 0.0858, 0.0843, 0.0829, 0.0815
+                              , 0.0799, 0.0786, 0.0772, 0.0757, 0.0741, 0.0729, 0.0718
+                              , 0.0706, 0.0692, 0.0680, 0.0669, 0.0655, 0.0643, 0.0630
+                              , 0.0618, 0.0607, 0.0596, 0.0587, 0.0576, 0.0568, 0.0558
+                              , 0.0550, 0.0541, 0.0531, 0.0522, 0.0513, 0.0505, 0.0497
+                              , 0.0490, 0.0484, 0.0474, 0.0465, 0.0457, 0.0449, 0.0441
+                              , 0.0433, 0.0425, 0.0417, 0.0410, 0.0402, 0.0395, 0.0388
+                              , 0.0381, 0.0374, 0.0368, 0.0361, 0.0354, 0.0348, 0.0342
+                              , 0.0336, 0.0330, 0.0324, 0.0318, 0.0312, 0.0306, 0.0301
+                              , 0.0296, 0.0290, 0.0285, 0.0280, 0.0275, 0.0270, 0.0265
+                              , 0.0260, 0.0256, 0.0251, 0.0246, 0.0242, 0.0238, 0.0233
+                              , 0.0229, 0.0225, 0.0221, 0.0217, 0.0213, 0.0209, 0.0206
+                              , 0.0202, 0.0198, 0.0195, 0.0191, 0.0188, 0.0184, 0.0181
+                              , 0.0178, 0.0175, 0.0171, 0.0168, 0.0165, 0.0162, 0.0159
+                              , 0.0157, 0.0154, 0.0151, 0.0148, 0.0146, 0.0143, 0.0140
+                              , 0.0138, 0.0135, 0.0133, 0.0131, 0.0128, 0.0126, 0.0124
+                              , 0.0121, 0.0119, 0.0120, 0.0115, 0.0113, 0.0111, 0.0109
+                              , 0.0107, 0.0105, 0.0103, 0.0101, 0.0100, 0.0098, 0.0096
+                              , 0.0094, 0.0092, 0.0091, 0.0089, 0.0088, 0.0086, 0.0084
+                              , 0.0083, 0.0081, 0.0080, 0.0078 };
+  signal[0] = 0.0;
+  signal[1] = 0.0;
+  signal[2] = 0.0;
+  // With undershoot, positive peak corresponds to ~3% of the main signal:
+  for (ipasa = 3; ipasa < kNpasa; ipasa++) {
+    xtalk[ipasa] = 0.2 * (signal[ipasa-2] - signal[ipasa-3]);
+  }
+  xtalk[0]  = 0.0;   
+  xtalk[1]  = 0.0;  
+  xtalk[2]  = 0.0;  
+
+  // Argon
+  // Ar measurement with Fe55 source by Anton
+  // time bins are 0.02, 0.06, 0.10, ...., 1.90, 1.94, 1.98 microseconds
+  const Int_t kNpasaAr = 50;
+  Float_t xtalkAr[kNpasaAr];
+  Float_t signalAr[kNpasaAr] = { -0.01,  0.01,  0.00,  0.00,  0.01
+                               , -0.01,  0.01,  2.15, 22.28, 55.53
+                               , 68.52, 58.21, 40.92, 27.12, 18.49
+                               , 13.42, 10.48,  8.67,  7.49,  6.55
+                               ,  5.71,  5.12,  4.63,  4.22,  3.81
+                               ,  3.48,  3.20,  2.94,  2.77,  2.63
+                               ,  2.50,  2.37,  2.23,  2.13,  2.03
+                               ,  1.91,  1.83,  1.75,  1.68,  1.63
+                               ,  1.56,  1.49,  1.50,  1.49,  1.29
+                              ,  1.19,  1.21,  1.21,  1.20,  1.10 };
+  // Normalization to maximum
+  for (ipasa = 0; ipasa < kNpasaAr; ipasa++) {
+    signalAr[ipasa] /= 68.52;
   }
+  signalAr[0] = 0.0;
+  signalAr[1] = 0.0;
+  signalAr[2] = 0.0;
+  // With undershoot, positive peak corresponds to ~3% of the main signal:
+  for (ipasa = 3; ipasa < kNpasaAr; ipasa++) {
+    xtalkAr[ipasa] = 0.2 * (signalAr[ipasa-2] - signalAr[ipasa-3]);
+  }
+  xtalkAr[0]  = 0.0;   
+  xtalkAr[1]  = 0.0;  
+  xtalkAr[2]  = 0.0;  
 
-  if (fTRFsmp) delete [] fTRFsmp;
+  if (fTRFsmp) {
+    delete [] fTRFsmp;
+  }
   fTRFsmp = new Float_t[fTRFbin];
-  if (fCTsmp)  delete [] fCTsmp;
+
+  if (fCTsmp)  {
+    delete [] fCTsmp;
+  }
   fCTsmp  = new Float_t[fTRFbin];
 
-  Float_t loTRF    = TMath::Max(fTRFlo, time[0]);
-  Float_t hiTRF    = TMath::Min(fTRFhi, time[kNpasa-1]);
-  Float_t binWidth = (hiTRF - loTRF) / ((Float_t) fTRFbin);
+  if      (AliTRDCommonParam::Instance()->IsXenon()) {
+    if (fTRFbin != kNpasa) {
+      AliError("Array mismatch (xenon)\n\n");
+    }
+  }
+  else if (AliTRDCommonParam::Instance()->IsArgon()) {
+    if (fTRFbin != kNpasaAr) {
+      AliError("Array mismatch (argon)\n\n");
+    }
+  }
 
-  // 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]);
-
+    if      (AliTRDCommonParam::Instance()->IsXenon()) {
+      fTRFsmp[iBin] = signal[iBin];
+      fCTsmp[iBin]  = xtalk[iBin];
+    }
+    else if (AliTRDCommonParam::Instance()->IsArgon()) {
+      fTRFsmp[iBin] = signalAr[iBin];
+      fCTsmp[iBin]  = xtalkAr[iBin];
+    }
   }
 
 }
@@ -539,16 +455,18 @@ Double_t AliTRDSimParam::TimeResponse(Double_t time) const
 {
   //
   // Applies the preamp shaper time response
+  // (We assume a signal rise time of 0.2us = fTRFlo/2.
   //
 
-  Int_t iBin = ((Int_t) ((time) / fTRFwid));
-  //Int_t iBin = ((Int_t) ((time - fTRFlo) / fTRFwid)); 
-  if ((iBin >= 0) && (iBin < fTRFbin)) {
-    return fTRFsmp[iBin];
-  }
+  Double_t rt   = (time - .5*fTRFlo) / fTRFwid;
+  Int_t    iBin = (Int_t) rt; 
+  Double_t dt   = rt - iBin; 
+  if ((iBin >= 0) && (iBin+1 < fTRFbin)) {
+    return fTRFsmp[iBin] + (fTRFsmp[iBin+1] - fTRFsmp[iBin])*dt;
+  } 
   else {
     return 0.0;
-  }    
+  }
 
 }
 
@@ -559,13 +477,14 @@ Double_t AliTRDSimParam::CrossTalk(Double_t time) const
   // Applies the pad-pad capacitive cross talk
   //
 
-  Int_t iBin = ((Int_t) ((time - fTRFlo) / fTRFwid)); 
-  if ((iBin >= 0) && (iBin < fTRFbin)) {
-    return fCTsmp[iBin];
-  }
+  Double_t rt   = (time - fTRFlo) / fTRFwid;
+  Int_t    iBin = (Int_t) rt; 
+  Double_t dt   = rt - iBin; 
+  if ((iBin >= 0) && (iBin+1 < fTRFbin)) {
+    return fCTsmp[iBin] + (fCTsmp[iBin+1] - fCTsmp[iBin])*dt;
+  } 
   else {
     return 0.0;
-  }    
+  }
 
 }
-