Addition to the revision 45154. The calibrated TDC threshold used also in the raw...
authorcvetan <cvetan@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 8 Nov 2010 09:03:03 +0000 (09:03 +0000)
committercvetan <cvetan@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 8 Nov 2010 09:03:03 +0000 (09:03 +0000)
VZERO/AliVZERO.cxx
VZERO/AliVZEROQADataMakerRec.cxx
VZERO/AliVZEROTriggerMask.cxx

index c9a5291..38c4134 100755 (executable)
@@ -571,7 +571,7 @@ Float_t AliVZERO::CorrectLeadingTime(Int_t i, Float_t time, Float_t adc) const
   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;
index 580f205..325083f 100644 (file)
@@ -699,8 +699,8 @@ void AliVZEROQADataMakerRec::MakeESDs(AliESDEvent * esd)
                        if (nphe>1.e-6) timeErr = TMath::Sqrt(kIntTimeRes*kIntTimeRes+
                                      p1*p1/nphe+
                                      p2*p2*(fTimeSlewing->GetParameter(0)*fTimeSlewing->GetParameter(1))*(fTimeSlewing->GetParameter(0)*fTimeSlewing->GetParameter(1))*
-                                     TMath::Power(adc[offlineCh]/fCalibData->GetDiscriThr(offlineCh),2.*(fTimeSlewing->GetParameter(1)-1.))/
-                                     (fCalibData->GetDiscriThr(offlineCh)*fCalibData->GetDiscriThr(offlineCh)));
+                                     TMath::Power(adc[offlineCh]/fCalibData->GetCalibDiscriThr(offlineCh,kTRUE),2.*(fTimeSlewing->GetParameter(1)-1.))/
+                                     (fCalibData->GetCalibDiscriThr(offlineCh,kTRUE)*fCalibData->GetCalibDiscriThr(offlineCh,kTRUE)));
 
                        if (timeErr>1.e-6) {
                          if (offlineCh<32) {
@@ -897,7 +897,7 @@ Float_t AliVZEROQADataMakerRec::CorrectLeadingTime(Int_t i, Float_t time, Float_
   if (adc < 1e-6) return time;
 
   // Slewing correction
-  Float_t thr = fCalibData->GetDiscriThr(i);
+  Float_t thr = fCalibData->GetCalibDiscriThr(i,kTRUE);
   //AliInfo(Form("adc %f thr %f dtime %f ", adc,thr,fTimeSlewing->Eval(adc/thr)));
   time -= fTimeSlewing->Eval(adc/thr);
 
index f6eb1d1..029a718 100644 (file)
@@ -130,8 +130,8 @@ void AliVZEROTriggerMask::FillMasks(AliESDVZERO *esdV0,
        Float_t timeErr = TMath::Sqrt(kIntTimeRes*kIntTimeRes+
                                      p1*p1/nphe+
                                      p2*p2*(slewing->GetParameter(0)*slewing->GetParameter(1))*(slewing->GetParameter(0)*slewing->GetParameter(1))*
-                                     TMath::Power(adc/cal->GetDiscriThr(i),2.*(slewing->GetParameter(1)-1.))/
-                                     (cal->GetDiscriThr(i)*cal->GetDiscriThr(i)));
+                                     TMath::Power(adc/cal->GetCalibDiscriThr(i,kTRUE),2.*(slewing->GetParameter(1)-1.))/
+                                     (cal->GetCalibDiscriThr(i,kTRUE)*cal->GetCalibDiscriThr(i,kTRUE)));
 
        if (i < 32) { // in V0C
          ntimeC++;