Parameters for calibration with DA data

diff --git a/T0/AliT0Parameters.cxx b/T0/AliT0Parameters.cxx
index 4982b94d5c9d85dfe8541e29bd55d4a8164f6b06..b69fa403a25a2a636646e01b913484cbc760bb0d 100644 (file)
--- a/T0/AliT0Parameters.cxx
+++ b/T0/AliT0Parameters.cxx
@@ -27,6 +27,8 @@
 #include "AliLog.h"              
 #include "AliT0Parameters.h"     
 #include "AliT0CalibData.h"   
+#include "AliT0CalibWalk.h"   
+#include "AliT0CalibTimeEq.h"   
 #include "AliT0LookUpValue.h"
 #include <AliCDBManager.h>        
 #include <AliCDBEntry.h>          
@@ -38,9 +40,9 @@
 #include <TGeoPhysicalNode.h>
 #include <AliGeomManager.h>
 
-AliT0CalibData* AliT0Parameters::fgCalibData = 0;
+AliT0CalibTimeEq* AliT0Parameters::fgCalibData = 0;
 AliT0CalibData* AliT0Parameters::fgLookUp = 0;
-AliT0CalibData* AliT0Parameters::fgSlewCorr =0;
+AliT0CalibWalk* AliT0Parameters::fgSlewCorr =0;
 //====================================================================
 ClassImp(AliT0Parameters)
 #if 0
@@ -68,8 +70,8 @@ AliT0Parameters::AliT0Parameters()
    fAmpLEDRec(0), 
    fPMTeff(),
    fWalk(0),
-   fTimeDelayDA(0), 
    fTimeDelayCFD(0), 
+ //  fTimeV0(0), 
    fTimeDelayTVD(0),
    fMeanT0(500),
    fLookUp(0),
@@ -106,7 +108,7 @@ AliT0Parameters::Init()
    //time equalizing
    fCalibentry  = stor->Get("T0/Calib/TimeDelay");
    if (fCalibentry)
-     fgCalibData  = (AliT0CalibData*)fCalibentry->GetObject();
+     fgCalibData  = (AliT0CalibTimeEq*)fCalibentry->GetObject();
    else {
          AliFatal(" ALARM !!!! No time delays in CDB "); 
      fIsInit = kFALSE;
@@ -115,7 +117,7 @@ AliT0Parameters::Init()
  //slewing correction
   fSlewCorr  = stor->Get("T0/Calib/Slewing_Walk");
   if (fSlewCorr){
-    fgSlewCorr  = (AliT0CalibData*)fSlewCorr->GetObject();
+    fgSlewCorr  = (AliT0CalibWalk*)fSlewCorr->GetObject();
   }
   else {
       AliFatal(" ALARM !!!! No slewing correction in CDB "); 
@@ -175,22 +177,9 @@ void AliT0Parameters::InitIfOnline()
   fIsInit=kTRUE;
 }
 //__________________________________________________________________
-
-Float_t
-AliT0Parameters::GetTimeDelayDA(Int_t ipmt) 
-{
-  // return time delay for LED channel
-  // 
-  if (!fCalibentry) {
-    fTimeDelayDA = 500;
-    return  fTimeDelayDA;
-  } 
-  return fgCalibData ->GetTimeDelayDA(ipmt);
-}
-//__________________________________________________________________
 Float_t
 AliT0Parameters::GetTimeDelayCFD(Int_t ipmt) 
-{
+  {
   // return time delay for CFD channel
    // 
   if (!fCalibentry) 
@@ -199,10 +188,10 @@ AliT0Parameters::GetTimeDelayCFD(Int_t ipmt)
       return fTimeDelayCFD;
     }
    
-  return fgCalibData->GetTimeDelayCFD(ipmt);
+  return fgCalibData->GetTimeEq(ipmt);
 }
 
-//__________________________________________________________________
+
 Int_t
 AliT0Parameters::GetMeanT0() 
 {

diff --git a/T0/AliT0Parameters.h b/T0/AliT0Parameters.h
index b9d72216471e173d27d044f21c985758c10f2cc7..189e5d4ed70a96f337f5ec392e0f9b6da895829d 100644 (file)
--- a/T0/AliT0Parameters.h
+++ b/T0/AliT0Parameters.h
@@ -21,6 +21,8 @@
 #include <TObjArray.h>
 class AliT0CalibData;
 class AliCDBEntry;
+class AliT0CalibWalk;
+class AliT0CalibTimeEq;
 
 class AliT0Parameters : public TNamed
 {
@@ -72,16 +74,16 @@ public:
   Float_t  GetWalkVal(Int_t ipmt, Float_t mv ) const ;
    
   Float_t GetTimeDelayCFD(Int_t ipmt);
-  Float_t GetTimeDelayDA(Int_t ipmt);
+//  Float_t GetTimeV0(Int_t ipmt = 512) {return  fTimeV0;}
 
   //  void SetMeanT0(Int_t mean=500) { fMeanT0 = mean; };
   Int_t GetMeanT0 (); //{return fMeanT0;};
 
-    TMap * GetMapLookup();
+  TMap * GetMapLookup();
   Int_t GetChannel(Int_t trm,  Int_t tdc, Int_t chain, Int_t channel);
   Int_t GetNumberOfTRMs();
   void SetNumberOfTRMs(Int_t ntrms=2) {fNumberOfTRMs = ntrms;}
-
+  
  protected:
   static AliT0Parameters* fgInstance; // Static singleton instance
   
@@ -97,8 +99,8 @@ public:
   TObjArray fPMTeff; //array PMT registration efficiency
   TObjArray fWalk; //array time-amplitude walk
   
-  Float_t   fTimeDelayDA;  //  sum time delay for LED channel
   Float_t   fTimeDelayCFD;  // sum time delay for CFD channel
+ // Float_t   fTimeV0;  // sum time delay for CFD channel
   Float_t   fTimeDelayTVD;  //time delay for TVD (vertex trigger channel)
   Int_t     fMeanT0; //mean of T0distribution with vertex=0;
   
@@ -106,9 +108,9 @@ public:
   Int_t     fNumberOfTRMs;    // number of TRMs in setup
   
 
-  static AliT0CalibData * fgCalibData; // singleton for Calibration data
+  static AliT0CalibTimeEq * fgCalibData; // singleton for Calibration data
   static AliT0CalibData * fgLookUp; // singleton for Calibration data
-  static AliT0CalibData * fgSlewCorr; // singleton for Calibration data
+  static AliT0CalibWalk * fgSlewCorr; // singleton for Calibration data
   
   AliCDBEntry*   fCalibentry ;  // pointer to T0 calibration object
   AliCDBEntry*   fLookUpentry ;  // pointer to T0 lokkup table