automatic histogram scaling for AODs now available

[u/mrichter/AliRoot.git] / T0 / AliT0Calibrator.cxx

diff --git a/T0/AliT0Calibrator.cxx b/T0/AliT0Calibrator.cxx
index 6cae77ac84c4ecef523a6346a108396c26049f19..e79d50e27ada5368fda970bbc0ad8da0b1415d7c 100644 (file)
--- a/T0/AliT0Calibrator.cxx
+++ b/T0/AliT0Calibrator.cxx
@@ -30,6 +30,8 @@
 #include "AliLog.h"
 #include "AliT0Parameters.h"
 #include "AliT0Calibrator.h"
+#include "AliT0Reconstructor.h"
+#include "AliT0RecoParam.h"
 #include <TGraph.h>
 #include <TH1F.h>
 #include <TMath.h>
@@ -44,40 +46,20 @@ ClassImp(AliT0Calibrator)
                                     
 {
   //constructor
-
    AliT0Parameters* param = AliT0Parameters::Instance();
    param->Init();
-  
+   //slewing correcion and equalizing channels
+
   fChannelWidth = param->GetChannelWidth() ;  
-  Double_t *grY ; //= new grY[2500] ;
-  // Double_t *grX ;
-  Int_t index[25000];
-  Bool_t down=true;
+   //   Double_t *grX ; 
   for (Int_t i=0; i<24; i++){
     fMaxValue[i]=0;
     fTimeDelayCFD[i] = Int_t (param->GetTimeDelayCFD(i));
-     
     TGraph* fu = param ->GetWalk(i);
-     //    TGraph* fu  = param ->GetAmpLEDRec(i);
-       fWalk.AddAtAndExpand(fu,i);
-       
-  if(fu) {
-      Int_t np=fu->GetN();
-      if(np>0) {
-       grY = fu->GetY();
-       //      grX[i] = fu->GetX();
-       TMath::Sort(np, grY, index,down);
-       fMaxValue[i]=Int_t(grY[index[0]]);
-
-      }
-    }
-       
+    fWalk.AddAtAndExpand(fu,i);
+     
   }
-
-  //  delete [] grY;
-  //  delete [] grX;
   
-  //
 }
 //_____________________________________________________________________________
 
@@ -107,36 +89,32 @@ AliT0Calibrator &AliT0Calibrator::operator=(const AliT0Calibrator &r)
 }
 
 
-
 //____________________________________________________________________
-Int_t  AliT0Calibrator::WalkCorrection(Int_t ipmt, Int_t qt, Int_t time, TString option) 
+
+Int_t  AliT0Calibrator::WalkCorrection(Int_t refAmp,  Int_t ipmt, Int_t qt, Int_t time) 
+
 {
-  //slewing correcion and equalizing channels
+  //
+  // referemce amplitude for walk correction now read from RecoParam
+
+  Double_t *grY ; 
 
   Int_t walk=0;
 
   Int_t timeEq=0, timeWalk=0;  
-  //  TGraph* fu1 = param ->GetWalk(ipmt);
-  //   TGraph* fu1  = param ->GetAmpLEDRec(ipmt);
-   TGraph *fu1=(TGraph*) fWalk.At(ipmt);
+  TGraph *fu1=(TGraph*) fWalk.At(ipmt);
   if(fu1 && fu1->GetN()>0) {
-    walk=Int_t(fu1->Eval(Double_t(qt)));
-  }
-  if (option == "pdc") {
-    timeWalk = time + Int_t(fMaxValue[ipmt]-walk) ;
-    //    timeEq= timeWalk - fTimeDelayCFD[ipmt];
-    timeEq= timeWalk - fTimeDelayCFD[ipmt]; //for the same as cosmic
-     AliDebug(10,Form(" ipmt %i time before %i timeWalk %i ,  qt %i timeEq %i \n ",
-                ipmt, time,timeWalk, qt, timeEq ));
+    grY = fu1->GetY();
+    fMaxValue[ipmt]=grY[refAmp-1];
+    //    TGraph* fu  = param ->GetAmpLEDRec(i);
+    walk = Int_t (fMaxValue[ipmt]) + Int_t(fu1->Eval(Double_t(qt)));
   }
-  if (option == "cosmic") {
-    timeWalk = time + Int_t((fMaxValue[ipmt]-walk)) ;
-    if(walk <1  )  timeWalk = time  ;
-     timeEq= timeWalk - fTimeDelayCFD[ipmt];
-     AliDebug(10,Form(" ipmt %i time before %i timeWalk %i ,  qt %i timeEq %i \n ",
-                ipmt, time,timeWalk, qt, timeEq ));
-  }
- 
+  
+  timeWalk = time + walk   ;
+  timeEq= timeWalk - fTimeDelayCFD[ipmt];
+  AliDebug(10,Form(" ipmt %i time before %i timeWalk %i , walk %i  qt %i timeEq %i \n ",
+                  ipmt, time,timeWalk, walk, qt, timeEq ));
+  
   return timeEq;
 }