X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=T0%2FAliT0Calibrator.cxx;h=ed58a8721c55e141fabf233586d2a10c46aeccfa;hp=d5094b1fa16a7e850b4aa5b071073a475c42031b;hb=b505f1f84d8a4c8cea31d1218abc32317a1a5977;hpb=b0ab3f59d40d4dee6496c0430035c7aef032b83f

diff --git a/T0/AliT0Calibrator.cxx b/T0/AliT0Calibrator.cxx
index d5094b1fa16..ed58a8721c5 100644
--- a/T0/AliT0Calibrator.cxx
+++ b/T0/AliT0Calibrator.cxx
@@ -32,6 +32,9 @@
 #include "AliT0Calibrator.h"
 #include "AliT0Reconstructor.h"
 #include "AliT0RecoParam.h"
+#include "AliCDBEntry.h"
+#include "AliCDBManager.h"
+
 #include <TGraph.h>
 #include <TH1F.h>
 #include <TMath.h>
@@ -42,10 +45,12 @@ ClassImp(AliT0Calibrator)
 //____________________________________________________________________
   AliT0Calibrator::AliT0Calibrator():TNamed(),
 				     fChannelWidth(0),  
-				     fWalk(0)
+				     fWalk(0),
+				     fEqualized(0)
 				     
 {
   //constructor
+   printf(" AliT0Calibrator ::: AliT0RecoParam GetEq() %i\n", fEqualized);
    AliT0Parameters* param = AliT0Parameters::Instance();
    param->Init();
    //slewing correcion and equalizing channels
@@ -59,15 +64,15 @@ ClassImp(AliT0Calibrator)
     // fWalk.AddAtAndExpand(fu,i);
     //TGraph* fu = param ->GetAmpLEDRec(i);
     fWalk.AddAtAndExpand(fu,i);
-     
   }
   
 }
 //_____________________________________________________________________________
 
 AliT0Calibrator::AliT0Calibrator(const AliT0Calibrator &r): TNamed(),
-  fChannelWidth(0),  
-  fWalk(0)
+							    fChannelWidth(0),  
+							    fWalk(0), 
+							    fEqualized(0)
 
 {
   //
@@ -98,22 +103,23 @@ Int_t  AliT0Calibrator::WalkCorrection(Int_t refAmp,  Int_t ipmt, Int_t qt, Int_
 {
   //
   // referemce amplitude for walk correction now read from RecoParam
-  Int_t walk=0;
 
+   Int_t walk=0;
   Int_t timeEq=0, timeWalk=0;  
   TGraph *fu1=(TGraph*) fWalk.At(ipmt);
   if(fu1 && fu1->GetN()>0) {
     walk = Int_t(fu1->Eval(Double_t(qt)));
   }
   
-  timeWalk = time - walk   ;
-  timeEq =timeWalk - refAmp ; //- fTimeDelayCFD[ipmt]; //in refAmp - mean CFD position
- 
- //  timeEq= timeWalk - fTimeDelayCFD[ipmt];
+  if (fEqualized == 0)
+    timeEq= time - fTimeDelayCFD[ipmt]-walk;
+  else 
+    timeEq = time - walk -  refAmp;
+
   //   printf(" ipmt %i time before %i timeWalk %i , walk %i  qt %i fTimeDelayCFD[ipmt] %i timeEq %i \n ",
   //	 ipmt, time,timeWalk, walk, qt,fTimeDelayCFD[ipmt], timeEq );
-     AliDebug(10,Form(" ipmt %i time before %i timeWalk %i , walk %i  qt %i timeEq %i \n ",
-     ipmt, time,timeWalk, walk, qt, timeEq ));
+     AliDebug(2,Form(" fEqualized %i ipmt %i refAmp %i time before %i timeWalk %i , walk %i  qt %i timeEq %i \n ",
+		     fEqualized,   ipmt, refAmp, time,timeWalk, walk, qt, timeEq ));
   
    return timeEq;
 }