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 90bcad8545975338840147b9046c662a5cd4d697..e79d50e27ada5368fda970bbc0ad8da0b1415d7c 100644 (file)
--- a/T0/AliT0Calibrator.cxx
+++ b/T0/AliT0Calibrator.cxx
@@ -1,3 +1,4 @@
+
 /**************************************************************************
  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
@@ -29,31 +30,36 @@
 #include "AliLog.h"
 #include "AliT0Parameters.h"
 #include "AliT0Calibrator.h"
+#include "AliT0Reconstructor.h"
+#include "AliT0RecoParam.h"
 #include <TGraph.h>
 #include <TH1F.h>
-//#include "iostream.h"
+#include <TMath.h>
+#include <Riostream.h>
 
 ClassImp(AliT0Calibrator)
 
 //____________________________________________________________________
   AliT0Calibrator::AliT0Calibrator():TNamed(),
-  fChannelWidth(0),  
-  fWalk(0)
+                                    fChannelWidth(0),  
+                                    fWalk(0)
+                                    
 {
   //constructor
+   AliT0Parameters* param = AliT0Parameters::Instance();
+   param->Init();
+   //slewing correcion and equalizing channels
 
-  AliT0Parameters* param = AliT0Parameters::Instance();
-  param->Init();
-  
   fChannelWidth = param->GetChannelWidth() ;  
- 
+   //   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);
     fWalk.AddAtAndExpand(fu,i);
+     
   }
   
-  //
 }
 //_____________________________________________________________________________
 
@@ -83,32 +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;
 
-  Float_t walk=0;
-     Float_t maxValue=0;
- Int_t timeEq=0, timeWalk=0;  
+  Int_t timeEq=0, timeWalk=0;  
   TGraph *fu1=(TGraph*) fWalk.At(ipmt);
-  if(fu1){
-    walk=fu1->Eval(Float_t(qt));
-    TH1F*hr=fu1->GetHistogram();
-    maxValue=hr->GetMaximum(50);
+  if(fu1 && fu1->GetN()>0) {
+    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 == "pdc") {
-    timeWalk = time + Int_t((maxValue-walk)/fChannelWidth) ;
-    timeEq= timeWalk - (fTimeDelayCFD[ipmt]-fTimeDelayCFD[0]);
-  }
-  if (option == "cosmic") {
-    timeWalk = time + Int_t((maxValue-walk)) ;
-    if (ipmt<12) timeEq= timeWalk - (fTimeDelayCFD[ipmt]-fTimeDelayCFD[0]);
-    if (ipmt>11)  timeEq= timeWalk - (fTimeDelayCFD[ipmt]-fTimeDelayCFD[12]);
-  }
-  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;
 }