]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - T0/AliT0Reconstructor.cxx
Fix for DA
[u/mrichter/AliRoot.git] / T0 / AliT0Reconstructor.cxx
index 8ca992476161c5fabbad868272d7a160f247ead7..3245a15c8b79fd5df2901502abbc9b7605b13425 100644 (file)
@@ -1,3 +1,4 @@
+
 /**************************************************************************
  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
 #include "AliT0Reconstructor.h"
 #include "AliT0Parameters.h"
 #include "AliT0Calibrator.h"
+#include "AliESDfriend.h"
+#include "AliESDTZEROfriend.h"
+#include "AliLog.h"
+#include "AliCDBEntry.h" 
+#include "AliCDBManager.h"
+#include "AliCTPTimeParams.h"
+#include "AliLHCClockPhase.h"
 
 #include <TArrayI.h>
 #include <TGraph.h>
 #include <TMath.h>
-#include <iostream.h>
+#include <Riostream.h>
 
 ClassImp(AliT0Reconstructor)
 
@@ -44,81 +52,87 @@ ClassImp(AliT0Reconstructor)
                                             fZposition(0),
                                             fParam(NULL),
                                             fAmpLEDrec(),
-                                            fCalib()
+                                            fQTC(0),
+                                            fAmpLED(0),
+                                             fCalib(),
+                                             fLatencyHPTDC(9000),
+                                             fLatencyL1(0),
+                                             fLatencyL1A(0),
+                                             fLatencyL1C(0),
+                                            fGRPdelays(0),
+                                             fESDTZEROfriend(NULL)
+
 {
   //constructor
+  AliCDBEntry *entry = AliCDBManager::Instance()->Get("GRP/CTP/CTPtiming");
+  if (!entry) AliFatal("CTP timing parameters are not found in OCDB !");
+  AliCTPTimeParams *ctpParams = (AliCTPTimeParams*)entry->GetObject();
+  Float_t l1Delay = (Float_t)ctpParams->GetDelayL1L0()*25.0;
+
+  AliCDBEntry *entry1 = AliCDBManager::Instance()->Get("GRP/CTP/TimeAlign");
+  if (!entry1) AliFatal("CTP time-alignment is not found in OCDB !");
+  AliCTPTimeParams *ctpTimeAlign = (AliCTPTimeParams*)entry1->GetObject();
+  l1Delay += ((Float_t)ctpTimeAlign->GetDelayL1L0()*25.0);
+  AliCDBEntry *entry4 = AliCDBManager::Instance()->Get("GRP/Calib/LHCClockPhase");
+  if (!entry4) AliFatal("LHC clock-phase shift is not found in OCDB !");
+  AliLHCClockPhase *phase = (AliLHCClockPhase*)entry4->GetObject();
+
+  fGRPdelays = l1Delay - phase->GetMeanPhase();
 
- AliDebug(1,"Start reconstructor ");
-  
   fParam = AliT0Parameters::Instance();
   fParam->Init();
-  
   for (Int_t i=0; i<24; i++){
         TGraph* gr = fParam ->GetAmpLEDRec(i);
        if (gr) fAmpLEDrec.AddAtAndExpand(gr,i) ; 
-}
-  
-  fdZonC = TMath::Abs(fParam->GetZPositionShift("T0/C/PMT1"));
-  fdZonA = TMath::Abs(fParam->GetZPositionShift("T0/A/PMT15"));
-  fCalib = new AliT0Calibrator();
-
-}
-//____________________________________________________________________
-
-AliT0Reconstructor::AliT0Reconstructor(const AliT0Reconstructor &r):
-  AliReconstructor(r),
-                                            fdZonA(0),
-                                            fdZonC(0),
-                                            fZposition(0),
-                                            fParam(NULL),
-                                             fAmpLEDrec(),
-                                            fCalib()
-
- {
-  //
-  // AliT0Reconstructor copy constructor
-  //
-
-  ((AliT0Reconstructor &) r).Copy(*this);
-
-}
+         TGraph* gr1 = fParam ->GetAmpLED(i);
+         if (gr1) fAmpLED.AddAtAndExpand(gr1,i) ; 
+         TGraph* gr2 = fParam ->GetQTC(i);
+         if (gr2) fQTC.AddAtAndExpand(gr2,i) ;         
+  }
 
-//_____________________________________________________________________________
-AliT0Reconstructor &AliT0Reconstructor::operator=(const AliT0Reconstructor &r)
-{
-  //
-  // Assignment operator
-  //
+  fLatencyL1 = fParam->GetLatencyL1();
+  fLatencyL1A = fParam->GetLatencyL1A();
+  fLatencyL1C = fParam->GetLatencyL1C();
+  fLatencyHPTDC = fParam->GetLatencyHPTDC();
+  AliDebug(2,Form(" LatencyL1 %f latencyL1A %f latencyL1C %f latencyHPTDC %f \n",fLatencyL1, fLatencyL1A, fLatencyL1C, fLatencyHPTDC));
+  
+  // fdZonC = TMath::Abs(fParam->GetZPositionShift("T0/C/PMT1"));
+  //fdZonA = TMath::Abs(fParam->GetZPositionShift("T0/A/PMT15"));
+  //here real Z position
+  fdZonC = TMath::Abs(fParam->GetZPosition("T0/C/PMT1"));
+  fdZonA = TMath::Abs(fParam->GetZPosition("T0/A/PMT15"));
 
-  if (this != &r) ((AliT0Reconstructor &) r).Copy(*this);
-  return *this;
+  fCalib = new AliT0Calibrator();
+  fESDTZEROfriend = new AliESDTZEROfriend();
 
 }
 
 //_____________________________________________________________________________
-
 void AliT0Reconstructor::Reconstruct(TTree*digitsTree, TTree*clustersTree) const
   
 {
   // T0 digits reconstruction
-  // T0RecPoint writing 
+  Int_t refAmp = Int_t (GetRecoParam()->GetRefAmp());
   
-   
   TArrayI * timeCFD = new TArrayI(24); 
   TArrayI * timeLED = new TArrayI(24); 
   TArrayI * chargeQT0 = new TArrayI(24); 
   TArrayI * chargeQT1 = new TArrayI(24); 
 
-
-  //  Int_t mV2Mip = param->GetmV2Mip();     
-  //mV2Mip = param->GetmV2Mip();     
   Float_t channelWidth = fParam->GetChannelWidth() ;  
-  //  Int_t meanT0 = fParam->GetMeanT0();
+  Float_t meanVertex = fParam->GetMeanVertex();
+  Float_t c = 0.0299792; // cm/ps
+  Double32_t vertex = 9999999;
+  Double32_t timeDiff=999999, meanTime=999999, timeclock=999999;
+
   
   AliDebug(1,Form("Start DIGITS reconstruction "));
   
 
- TBranch *brDigits=digitsTree->GetBranch("T0");
 TBranch *brDigits=digitsTree->GetBranch("T0");
   AliT0digit *fDigits = new AliT0digit() ;
   if (brDigits) {
     brDigits->SetAddress(&fDigits);
@@ -135,35 +149,41 @@ void AliT0Reconstructor::Reconstruct(TTree*digitsTree, TTree*clustersTree) const
   fDigits->GetQT0(*chargeQT0);
   fDigits->GetQT1(*chargeQT1);
   Int_t onlineMean =  fDigits->MeanTime();
-  cout<<" !!!! onlineMean "<<onlineMean<<endl;
+
+  Bool_t tr[5];
+  for (Int_t i=0; i<5; i++) tr[i]=false; 
   
-  Float_t besttimeA=999999;
-  Float_t besttimeC=999999;
+  Double32_t besttimeA=999999;
+  Double32_t besttimeC=999999;
   Int_t pmtBestA=99999;
   Int_t pmtBestC=99999;
-  Float_t timeDiff=999999, meanTime=0;
   
-
   AliT0RecPoint* frecpoints= new AliT0RecPoint ();
-  clustersTree->Branch( "T0", "AliT0RecPoint" ,&frecpoints, 405,1);
+  clustersTree->Branch( "T0", "AliT0RecPoint" ,&frecpoints);
   
- Float_t time[24], adc[24];
 Float_t time[24], adc[24];
   for (Int_t ipmt=0; ipmt<24; ipmt++) {
     if(timeCFD->At(ipmt)>0 ){
-      Double_t qt0 = Double_t(chargeQT0->At(ipmt));
-      Double_t qt1 = Double_t(chargeQT1->At(ipmt));
-      if((qt1-qt0)>0)  adc[ipmt] = Int_t (TMath::Exp( Double_t (channelWidth*(qt1-qt0)/1000)));
-
-      time[ipmt] = fCalib-> WalkCorrection( ipmt, Int_t(qt1) , timeCFD->At(ipmt), "pdc" ) ;
+     if(( chargeQT1->At(ipmt) - chargeQT0->At(ipmt))>0)  
+       adc[ipmt] = chargeQT1->At(ipmt) - chargeQT0->At(ipmt);
+      else
+       adc[ipmt] = 0;
       
-      //LED
-      Double_t sl = (timeLED->At(ipmt) - time[ipmt])*channelWidth;
-      Double_t qt=((TGraph*)fAmpLEDrec.At(ipmt))->Eval(sl/1000.);
-      AliDebug(1,Form(" ipmt %i QTC %i , time in chann %i (led-cfd) %i ",
+     time[ipmt] = fCalib-> WalkCorrection(refAmp, ipmt, Int_t(adc[ipmt]),  timeCFD->At(ipmt)) ;
+            
+      Double_t sl = Double_t(timeLED->At(ipmt) - timeCFD->At(ipmt));
+      //    time[ipmt] = fCalib-> WalkCorrection( refAmp,ipmt, Int_t(sl),  timeCFD->At(ipmt) ) ;
+      AliDebug(10,Form(" ipmt %i QTC %i , time in chann %i (led-cfd) %i ",
                       ipmt, Int_t(adc[ipmt]) ,Int_t(time[ipmt]),Int_t( sl)));
-      frecpoints->SetTime(ipmt,Int_t(time[ipmt]));
-      frecpoints->SetAmp(ipmt,Int_t (adc[ipmt]));
-      frecpoints->SetAmpLED(ipmt,qt);
+
+      Double_t ampMip =((TGraph*)fAmpLED.At(ipmt))->Eval(sl);
+      Double_t qtMip = ((TGraph*)fQTC.At(ipmt))->Eval(adc[ipmt]);
+      AliDebug(10,Form("  Amlitude in MIPS LED %f ,  QTC %f in channels %f\n ",ampMip,qtMip, adc[ipmt]));
+      
+      frecpoints->SetTime(ipmt, Float_t(time[ipmt]) );
+      frecpoints->SetAmpLED(ipmt, Float_t( ampMip)); //for cosmic &pp beam 
+      frecpoints->SetAmp(ipmt, Float_t(qtMip));
+      
     }
     else {
       time[ipmt] = 0;
@@ -186,34 +206,38 @@ void AliT0Reconstructor::Reconstruct(TTree*digitsTree, TTree*clustersTree) const
         pmtBestA=ipmt;}
     }
   }
-  if(besttimeA !=999999)  frecpoints->SetTimeBestA(Int_t(besttimeA));
-  if( besttimeC != 999999 ) frecpoints->SetTimeBestC(Int_t(besttimeC));
-  AliDebug(1,Form(" besttimeA %f ch,  besttimeC %f ch",besttimeA, besttimeC));
-  Float_t c = 0.0299792; // cm/ps
-  Float_t vertex = 0;
-  if(besttimeA !=999999 && besttimeC != 999999 ){
-    timeDiff = (besttimeC - besttimeA)*channelWidth;
-    meanTime = (Float_t((besttimeA + besttimeC -4000)/2) * channelWidth); 
-    //    meanTime = (meanT0 - (besttimeA + besttimeC)/2) * channelWidth;
-    vertex = c*(timeDiff)/2. + (fdZonA - fdZonC)/2; //-(lenr-lenl))/2;
-    frecpoints->SetVertex(vertex);
-    frecpoints->SetMeanTime(Int_t(meanTime));
-    //online mean
-    frecpoints->SetOnlineMean(Int_t(onlineMean * channelWidth));
-    AliDebug(1,Form("  timeDiff %f ps,  meanTime %f ps, vertex %f cm online mean %i ps",timeDiff, meanTime,vertex, Int_t(onlineMean * channelWidth )));
-    
+  if(besttimeA < 999999) {
+    frecpoints->SetTimeBestA(Int_t(besttimeA *channelWidth - fdZonA/c));
+    tr[1]=true;
   }
-  //time in each channel as time[ipmt]-MeanTimeinThisChannel(with vertex=0)
-  /*  
-  for (Int_t ipmt=0; ipmt<24; ipmt++) {
-    if(time[ipmt]>1) {
-      //      time[ipmt] = (time[ipmt] - fTime0vertex[ipmt])*channelWidth;
-      time[ipmt] =Int_t  ( Float_t(time[ipmt]) * channelWidth);
-      frecpoints->SetTime(ipmt,time[ipmt]);
-    }
+  if( besttimeC < 999999 ) {
+    frecpoints->SetTimeBestC(Int_t(besttimeC *channelWidth - fdZonA/c));
+    tr[2]=true;
+  }
+  AliDebug(10,Form(" besttimeA %f ch,  besttimeC %f ch",besttimeA, besttimeC));
+  if(besttimeA <999999 && besttimeC < 999999 ){
+    //    timeDiff = (besttimeC - besttimeA)*channelWidth;
+    timeDiff = (besttimeA - besttimeC)*channelWidth;
+    meanTime = (besttimeA + besttimeC)/2;// * channelWidth); 
+    timeclock = meanTime *channelWidth -fdZonA/c ;
+    vertex = meanVertex - c*(timeDiff)/2.;// + (fdZonA - fdZonC)/2;
+    tr[0]=true; 
   }
-*/
+  frecpoints->SetVertex(vertex);
+  frecpoints->SetMeanTime(meanTime);
+  frecpoints->SetT0clock(timeclock);
+  frecpoints->SetT0Trig(tr);
+
+  AliDebug(10,Form("T0 triggers %d %d %d %d %d",tr[0],tr[1],tr[2],tr[3],tr[4]));
+
+  //online mean
+  frecpoints->SetOnlineMean(Int_t(onlineMean));
+  AliDebug(10,Form("  timeDiff %f #channel,  meanTime %f #channel, vertex %f cm online mean %i timeclock %f ps",timeDiff, meanTime,vertex, Int_t(onlineMean), timeclock));
+  
+  
+
+   
+  
   clustersTree->Fill();
 
   delete timeCFD;
@@ -228,186 +252,267 @@ void AliT0Reconstructor::Reconstruct(TTree*digitsTree, TTree*clustersTree) const
 void AliT0Reconstructor::Reconstruct(AliRawReader* rawReader, TTree*recTree) const
 {
   // T0 raw ->
-  // T0RecPoint writing 
-  
-  //Q->T-> coefficients !!!! should be measured!!!
+  //
+  // reference amplitude and time ref. point from reco param
+
+  Float_t refAmp = GetRecoParam()->GetRefAmp();
+  Int_t refPoint = 0;
+  //Bad channel
+  Int_t badpmt = GetRecoParam()->GetRefPoint();
+  Int_t low[110], high[110];
+
   Int_t allData[110][5];
   
   Int_t timeCFD[24], timeLED[24], chargeQT0[24], chargeQT1[24];
-  TString option = GetOption(); 
-   AliDebug(10,Form("Option: %s\n", option.Data()));
-   
-   for (Int_t i0=0; i0<105; i0++)
-     {
-       for (Int_t j0=0; j0<5; j0++) allData[i0][j0]=0;         
-     }
-   
-   Float_t besttimeA=9999999;
-   Float_t besttimeC=9999999;
-   Int_t pmtBestA=99999;
-   Int_t pmtBestC=99999;
-   Float_t timeDiff=9999999, meanTime=0;
-   Double_t qt=0;
-   
-   AliT0RecPoint* frecpoints= new AliT0RecPoint ();
+  Double32_t timeDiff=999999, meanTime=999999, timeclock=999999;
+  Float_t c = 29.9792458; // cm/ns
+  Double32_t vertex = 9999999;
+  Int_t onlineMean=0;
+  // Float_t meanVertex = fParam->GetMeanVertex();
+  Float_t meanVertex = 0;
+  for (Int_t i0=0; i0<105; i0++)
+    {
+      for (Int_t j0=0; j0<5; j0++) allData[i0][j0]=0; 
+      low[i0] = Int_t (GetRecoParam()->GetLow(i0));    
+      high[i0] = Int_t (GetRecoParam()->GetHigh(i0));
+    }
    
-   recTree->Branch( "T0", "AliT0RecPoint" ,&frecpoints, 405,1);
+  Double32_t besttimeA=9999999;
+  Double32_t besttimeC=9999999;
+  Int_t pmtBestA=99999;
+  Int_t pmtBestC=99999;
    
+  AliT0RecPoint* frecpoints= new AliT0RecPoint ();
+  
+  recTree->Branch( "T0", "AliT0RecPoint" ,&frecpoints);
    
-   AliDebug(10," before read data ");
-   AliT0RawReader myrawreader(rawReader);
-   if (!myrawreader.Next())
-     AliDebug(1,Form(" no raw data found!!"));
-   else
-     {  
-       for (Int_t i=0; i<105; i++) {
-        for (Int_t iHit=0; iHit<5; iHit++) 
-          {
-            allData[i][iHit] = myrawreader.GetData(i,iHit);
-          }
-       }
-       
-       Float_t channelWidth = fParam->GetChannelWidth() ;  
-       
-       //       Int_t meanT0 = fParam->GetMeanT0();
-       if(option == "pdc"){
-        for (Int_t in=0; in<24; in++)  
-          {
-            
-            timeLED[in] = allData[in+1][0] ;
-            timeCFD[in] = allData[in+25][0] ;
-            chargeQT1[in] = allData[in+57][0] ;
-            chargeQT0[in] = allData[in+80][0] ;
-          }
-       }
-       
-       if(option == "cosmic") {
-        for (Int_t in=0; in<12; in++)  
-          {
-            timeCFD[in] = allData[in+1][0] ;
-            timeCFD[in+12] = allData[in+56+1][0] ;
-            timeLED[in] = allData[in+12+1][0] ;
-            timeLED[in+12] = allData[in+68+1][0] ;
-          }
-        
-        for (Int_t in=0; in<24;  in=in+2)
-          {
-            Int_t cc=in/2;
-            chargeQT1[cc]=allData[in+25][0];
-            chargeQT0[cc]=allData[in+26][0];
-          }
-        for (Int_t in=24; in<48;  in=in+2)
-          {
-            Int_t cc=in/2;
-            chargeQT1[cc]=allData[in+57][0];
-            chargeQT0[cc]=allData[in+58][0];
+  AliDebug(10," before read data ");
+  AliT0RawReader myrawreader(rawReader);
+
+  UInt_t type =rawReader->GetType();
+
+  if (!myrawreader.Next())
+    AliDebug(1,Form(" no raw data found!!"));
+  else
+    {  
+   for (Int_t i=0; i<24; i++)
+    {
+      timeCFD[i]=0; timeLED[i]=0; chargeQT0[i]=0; chargeQT1[i]=0;
+    }
+     Int_t fBCID=Int_t (rawReader->GetBCID());
+      Int_t trmbunch= myrawreader.GetTRMBunchID();
+      AliDebug(10,Form(" CDH BC ID %i, TRM BC ID %i \n", fBCID, trmbunch ));
+      if(type == 7  ) {  //only physics 
+       for (Int_t i=0; i<105; i++) {
+       for (Int_t iHit=0; iHit<5; iHit++) 
+         {
+           allData[i][iHit] = myrawreader.GetData(i,iHit);
+         }
+       }
+       Int_t ref=0;
+       if (refPoint>0) 
+         ref = allData[refPoint][0]-5000;
+       
+       Float_t channelWidth = fParam->GetChannelWidth() ;  
+       
+       //       Int_t meanT0 = fParam->GetMeanT0();
+       
+       for (Int_t in=0; in<12; in++)  
+         {
+           for (Int_t iHit=0; iHit<5; iHit++) 
+             {
+               if(allData[in+1][iHit] > low[in+1] && 
+                  allData[in+1][iHit] < high[in+1])
+                 {
+                   timeCFD[in] = allData[in+1][iHit] ; 
+                   break;
+                 }
+             }
+           for (Int_t iHit=0; iHit<5; iHit++) 
+             {
+               if(allData[in+12+1][iHit] > low[in+12+1] && 
+                  allData[in+1+12][iHit] < high[in+12+1])
+                 {
+                       timeLED[in] = allData[in+12+1][iHit] ;
+                       break;
+                 }
+             }
+           for (Int_t iHit=0; iHit<5; iHit++) 
+             {
+               if(allData[in+1+56][iHit] > low[in+1+56] && 
+                  allData[in+1+56][iHit] < high[in+1+56])
+                 {
+                   timeCFD[in+12] = allData[in+56+1][iHit] ;
+                   break;
+                 }
+             }
+           
+           for (Int_t iHit=0; iHit<5; iHit++) 
+             {
+               if(allData[in+1+68][iHit] > low[in+1+68] && 
+                  allData[in+1+68][iHit] < high[in+1+68])
+                 {
+                   timeLED[in+12] = allData[in+68+1][iHit] ;
+                   break;
+                 }
+             }
+           AliDebug(10, Form(" readed i %i cfdC %i cfdA %i ledC %i ledA%i ",
+                             in, timeCFD[in],timeCFD[in+12],timeLED[in], 
+                             timeLED[in+12]));   
+           
+         }
+       
+       
+       for (Int_t in=0; in<12;  in++)
+         {
+           chargeQT0[in]=allData[2*in+25][0];
+           chargeQT1[in]=allData[2*in+26][0];
+           AliDebug(10, Form(" readed Raw %i %i %i",
+                             in, chargeQT0[in],chargeQT1[in]));
+         }     
+       for (Int_t in=12; in<24;  in++)
+         {
+           chargeQT0[in]=allData[2*in+57][0];
+           chargeQT1[in]=allData[2*in+58][0];
+           AliDebug(10, Form(" readed Raw %i %i %i",
+                             in, chargeQT0[in],chargeQT1[in]));
+           
+         }
+       
+       for (Int_t iHit=0; iHit<5; iHit++) 
+         {
+             if(allData[49][iHit] > low[49] && 
+                allData[49][iHit] < high[49]){
+               onlineMean = allData[49][iHit];
+               break;
+             }
+         }
+       Double32_t time[24], adc[24],  noncalibtime[24];
+       for (Int_t ipmt=0; ipmt<24; ipmt++) {
+         if(timeCFD[ipmt]>0 ){
+          //for simulated data
+            //for physics  data
+          if(( chargeQT0[ipmt] - chargeQT1[ipmt])>0)  {
+            adc[ipmt] = chargeQT0[ipmt] - chargeQT1[ipmt];
           }
-        
-       }
-       for (Int_t in=0; in<24; in++)  
-        AliDebug(10, Form(" readed Raw %i %i %i %i %i", in, timeLED[in],timeCFD[in],chargeQT0[in],chargeQT1[in]));
-       Int_t onlineMean = allData[49][0];       
-       
-       Float_t time[24], adc[24];
-       for (Int_t ipmt=0; ipmt<24; ipmt++) {
-        if(timeCFD[ipmt]>0 && timeLED[ipmt]>0){
+          else
+            adc[ipmt] = 0;
+          time[ipmt] = fCalib-> WalkCorrection(Int_t (refAmp), ipmt, Int_t(adc[ipmt]), timeCFD[ipmt] ) ;
           
-          if(option == "pdc"){
-            Double_t qt0 = Double_t(chargeQT0[ipmt]);
-            Double_t qt1 = Double_t(chargeQT1[ipmt]);
-            if((qt1-qt0)>0)  adc[ipmt] = Int_t(TMath::Exp( Double_t (channelWidth*(qt1-qt0)/1000.)));
-            time[ipmt] = fCalib-> WalkCorrection( ipmt,Int_t(qt1) , timeCFD[ipmt], "pdc" ) ;
-            Double_t sl = (timeLED[ipmt] - time[ipmt])*channelWidth;
-            if(fAmpLEDrec.At(ipmt)) 
-              qt=((TGraph*)fAmpLEDrec.At(ipmt))->Eval(sl/1000.);
-            frecpoints->SetTime(ipmt,Int_t(time[ipmt]));
-            frecpoints->SetAmp(ipmt,Int_t(adc[ipmt]));
-            frecpoints->SetAmpLED(ipmt,qt);
-            AliDebug(10,Form(" QTC %f mv,  time in chann %f ampLED %f",adc[ipmt] ,time[ipmt], qt));
-          }
-          if(option == "cosmic") {
-            //      if(ipmt == 15) continue; //skip crashed PMT
-            if(( chargeQT1[ipmt] - chargeQT0[ipmt])>0)  
-              adc[ipmt] = chargeQT1[ipmt] - chargeQT0[ipmt];
-            else
-              adc[ipmt] = 0;
-            //      time[ipmt] = fCalib-> WalkCorrection( ipmt, adc[ipmt], timeCFD[ipmt],"cosmic" ) ;
-            // time[ipmt] =  timeCFD[ipmt] ;
-            Double_t sl = timeLED[ipmt] - timeCFD[ipmt];
-            time[ipmt] = fCalib-> WalkCorrection( ipmt, Int_t(sl), timeCFD[ipmt],"cosmic" ) ;
-            if(fAmpLEDrec.At(ipmt)) 
-              qt=((TGraph*)fAmpLEDrec.At(ipmt))->Eval(sl);
-            time[ipmt] = time[ipmt] - allData[0][0] + 5000;
-            AliDebug(10,Form(" ipmt %i QTC %i , time in chann %i (led-cfd) %i ampLED %f",
-                             ipmt, Int_t(adc[ipmt]) ,Int_t(time[ipmt]),Int_t( sl), qt));
+          Double_t sl = timeLED[ipmt] - timeCFD[ipmt];
+          // time[ipmt] = fCalib-> WalkCorrection( refAmp,ipmt, Int_t(sl), timeCFD[ipmt] ) ;
+          AliDebug(5,Form(" ipmt %i QTC %i , time in chann %i (led-cfd) %i ",
+                           ipmt, Int_t(adc[ipmt]) ,Int_t(time[ipmt]),Int_t( sl)));
+          Double_t ampMip =( (TGraph*)fAmpLED.At(ipmt))->Eval(sl);
+          Double_t qtMip = ((TGraph*)fQTC.At(ipmt))->Eval(adc[ipmt]);
+          AliDebug(10,Form("  Amlitude in MIPS LED %f ; QTC %f;  in channels %f\n ",ampMip,qtMip, adc[ipmt]));
+          //bad peak removing
             frecpoints->SetTime(ipmt, Float_t(time[ipmt]) );
-            frecpoints->SetAmp(ipmt, Float_t(adc[ipmt]));
-            frecpoints->SetAmpLED(ipmt, Float_t(qt));
-          }
-          
+            // frecpoints->SetTime(ipmt,Double32_t(timeCFD[ipmt]));
+            frecpoints->SetAmp(ipmt, Double32_t( qtMip)); //for cosmic &pp beam 
+            frecpoints->SetAmpLED(ipmt, Double32_t(ampMip));        
+            noncalibtime[ipmt]= Double32_t (timeCFD[ipmt]);
         }
         else {
           time[ipmt] = 0;
           adc[ipmt] = 0;
+          noncalibtime[ipmt] = 0;
         }
        }
-       
+       fESDTZEROfriend->SetT0timeCorr(noncalibtime) ;     
        for (Int_t ipmt=0; ipmt<12; ipmt++){
-        if(time[ipmt] > 1 ) {
-          if(time[ipmt]<besttimeC){
-            besttimeC=time[ipmt]; //timeC
-            pmtBestC=ipmt;
+        if(time[ipmt] > 1 && ipmt != badpmt && adc[ipmt]>0.1 )
+          {
+            if(time[ipmt]<besttimeC){
+              besttimeC=time[ipmt]; //timeC
+              pmtBestC=ipmt;
+            }
           }
-        }
        }
-       for ( Int_t ipmt=12; ipmt<24; ipmt++){
-        if(time[ipmt] > 1) {
-          if(time[ipmt]<besttimeA) {
-            besttimeA=time[ipmt]; //timeA
-            pmtBestA=ipmt;}
+       for ( Int_t ipmt=12; ipmt<24; ipmt++)
+        {
+          if(time[ipmt] > 1 && ipmt != badpmt && adc[ipmt]>0.1)
+            {
+              if(time[ipmt]<besttimeA) {
+                besttimeA=time[ipmt]; //timeA
+                pmtBestA=ipmt;
+              }
+            }
         }
-       }
-       if(besttimeA !=9999999)  frecpoints->SetTimeBestA(Int_t(besttimeA));
-       if( besttimeC != 9999999 ) frecpoints->SetTimeBestC(Int_t(besttimeC));
-       AliDebug(1,Form(" besttimeA %f ps,  besttimeC %f ps",besttimeA, besttimeC));
-       Float_t c = 0.0299792; // cm/ps
-       Float_t vertex = 99999;
-       if(besttimeA <9999999 && besttimeC < 9999999 ){
-        timeDiff = ( besttimeC - besttimeA) *channelWidth;
-        if(option == "pdc"){ 
-          //      meanTime = (besttimeA + besttimeC)/2 * channelWidth; 
-          meanTime = (besttimeA + besttimeC-4000.)/2 * channelWidth; 
-          onlineMean = Int_t (onlineMean * channelWidth);
-        }
-        if(option == "cosmic") {
-          meanTime =  Float_t((besttimeA + besttimeC)/2);  
-          onlineMean = onlineMean -allData[0][0];;
-        }
-        vertex = c*(timeDiff)/2.+ (fdZonA - fdZonC)/2; 
-        frecpoints->SetVertex(vertex);
-        frecpoints->SetMeanTime(Int_t(meanTime));
-        AliDebug(1,Form("  timeDiff %f ps,  meanTime %f ps, vertex %f cm online mean %i ",timeDiff, meanTime,vertex, onlineMean));
-        
-       }
+       if(besttimeA < 999999) 
+        frecpoints->SetTimeBestA(besttimeA * channelWidth - 1000.*fLatencyHPTDC + 1000.*fLatencyL1A - 1000.*fGRPdelays);
+       if( besttimeC < 999999 ) 
+        frecpoints->SetTimeBestC(besttimeC * channelWidth - 1000.*fLatencyHPTDC +1000.*fLatencyL1C - 1000.*fGRPdelays);
+       AliDebug(10,Form(" pmtA %i besttimeA %f ps, pmtC %i besttimeC %f ps",
+                      pmtBestA,besttimeA, pmtBestC,  besttimeC));
+        if(besttimeA <999999 && besttimeC < 999999 ){
+        timeDiff = ( besttimeA - besttimeC)* 0.001* channelWidth + fLatencyL1A - fLatencyL1C;
+        timeclock = channelWidth * Float_t( besttimeA+besttimeC)/2. - 1000.*fLatencyHPTDC + 1000.*fLatencyL1 - 1000.*fGRPdelays;  
+        meanTime = (besttimeA+besttimeC-2.*Float_t(ref))/2.;
+        vertex =  meanVertex - c*(timeDiff)/2. ; //+ (fdZonA - fdZonC)/2; 
+       }
+      }  //if phys event       
+      AliDebug(5,Form("  timeDiff %f #channel,  meanTime %f #channel, TOFmean%f  vertex %f cm meanVertex %f online mean %i \n",timeDiff, meanTime,timeclock, vertex,meanVertex, onlineMean));
+      frecpoints->SetT0clock(timeclock);
+      frecpoints->SetVertex(vertex);
+      frecpoints->SetMeanTime(meanTime);
+      frecpoints->SetOnlineMean(Int_t(onlineMean));
+       // Set triggers
+      
+      Bool_t tr[5];
+      Int_t trchan[5]= {50,51,52,55,56};
+      for (Int_t i=0; i<5; i++) tr[i]=false; 
+      for (Int_t itr=0; itr<5; itr++) {
+       for (Int_t iHit=0; iHit<5; iHit++) 
+         {
+           Int_t trr=trchan[itr];
+           if(allData[trr][iHit] > low[trr] &&
+              allData[trr][iHit] < high[trr]&&
+              allData[trr][iHit] > 0) tr[itr]=true;
+         }
+      }
+      frecpoints->SetT0Trig(tr);
      } // if (else )raw data
-   recTree->Fill();
-   if(frecpoints) delete frecpoints;
+  recTree->Fill();
+  if(frecpoints) delete frecpoints;
 }
-//____________________________________________________________
-
-void AliT0Reconstructor::FillESD(TTree */*digitsTree*/, TTree *clustersTree, AliESDEvent *pESD) const
-{
+  
+  
+  //____________________________________________________________
+  
+  void AliT0Reconstructor::FillESD(TTree */*digitsTree*/, TTree *clustersTree, AliESDEvent *pESD) const
+  {
 
   /***************************************************
   Resonstruct digits to vertex position
   ****************************************************/
   
   AliDebug(1,Form("Start FillESD T0"));
-
+  Float_t channelWidth = fParam->GetChannelWidth() ;  
+  Float_t c = 0.0299792458; // cm/ps
+  Float_t currentVertex=0, shift=0;
+  Int_t ncont=0;
+  const AliESDVertex* vertex = pESD->GetPrimaryVertex();
+  if (!vertex)        vertex = pESD->GetPrimaryVertexSPD();
+  if (!vertex)        vertex = pESD->GetPrimaryVertexTPC();
+  if (!vertex)        vertex = pESD->GetVertex();
+
+  if (vertex) {
+    AliDebug(2, Form("Got %s (%s) from ESD: %f", 
+                   vertex->GetName(), vertex->GetTitle(), vertex->GetZ()));
+    currentVertex = vertex->GetZ();
+    
+    ncont = vertex->GetNContributors();
+    //  cout<<"@@ spdver "<<spdver<<" ncont "<<ncont<<endl;
+    if(ncont>2 ) {
+      shift = currentVertex/c;
+    }
+  }
   TTree *treeR = clustersTree;
   
-   AliT0RecPoint* frecpoints= new AliT0RecPoint ();
-    if (!frecpoints) {
+  AliT0RecPoint* frecpoints= new AliT0RecPoint ();
+  if (!frecpoints) {
     AliError("Reconstruct Fill ESD >> no recpoints found");
     return;
   }
@@ -420,21 +525,61 @@ void AliT0Reconstructor::FillESD(TTree */*digitsTree*/, TTree *clustersTree, Ali
     AliError(Form("EXEC Branch T0 rec not found"));
     return;
   } 
+  
+  brRec->GetEntry(0);
+  Double32_t amp[24], time[24], ampQTC[24], timecorr[24];  
+  Double32_t* tcorr;
+  for(Int_t i=0; i<24; i++) 
+    amp[i]=time[i]=ampQTC[i]=timecorr[i]=0;
+
+  Double32_t timeClock[3];
+  Double32_t zPosition = frecpoints -> GetVertex();
+  Double32_t timeStart = frecpoints -> GetMeanTime();
+  timeClock[0] = frecpoints -> GetT0clock() ;
+  timeClock[1] = frecpoints -> GetBestTimeA() + shift;
+  timeClock[2] = frecpoints -> GetBestTimeC() - shift;
+  for ( Int_t i=0; i<24; i++) {
+    time[i] =  frecpoints -> GetTime(i); // ps to ns
+    if ( time[i] >1) {
+      ampQTC[i] = frecpoints -> GetAmp(i);
+      amp[i] = frecpoints -> AmpLED(i);
+      AliDebug(1,Form("T0: time %f  ampQTC %f ampLED %f \n", time[i], ampQTC[i], amp[i]));
+   }
+  }
+  Int_t trig= frecpoints ->GetT0Trig();
+  pESD->SetT0Trig(trig);
+  
+  pESD->SetT0zVertex(zPosition); //vertex Z position 
+  pESD->SetT0(timeStart);        // interaction time 
+  for(Int_t i=0; i<3; i++) 
+    pESD->SetT0TOF(i,timeClock[i]);   // interaction time (ns) 
+  pESD->SetT0time(time);         // best TOF on each PMT 
+  pESD->SetT0amplitude(ampQTC);     // number of particles(MIPs) on each PMT
+  
+  AliDebug(1,Form("T0: Vertex %f (T0A+T0C)/2 %f #channels T0signal %f ns OrA %f ns OrC %f T0trig %i\n",zPosition, timeStart, timeClock[0], timeClock[1], timeClock[2], trig));
+  
+  if (pESD) {
     
-    brRec->GetEntry(0);
-    Float_t amp[24], time[24];
-    Float_t  zPosition = frecpoints -> GetVertex();
-    Float_t timeStart = frecpoints -> GetMeanTime() ;
-    for ( Int_t i=0; i<24; i++) {
-      time[i] = Float_t (frecpoints -> GetTime(i)); // ps to ns
-      amp[i] = frecpoints -> GetAmp(i);
+    AliESDfriend *fr = (AliESDfriend*)pESD->FindListObject("AliESDfriend");
+    if (fr) {
+      AliDebug(1, Form("Writing TZERO friend data to ESD tree"));
+
+      //     if (ncont>2) {
+       tcorr = fESDTZEROfriend->GetT0timeCorr();
+       for ( Int_t i=0; i<24; i++) {
+         if(i<12 && time[i]>1) timecorr[i] = tcorr[i] -  shift/channelWidth;
+         if(i>11 && time[i]>1) timecorr[i] = tcorr[i] +  shift/channelWidth;
+         if(time[i]>1)   AliDebug(1,Form("T0 friend : time %f  ampQTC %f ampLED %f \n", timecorr[i], ampQTC[i], amp[i]));
+       }
+       fESDTZEROfriend->SetT0timeCorr( timecorr) ;
+       fESDTZEROfriend->SetT0ampLEDminCFD(amp);
+       fESDTZEROfriend->SetT0ampQTC(ampQTC);
+       fr->SetTZEROfriend(fESDTZEROfriend);
+       //      }//
     }
-    pESD->SetT0zVertex(zPosition); //vertex Z position 
-    pESD->SetT0(timeStart);        // interaction time 
-    pESD->SetT0time(time);         // best TOF on each PMT 
-    pESD->SetT0amplitude(amp);     // number of particles(MIPs) on each PMT
-    AliDebug(1,Form(" Z position %f cm,  T0  %f ps",zPosition , timeStart));
+  }
+     
+
 
 } // vertex in 3 sigma