]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - T0/AliT0Reconstructor.cxx
Update
[u/mrichter/AliRoot.git] / T0 / AliT0Reconstructor.cxx
index 9fbca54ef7750cb558349210afe69533abc52215..760073fff719e76edfcb2a500bdf998a0d08e607 100644 (file)
@@ -1,3 +1,4 @@
+
 /**************************************************************************
  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  **************************************************************************/
 
 /* $Id$ */
+/*********************************************************************
+ *  T0 reconstruction and filling ESD
+ *  - reconstruct mean time (interation time) 
+ *  - vertex position
+ *  -  multiplicity
+ ********************************************************************/
 
-#include <Riostream.h>
-
-#include <TDirectory.h>
-
-#include "AliRunLoader.h"
-#include "AliRun.h"
-#include <AliESD.h>
+#include <AliESDEvent.h>
 #include "AliLog.h"
-#include <TClonesArray.h>
 #include "AliT0RecPoint.h"
 #include "AliRawReader.h"
 #include "AliT0RawReader.h"
-#include "AliT0Loader.h"
 #include "AliT0digit.h"
 #include "AliT0Reconstructor.h"
 #include "AliT0Parameters.h"
-#include "AliCDBLocal.h"
-#include "AliCDBStorage.h"
-#include "AliCDBManager.h"
-#include "AliCDBEntry.h"
+#include "AliT0Calibrator.h"
+#include "AliESDfriend.h"
+#include "AliESDTZEROfriend.h"
+#include "AliLog.h"
 
 #include <TArrayI.h>
 #include <TGraph.h>
+#include <TMath.h>
+#include <Riostream.h>
 
 ClassImp(AliT0Reconstructor)
 
-  void  AliT0Reconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digitsTree) const
+  AliT0Reconstructor:: AliT0Reconstructor(): AliReconstructor(),
+                                            fdZonA(0),
+                                            fdZonC(0),
+                                            fZposition(0),
+                                            fParam(NULL),
+                                            fAmpLEDrec(),
+                                            fQTC(0),
+                                            fAmpLED(0),
+                                             fCalib(),
+                                             fLatencyHPTDC(9000),
+                                             fLatencyL1(0),
+                                             fLatencyL1A(0),
+                                             fLatencyL1C(0),
+                                             fESDTZEROfriend(NULL)
+
 {
-  //T0 raw data-> digits conversion
- // reconstruct time information from raw data
-  AliT0RawReader myrawreader(rawReader,digitsTree);
-  if (!myrawreader.Next())
-    AliDebug(1,Form(" no raw data found!! %i", myrawreader.Next()));
+  //constructor
+
+  fParam = AliT0Parameters::Instance();
+  fParam->Init();
+  for (Int_t i=0; i<24; i++){
+        TGraph* gr = fParam ->GetAmpLEDRec(i);
+       if (gr) fAmpLEDrec.AddAtAndExpand(gr,i) ; 
+         TGraph* gr1 = fParam ->GetAmpLED(i);
+         if (gr1) fAmpLED.AddAtAndExpand(gr1,i) ; 
+         TGraph* gr2 = fParam ->GetQTC(i);
+         if (gr2) fQTC.AddAtAndExpand(gr2,i) ;         
+  }
+
+  fLatencyL1 = fParam->GetLatencyL1();
+  fLatencyL1A = fParam->GetLatencyL1A();
+  fLatencyL1C = fParam->GetLatencyL1C();
+  fLatencyHPTDC = fParam->GetLatencyHPTDC();
+  AliDebug(10,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"));
+
+
+  fCalib = new AliT0Calibrator();
+  fESDTZEROfriend = new AliESDTZEROfriend();
+
 }
+
+//_____________________________________________________________________________
 void AliT0Reconstructor::Reconstruct(TTree*digitsTree, TTree*clustersTree) const
+  
 {
-// T0 digits reconstruction
-// T0RecPoint writing 
-
-    //Q->T-> coefficients !!!! should be asked!!!
-  //  Float_t ph2MIP=500;
-  Float_t gain[24], timeDelayCFD[24], timeDelayLED[24];
-  Float_t zdetA,zdetC;
-  TObjArray slewingLED;
-    
-  TArrayI * fADC = new TArrayI(24); 
-  TArrayI * fTimeCFD = new TArrayI(24); 
-  TArrayI * fADCLED = new TArrayI(24); 
-  TArrayI * fTimeLED = new TArrayI(24); 
+  // T0 digits reconstruction
+  Int_t refAmp = GetRecoParam()->GetRefAmp();
+  
+  TArrayI * timeCFD = new TArrayI(24); 
+  TArrayI * timeLED = new TArrayI(24); 
+  TArrayI * chargeQT0 = new TArrayI(24); 
+  TArrayI * chargeQT1 = new TArrayI(24); 
 
-  AliT0Parameters* param = AliT0Parameters::Instance();
-  param->Init();
+  Float_t channelWidth = fParam->GetChannelWidth() ;  
+  Float_t meanVertex = fParam->GetMeanVertex();
+  Float_t c = 0.0299792; // cm/ps
+  Double32_t vertex = 9999999;
+  Double32_t timeDiff=999999, meanTime=999999, timeclock=999999;
 
-  Int_t mV2Mip = param->GetmV2Mip();     
-  //mV2Mip = param->GetmV2Mip();     
-  Int_t channelWidth = param->GetChannelWidth() ;  
   
-  for (Int_t i=0; i<24; i++){
-    timeDelayCFD[i] = param->GetTimeDelayCFD(i);
-    timeDelayLED[i] = param->GetTimeDelayLED(i);
-    gain[i] = param->GetGain(i);
-    //gain[i] = 1;
-    slewingLED.AddAtAndExpand(param->GetSlew(i),i);
-  }
-  zdetC = param->GetZposition(0);
-  zdetA  = param->GetZposition(1);
-    
   AliDebug(1,Form("Start DIGITS reconstruction "));
+  
+
   TBranch *brDigits=digitsTree->GetBranch("T0");
-  AliT0digit *fDigits = new AliT0digit();
+  AliT0digit *fDigits = new AliT0digit() ;
   if (brDigits) {
     brDigits->SetAddress(&fDigits);
   }else{
-    cerr<<"EXEC Branch T0 digits not found"<<endl;
-    return;
+    AliError(Form("EXEC Branch T0 digits not found"));
+     return;
   }
+  
+  digitsTree->GetEvent(0);
+  digitsTree->GetEntry(0);
   brDigits->GetEntry(0);
-  fDigits->GetTime(*fTimeCFD);
-  fDigits->GetADC(*fADC);
-  fDigits->GetTimeAmp(*fTimeLED);
-  fDigits->GetADCAmp(*fADCLED);
+  fDigits->GetTimeCFD(*timeCFD);
+  fDigits->GetTimeLED(*timeLED);
+  fDigits->GetQT0(*chargeQT0);
+  fDigits->GetQT1(*chargeQT1);
+  Int_t onlineMean =  fDigits->MeanTime();
 
-  Float_t besttimeright=999999;
-  Float_t besttimeleft=999999;
-  Int_t pmtBestRight=99999;
-  Int_t pmtBestLeft=99999;
-  Float_t timeDiff=999999, meanTime=0;
+  Bool_t tr[5];
+  for (Int_t i=0; i<5; i++) tr[i]=false; 
+  
+  Double32_t besttimeA=999999;
+  Double32_t besttimeC=999999;
+  Int_t pmtBestA=99999;
+  Int_t pmtBestC=99999;
   
   AliT0RecPoint* frecpoints= new AliT0RecPoint ();
   clustersTree->Branch( "T0", "AliT0RecPoint" ,&frecpoints, 405,1);
-
+  
   Float_t time[24], adc[24];
   for (Int_t ipmt=0; ipmt<24; ipmt++) {
+    if(timeCFD->At(ipmt)>0 ){
+     if(( chargeQT1->At(ipmt) - chargeQT0->At(ipmt))>0)  
+       adc[ipmt] = chargeQT1->At(ipmt) - chargeQT0->At(ipmt);
+      else
+       adc[ipmt] = 0;
+      
+     // time[ipmt] = fCalib-> WalkCorrection(refAmp, ipmt, 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)));
+
+      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 %i\n ",ampMip,qtMip, adc[ipmt]));
+      
+      frecpoints->SetTime(ipmt, Float_t(time[ipmt]) );
+      frecpoints->SetAmp(ipmt, Float_t( ampMip)); //for cosmic &pp beam 
+      frecpoints->SetAmpLED(ipmt, Float_t(qtMip));
       
-    if(fTimeCFD->At(ipmt)>0 ){
-      time[ipmt] = channelWidth *( fTimeCFD->At(ipmt)) - 1000*timeDelayCFD[ipmt];
-      Float_t adc_digPs = channelWidth * Float_t (fADCLED->At(ipmt)) ;
-      adc[ipmt] = TMath::Exp(adc_digPs/1000) /gain[ipmt];
-      AliDebug(1,Form(" time %f ps,  adc %f mv in MIP %i\n ",
-                     time[ipmt], adc[ipmt], Int_t (adc[ipmt]/mV2Mip +0.5)));
-      frecpoints->SetTime(ipmt,time[ipmt]);
-      frecpoints->SetAmp(ipmt,adc[ipmt]);
     }
     else {
       time[ipmt] = 0;
       adc[ipmt] = 0;
     }
   }
+  
   for (Int_t ipmt=0; ipmt<12; ipmt++){
     if(time[ipmt] > 1 ) {
-      if(time[ipmt]<besttimeleft){
-       besttimeleft=time[ipmt]; //timeleft
-       pmtBestLeft=ipmt;
+      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]<besttimeright) {
-       besttimeright=time[ipmt]; //timeright
-        pmtBestRight=ipmt;}
+      if(time[ipmt]<besttimeA) {
+       besttimeA=time[ipmt]; //timeA
+        pmtBestA=ipmt;}
     }
   }
-  if(besttimeright !=999999)  frecpoints->SetTimeBestRight(Int_t(besttimeright));
-  if( besttimeleft != 999999 ) frecpoints->SetTimeBestLeft(Int_t(besttimeleft));
-  AliDebug(1,Form(" besttimeA %f ps,  besttimeC %f ps",besttimeright, besttimeleft));
-  Float_t c = 0.0299792; // cm/ps
-  Float_t vertex = 0;
-  if(besttimeright !=999999 && besttimeleft != 999999 ){
-    timeDiff = besttimeleft - besttimeright;
-    meanTime = (besttimeright + besttimeleft)/2.;
-    vertex = c*(timeDiff)/2.; //-(lenr-lenl))/2;
-    AliDebug(1,Form("  timeDiff %f ps,  meanTime %f ps, vertex %f cm",timeDiff, meanTime,vertex ));
-    frecpoints->SetVertex(vertex);
-    frecpoints->SetMeanTime(Int_t(meanTime));
-    
+  if(besttimeA < 999999) {
+    frecpoints->SetTimeBestA(Int_t(besttimeA *channelWidth));
+    tr[1]=true;
+  }
+  if( besttimeC < 999999 ) {
+    frecpoints->SetTimeBestC(Int_t(besttimeC *channelWidth));
+    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 ;
+    vertex = meanVertex - c*(timeDiff)/2.;// + (fdZonA - fdZonC)/2;
+    tr[0]=true; 
   }
+  frecpoints->SetVertex(vertex);
+  frecpoints->SetMeanTime(meanTime);
+  frecpoints->SetT0clock(timeclock);
+  frecpoints->SetT0Trig(tr);
+
+  AliInfo(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 %i #channel,  meanTime %i #channel, vertex %f cm online mean %i timeclock %i ps",timeDiff, meanTime,vertex, Int_t(onlineMean), timeclock));
+  
+  
+
+   
+  
   clustersTree->Fill();
+
+  delete timeCFD;
+  delete timeLED;
+  delete chargeQT0; 
+  delete chargeQT1; 
 }
 
 
-void AliT0Reconstructor::FillESD(AliRunLoader* runLoader, AliESD *pESD) const
+//_______________________________________________________________________
+
+void AliT0Reconstructor::Reconstruct(AliRawReader* rawReader, TTree*recTree) const
 {
+  // T0 raw ->
+  //
+  // reference amplitude and time ref. point from reco param
+
+  Int_t refAmp = GetRecoParam()->GetRefAmp();
+  Int_t refPoint = GetRecoParam()->GetRefPoint();
+
+  Int_t allData[110][5];
+  
+  Int_t timeCFD[24], timeLED[24], chargeQT0[24], chargeQT1[24];
+  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;  
+    }
+   
+  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, 405,1);
+   
+  AliDebug(10," before read data ");
+  AliT0RawReader myrawreader(rawReader);
+
+  UInt_t type =rawReader->GetType();
+
+  if (!myrawreader.Next())
+    AliDebug(1,Form(" no raw data found!!"));
+  else
+    {  
+      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++)  
+           {
+             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] ;
+             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];
+           }
+         
+          for (Int_t in=12; in<24;  in++)
+            {
+              chargeQT0[in]=allData[2*in+57][0];
+              chargeQT1[in]=allData[2*in+58][0];
+            }
+          
+          //    } //cosmic with physics event
+       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]));
+        onlineMean = allData[49][0];       
+       
+       Double32_t time[24], adc[24],  noncalibtime[24];
+       for (Int_t ipmt=0; ipmt<24; ipmt++) {
+        if(timeCFD[ipmt]>0 && timeLED[ipmt]>0){
+          //for simulated data
+            //for physics  data
+          if(( chargeQT0[ipmt] - chargeQT1[ipmt])>0)  {
+            adc[ipmt] = chargeQT0[ipmt] - chargeQT1[ipmt];
+          }
+          else
+            adc[ipmt] = 0;
+          
+
+          //      time[ipmt] = fCalib-> WalkCorrection(refAmp, ipmt, adc[ipmt], timeCFD[ipmt] ) ;
+          
+          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 %i\n ",ampMip,qtMip, adc[ipmt]));
+          //bad peak removing
+          if(sl<540) {
+            frecpoints->SetTime(ipmt, Float_t(time[ipmt]) );
+            // frecpoints->SetTime(ipmt,Double32_t(timeCFD[ipmt]));
+            frecpoints->SetAmpLED(ipmt, Double32_t( qtMip)); //for cosmic &pp beam 
+            frecpoints->SetAmp(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 
+           && (timeLED[ipmt] - timeCFD[ipmt])<540 )
+          {
+            if(time[ipmt]<besttimeC){
+              besttimeC=time[ipmt]; //timeC
+              pmtBestC=ipmt;
+            }
+          }
+       }
+       for ( Int_t ipmt=12; ipmt<24; ipmt++)
+        {
+          if(time[ipmt] > 1 
+             && (timeLED[ipmt] - timeCFD[ipmt])<540 )
+            {
+              if(time[ipmt]<besttimeA) {
+                besttimeA=time[ipmt]; //timeA
+                pmtBestA=ipmt;
+              }
+            }
+        }
+       if(besttimeA < 999999) 
+        frecpoints->SetTimeBestA(besttimeA * channelWidth - 1000.*fLatencyHPTDC + 1000.*fLatencyL1A);
+       if( besttimeC < 999999 ) 
+        frecpoints->SetTimeBestC(besttimeC * channelWidth - 1000.*fLatencyHPTDC +1000.*fLatencyL1C);
+       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;  
+        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++) {
+       if(allData[trchan[itr]][0]>0) tr[itr]=true;
+       frecpoints->SetT0Trig(tr);
+      }
+    } // if (else )raw data
+  recTree->Fill();
+  if(frecpoints) delete frecpoints;
+}
+  
+  
+  //____________________________________________________________
+  
+  void AliT0Reconstructor::FillESD(TTree */*digitsTree*/, TTree *clustersTree, AliESDEvent *pESD) const
+  {
 
   /***************************************************
   Resonstruct digits to vertex position
   ****************************************************/
   
-  
-  if (!runLoader) {
-    AliError("Reconstruct >> No run loader");
-    return;
-  }
-  
   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();
 
-  AliT0Loader* pStartLoader = (AliT0Loader*) runLoader->GetLoader("T0Loader");
-  pStartLoader->LoadRecPoints("READ");
-
-  TTree *treeR = pStartLoader->TreeR();
+  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;
+      //         cout<<" vertex shif "<<shift<<" vertex "<<spdver<<" IsFromVertexer3D  "<<fverSPD->IsFromVertexer3D()<<endl;
+    }
+  }
+  TTree *treeR = clustersTree;
   
-   AliT0RecPoint* frecpoints= new AliT0RecPoint ();
-    if (!frecpoints) {
+  AliT0RecPoint* frecpoints= new AliT0RecPoint ();
+  if (!frecpoints) {
     AliError("Reconstruct Fill ESD >> no recpoints found");
     return;
   }
@@ -189,28 +448,64 @@ void AliT0Reconstructor::FillESD(AliRunLoader* runLoader, AliESD *pESD) const
   if (brRec) {
     brRec->SetAddress(&frecpoints);
   }else{
-    cerr<<"EXEC Branch T0 rec not found"<<endl;
-    // exit(111);
+    AliError(Form("EXEC Branch T0 rec not found"));
     return;
   } 
-    
-    brRec->GetEntry(0);
-    Float_t timeStart, Zposition, amp[24], time[24];
-    Int_t i;
-    Zposition = frecpoints -> GetVertex();
-    timeStart = frecpoints -> GetMeanTime();
-    for ( i=0; i<24; i++) {
-       time[i] = Float_t (frecpoints -> GetTime(i)) / 1000.; // ps to ns
+  
+  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) {
       amp[i] = frecpoints -> GetAmp(i);
+      ampQTC[i] = frecpoints -> AmpLED(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(amp);     // 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) {
+    
+    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++) {
+          timecorr[i]=tcorr[i];
+         if(i<12 && time[i]>1) timecorr[i] -=  shift/channelWidth;
+         if(i>11 && time[i]>1) timecorr[i] +=  shift/channelWidth;
+       }
+       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
-    cout<<" ESD >> "<<Zposition<<" "<<timeStart<<endl;
+  }
+     
+
 
-    pStartLoader->UnloadRecPoints();
-   
 } // vertex in 3 sigma