revert unwanted changes

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

diff --git a/T0/AliT0Parameters.cxx b/T0/AliT0Parameters.cxx
index b69fa403a25a2a636646e01b913484cbc760bb0d..74f24c2f2ef1cbb998d983230ada56dbc3ec8ed0 100644 (file)
--- a/T0/AliT0Parameters.cxx
+++ b/T0/AliT0Parameters.cxx
@@ -24,25 +24,30 @@
 // Eventually, this class will use the Conditions DB to get the
 // various parameters, which code can then request from here.
 //                                                       
+#include "AliT0.h"
 #include "AliLog.h"              
 #include "AliT0Parameters.h"     
 #include "AliT0CalibData.h"   
 #include "AliT0CalibWalk.h"   
 #include "AliT0CalibTimeEq.h"   
+#include "AliT0CalibLatency.h"   
+#include "AliT0LookUpKey.h"
 #include "AliT0LookUpValue.h"
 #include <AliCDBManager.h>        
 #include <AliCDBEntry.h>          
 #include <AliCDBStorage.h>  
 #include <TMath.h>
 #include <TSystem.h>
-#include <Riostream.h>
+//#include <Riostream.h>
 #include <TGeoManager.h>
 #include <TGeoPhysicalNode.h>
+#include <TGeoMatrix.h>
 #include <AliGeomManager.h>
 
 AliT0CalibTimeEq* AliT0Parameters::fgCalibData = 0;
 AliT0CalibData* AliT0Parameters::fgLookUp = 0;
 AliT0CalibWalk* AliT0Parameters::fgSlewCorr =0;
+AliT0CalibLatency *AliT0Parameters::fgLatency=0;
 //====================================================================
 ClassImp(AliT0Parameters)
 #if 0
@@ -70,14 +75,23 @@ AliT0Parameters::AliT0Parameters()
    fAmpLEDRec(0), 
    fPMTeff(),
    fWalk(0),
+   fQTC(0),
+   fAmpLED(0),
    fTimeDelayCFD(0), 
  //  fTimeV0(0), 
    fTimeDelayTVD(0),
-   fMeanT0(500),
+   fMeanT0(512),
+   fMeanVertex(0),
+   fLatencyHPTDC(0),
+   fLatencyL1(0),
+   fLatencyL1A(0),
+   fLatencyL1C(0),
    fLookUp(0),
    fNumberOfTRMs(2),
-   fCalibentry(), fLookUpentry(),fSlewCorr()
-
+   fCalibentry(), 
+   fLookUpentry(),
+   fSlewCorr(),
+   fLatency()
   
 {
   // Default constructor 
@@ -134,7 +148,18 @@ AliT0Parameters::Init()
     fIsInit = kFALSE;
     return;
   }
-  fIsInit = kTRUE;
+  //latency
+  
+ fLatency  = stor->Get("T0/Calib/Latency");
+  if (fLatency){
+    fgLatency  = (AliT0CalibLatency*)fLatency->GetObject();
+  }
+  else {
+     AliWarning(" !!! no latency  in CDB "); 
+    return;
+  }
+  
+fIsInit = kTRUE;
 }
 
 
@@ -167,11 +192,11 @@ void AliT0Parameters::InitIfOnline()
           lookvalue->SetChain(chain);
           lookvalue->SetChannel(channel);
           lookkey->SetKey(ik);
+         fgLookUp->GetMapLookup()->Add((TObject*)lookvalue,(TObject*)lookkey); 
          if (channel<6) channel +=2;
          else {channel = 0; tdc++;}
-         if(ik==57) { tdc=0; channel=0; chain = 1;}
+         if(ik==56) { tdc=0; channel=0; chain = 1;}
 
-         fgLookUp->GetMapLookup()->Add((TObject*)lookvalue,(TObject*)lookkey); 
        }
   
   fIsInit=kTRUE;
@@ -191,18 +216,57 @@ AliT0Parameters::GetTimeDelayCFD(Int_t ipmt)
   return fgCalibData->GetTimeEq(ipmt);
 }
 
+//__________________________________________________________________
+Float_t
+AliT0Parameters::GetLatencyHPTDC() 
+  {
+  // return LatencyHPTDC for CFD channel
+  if (!fLatency) 
+    {
+      fLatencyHPTDC=9000.;
+      return fLatencyHPTDC;
+    }
+   
+  return fgLatency->GetLatencyHPTDC();
+}
+//__________________________________________________________________
+Float_t
+AliT0Parameters::GetLatencyL1() 
+  {
+  // return time delay for CFD channel
+   
+  return fgLatency->GetLatencyL1();
+}
 
-Int_t
-AliT0Parameters::GetMeanT0() 
-{
-  // return mean of T0 distrubution with vertex=0
-   // 
+//__________________________________________________________________
+Float_t
+AliT0Parameters::GetLatencyL1A() 
+  {
+  // return time delay for CFD channel
+   
+  return fgLatency->GetLatencyL1A();
+}
+
+//__________________________________________________________________
+Float_t
+AliT0Parameters::GetLatencyL1C() 
+  {
+  // return time delay for CFD channel
+   
+  return fgLatency->GetLatencyL1C();
+}
+//__________________________________________________________________
+
+Float_t
+AliT0Parameters:: GetMeanVertex()
+{ 
   if (!fCalibentry) 
     {
-      return fMeanT0;
+      fMeanVertex=0;
+      return fMeanVertex;
     }
    
-  return fgCalibData->GetMeanT0();
+  return fgCalibData->GetMeanVertex();
 }
 //__________________________________________________________________
 
@@ -228,14 +292,26 @@ TGraph *AliT0Parameters::GetWalk(Int_t ipmt) const
 
 //__________________________________________________________________
 
-Float_t AliT0Parameters::GetWalkVal(Int_t ipmt, Float_t mv) const
+TGraph *AliT0Parameters::GetQTC(Int_t ipmt) const
 {
   if (!fSlewCorr) {
-    return ((TGraph*)fWalk.At(ipmt))->Eval(mv); 
+    AliError("No walk correction is available!");
+    //    return  (TGraph*)fQTC.At(ipmt); 
+   return  0; 
   } 
-  return fgSlewCorr -> GetWalkVal(ipmt, mv) ;
+  return fgSlewCorr -> GetQTC(ipmt) ;
 }
 
+//__________________________________________________________________
+TGraph *AliT0Parameters::GetAmpLED(Int_t ipmt) const
+{
+  if (!fSlewCorr) {
+    AliError("No walk correction is available!");
+    //    return  (TGraph*)fQTC.At(ipmt); 
+   return  0; 
+  } 
+  return fgSlewCorr -> GetAmpLED(ipmt) ;
+}
 
 //__________________________________________________________________
 void