Calibrated TDC thresholds extracted from the HV-scan data. Affects both simulated...

diff --git a/VZERO/AliVZEROCalibData.cxx b/VZERO/AliVZEROCalibData.cxx
index 4a9ca58cefd66a72f7c5c493ae9c19e0c3fe0323..b84c5c74daa8619feeb88be65b8730a657b317f1 100644 (file)
--- a/VZERO/AliVZEROCalibData.cxx
+++ b/VZERO/AliVZEROCalibData.cxx
@@ -652,3 +652,30 @@ void  AliVZEROCalibData::InitPMGains()
     fPMGainsB[i] = gains->GetBinContent(i+1,2);
   }
 }
+
+Float_t AliVZEROCalibData::GetCalibDiscriThr(Int_t channel, Bool_t scaled)
+{
+  // The method returns actual TDC discri threshold
+  // extracted from the data.
+  //
+  // In case scaled flag is set the threshold is scaled
+  // so that to get 4.0 for a FEE threshold of 4.0.
+  // In this way we avoid a change in the slewing correction
+  // for the entire 2010 p-p data.
+  //
+  // The method is to be moved to OCDB object.
+
+  Float_t thr = GetDiscriThr(channel);
+
+  Float_t calThr = 0;
+  if (thr <= 1.) 
+    calThr = 3.1;
+  else if (thr >= 2.)
+    calThr = (3.1+1.15*thr-1.7);
+  else
+    calThr = (3.1-0.3*thr+0.3*thr*thr);
+
+  if (scaled) calThr *= 4./(3.1+1.15*4.-1.7);
+
+  return calThr;
+}

diff --git a/VZERO/AliVZEROCalibData.h b/VZERO/AliVZEROCalibData.h
index ff92f762d87178ae5acbf7c4241e7127faa08226..c267c7c41d9516e65ad2e24db1a8c174cdbad9e2 100644 (file)
--- a/VZERO/AliVZEROCalibData.h
+++ b/VZERO/AliVZEROCalibData.h
@@ -115,6 +115,8 @@ class AliVZEROCalibData: public TNamed {
   Float_t *GetPMGainsA() const { return fPMGainsA; }
   Float_t *GetPMGainsB() const { return fPMGainsB; }
 
+  Float_t  GetCalibDiscriThr(Int_t channel, Bool_t scaled);
+
  protected:
   void     InitLightYields();
   void     InitPMGains();

diff --git a/VZERO/AliVZERODigitizer.cxx b/VZERO/AliVZERODigitizer.cxx
index 798911e30682fed21f6897ececb096d0a19dec24..0d101cef2d1372087897f609e476dd562c9155b8 100644 (file)
--- a/VZERO/AliVZERODigitizer.cxx
+++ b/VZERO/AliVZERODigitizer.cxx
@@ -449,7 +449,7 @@ void AliVZERODigitizer::DigitizeSDigits()
   Float_t maximum = 0.9*fSignalShape->GetMaximum(0,200); // Not exact, one needs to do this on the convoluted
   Float_t integral2 = fSignalShape->Integral(0,200); // function. Anyway the effect is small <10% on the 2.5 ADC thr
   for (Int_t ipmt = 0; ipmt < 64; ++ipmt) {
-    Float_t thr = fCalibData->GetDiscriThr(ipmt)*kChargePerADC*maximum*fBinSize[ipmt]/integral2;
+    Float_t thr = fCalibData->GetCalibDiscriThr(ipmt,kFALSE)*kChargePerADC*maximum*fBinSize[ipmt]/integral2;
     Bool_t ltFound = kFALSE, ttFound = kFALSE;
     for (Int_t iBin = 0; iBin < fNBins[ipmt]; ++iBin) {
       Float_t t = fBinSize[ipmt]*Float_t(iBin);

diff --git a/VZERO/AliVZEROReconstructor.cxx b/VZERO/AliVZEROReconstructor.cxx
index 1d9156225cf7b69b1dfb9b37ced2c0451b77391a..4dee93c95f37938b1b6cb2b74d6ce6cf531c0200 100644 (file)
--- a/VZERO/AliVZEROReconstructor.cxx
+++ b/VZERO/AliVZEROReconstructor.cxx
@@ -482,7 +482,7 @@ Float_t AliVZEROReconstructor::CorrectLeadingTime(Int_t i, Float_t time, Float_t
   if (adc < 1e-6) return time;
 
   // Slewing correction
-  Float_t thr = fCalibData->GetDiscriThr(i);
+  Float_t thr = fCalibData->GetCalibDiscriThr(i,kTRUE);
   time -= fTimeSlewing->Eval(adc/thr);
 
   return time;