]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - T0/AliT0Reconstructor.cxx
correct calibration of short runs
[u/mrichter/AliRoot.git] / T0 / AliT0Reconstructor.cxx
index 4eab92b32f67c0ce22776891eba06d56b94a2f6c..4c9309781bd0084a30227ffde5c3a189d77e74a7 100644 (file)
@@ -1,4 +1,3 @@
-
 /**************************************************************************
  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
 #include "AliT0Parameters.h"
 #include "AliT0Calibrator.h"
 #include "AliESDfriend.h"
+#include "AliESDTZERO.h"
 #include "AliESDTZEROfriend.h"
 #include "AliLog.h"
+#include "AliCDBEntry.h" 
+#include "AliCDBManager.h"
+#include "AliCTPTimeParams.h"
+#include "AliLHCClockPhase.h"
+#include "AliT0CalibSeasonTimeShift.h"
+#include "AliESDRun.h"
 
 #include <TArrayI.h>
 #include <TGraph.h>
@@ -55,11 +61,41 @@ ClassImp(AliT0Reconstructor)
                                              fLatencyL1(0),
                                              fLatencyL1A(0),
                                              fLatencyL1C(0),
-                                             fESDTZEROfriend(NULL)
+                                            fGRPdelays(0),
+                                            fTimeMeanShift(0x0),
+                                            fTimeSigmaShift(0x0),
+                                             fESDTZEROfriend(NULL),
+                                             fESDTZERO(NULL)
 
 {
-  //constructor
+  for (Int_t i=0; i<24; i++)  fTime0vertex[i] =0;
 
+  //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();
+
+  AliCDBEntry *entry5 = AliCDBManager::Instance()->Get("T0/Calib/TimeAdjust");
+  if (entry5) {
+    AliT0CalibSeasonTimeShift *timeshift = (AliT0CalibSeasonTimeShift*)entry5->GetObject();
+    fTimeMeanShift = timeshift->GetT0Means();
+    fTimeSigmaShift  = timeshift->GetT0Sigmas();
+   }
+  else
+    AliWarning("Time Adjust is not found in OCDB !");
   fParam = AliT0Parameters::Instance();
   fParam->Init();
  
@@ -70,28 +106,32 @@ ClassImp(AliT0Reconstructor)
          if (gr1) fAmpLED.AddAtAndExpand(gr1,i) ; 
          TGraph* gr2 = fParam ->GetQTC(i);
          if (gr2) fQTC.AddAtAndExpand(gr2,i) ;         
-  }
-
+         fTime0vertex[i] = fParam->GetCFD(i);
+         AliDebug(2,Form("OCDB mean CFD time %i %f \n",i, fTime0vertex[i]));
+ }
   fLatencyL1 = fParam->GetLatencyL1();
-  fLatencyL1A = fParam->GetLatencyL1A();
+  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"));
+  AliDebug(2,Form(" LatencyL1 %f latencyL1A %f latencyL1C %f latencyHPTDC %f \n",fLatencyL1, fLatencyL1A, fLatencyL1C, fLatencyHPTDC));
+  for (Int_t i=0; i<24; i++) {
+    if( fTime0vertex[i] < 500 || fTime0vertex[i] > 50000) fTime0vertex[i] =( 1000.*fLatencyHPTDC - 1000.*fLatencyL1 + 1000.*fGRPdelays)/24.4;
+    //   printf(" calulated mean %i %f \n",fTime0vertex[i]);
+  }
   //here real Z position
   fdZonC = TMath::Abs(fParam->GetZPosition("T0/C/PMT1"));
   fdZonA = TMath::Abs(fParam->GetZPosition("T0/A/PMT15"));
 
   fCalib = new AliT0Calibrator();
   fESDTZEROfriend = new AliESDTZEROfriend();
+  fESDTZERO  = new AliESDTZERO();
 
 }
 
 //_____________________________________________________________________________
 void AliT0Reconstructor::Reconstruct(TTree*digitsTree, TTree*clustersTree) const
-  
 {
   // T0 digits reconstruction
   Int_t refAmp = Int_t (GetRecoParam()->GetRefAmp());
@@ -111,6 +151,9 @@ void AliT0Reconstructor::Reconstruct(TTree*digitsTree, TTree*clustersTree) const
   
   AliDebug(1,Form("Start DIGITS reconstruction "));
   
+  Float_t lowAmpThreshold =  GetRecoParam()->GetLow(200);  
+  Float_t highAmpThreshold =  GetRecoParam()->GetHigh(200);  
+  Int_t badpmt = GetRecoParam()->GetRefPoint();
 
   TBranch *brDigits=digitsTree->GetBranch("T0");
   AliT0digit *fDigits = new AliT0digit() ;
@@ -138,12 +181,13 @@ void AliT0Reconstructor::Reconstruct(TTree*digitsTree, TTree*clustersTree) const
   Int_t pmtBestA=99999;
   Int_t pmtBestC=99999;
   
-  AliT0RecPoint* frecpoints= new AliT0RecPoint ();
-  clustersTree->Branch( "T0", "AliT0RecPoint" ,&frecpoints, 405,1);
+  AliT0RecPoint frecpoints;
+  AliT0RecPoint * pfrecpoints = &frecpoints;
+  clustersTree->Branch( "T0", "AliT0RecPoint" ,&pfrecpoints);
   
-  Float_t time[24], adc[24];
+  Float_t time[24], adc[24], adcmip[24];
   for (Int_t ipmt=0; ipmt<24; ipmt++) {
-    if(timeCFD->At(ipmt)>0 ){
+    if(timeCFD->At(ipmt)>0 && ipmt != badpmt) {
      if(( chargeQT1->At(ipmt) - chargeQT0->At(ipmt))>0)  
        adc[ipmt] = chargeQT1->At(ipmt) - chargeQT0->At(ipmt);
       else
@@ -153,26 +197,33 @@ void AliT0Reconstructor::Reconstruct(TTree*digitsTree, TTree*clustersTree) const
             
       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 ",
+      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]));
+      Double_t ampMip = 0;
+      TGraph* ampGraph = (TGraph*)fAmpLED.At(ipmt);
+      if (ampGraph) ampMip = ampGraph->Eval(sl);
+      Double_t qtMip = 0;
+      TGraph* qtGraph = (TGraph*)fQTC.At(ipmt);
+      if (qtGraph) qtMip = qtGraph->Eval(adc[ipmt]);
+      AliDebug(5,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));
+      frecpoints.SetTime(ipmt, Float_t(time[ipmt]) );
+      frecpoints.SetAmpLED(ipmt, Float_t( ampMip)); 
+      frecpoints.SetAmp(ipmt, Float_t(qtMip));
+      adcmip[ipmt]=qtMip;
       
     }
     else {
       time[ipmt] = 0;
       adc[ipmt] = 0;
+      adcmip[ipmt] = 0;
+
     }
   }
   
   for (Int_t ipmt=0; ipmt<12; ipmt++){
-    if(time[ipmt] > 1 ) {
+    if(time[ipmt] > 1 && ipmt != badpmt && adcmip[ipmt]>lowAmpThreshold && adcmip[ipmt]<highAmpThreshold) {
       if(time[ipmt]<besttimeC){
        besttimeC=time[ipmt]; //timeC
        pmtBestC=ipmt;
@@ -180,21 +231,21 @@ void AliT0Reconstructor::Reconstruct(TTree*digitsTree, TTree*clustersTree) const
     }
   }
   for ( Int_t ipmt=12; ipmt<24; ipmt++){
-    if(time[ipmt] > 1) {
+    if(time[ipmt] > 1 &&  ipmt != badpmt && adcmip[ipmt]>lowAmpThreshold && adcmip[ipmt]<highAmpThreshold) {
       if(time[ipmt]<besttimeA) {
        besttimeA=time[ipmt]; //timeA
         pmtBestA=ipmt;}
     }
   }
   if(besttimeA < 999999) {
-    frecpoints->SetTimeBestA(Int_t(besttimeA *channelWidth - fdZonA/c));
+    frecpoints.SetTimeBestA(Int_t(besttimeA *channelWidth - fdZonA/c));
     tr[1]=true;
   }
   if( besttimeC < 999999 ) {
-    frecpoints->SetTimeBestC(Int_t(besttimeC *channelWidth - fdZonA/c));
+    frecpoints.SetTimeBestC(Int_t(besttimeC *channelWidth - fdZonA/c));
     tr[2]=true;
   }
-  AliDebug(10,Form(" besttimeA %f ch,  besttimeC %f ch",besttimeA, besttimeC));
+  AliDebug(5,Form(" besttimeA %f ch,  besttimeC %f ch",besttimeA, besttimeC));
   if(besttimeA <999999 && besttimeC < 999999 ){
     //    timeDiff = (besttimeC - besttimeA)*channelWidth;
     timeDiff = (besttimeA - besttimeC)*channelWidth;
@@ -203,15 +254,15 @@ void AliT0Reconstructor::Reconstruct(TTree*digitsTree, TTree*clustersTree) const
     vertex = meanVertex - c*(timeDiff)/2.;// + (fdZonA - fdZonC)/2;
     tr[0]=true; 
   }
-  frecpoints->SetVertex(vertex);
-  frecpoints->SetMeanTime(meanTime);
-  frecpoints->SetT0clock(timeclock);
-  frecpoints->SetT0Trig(tr);
+  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]));
+  AliDebug(5,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));
+  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));
   
   
@@ -233,39 +284,53 @@ void AliT0Reconstructor::Reconstruct(AliRawReader* rawReader, TTree*recTree) con
 {
   // T0 raw ->
   //
-  // reference amplitude and time ref. point from reco param
+  
+  Float_t meanOrA = fTime0vertex[0] + 587;
+  Float_t meanOrC = fTime0vertex[0] + 678;
+  Float_t meanTVDC = fTime0vertex[0] + 2564;
+  Int_t timeDelayCFD[24]; 
+  
 
-  Float_t refAmp = GetRecoParam()->GetRefAmp();
-  Int_t refPoint = 0;
+  Int_t badpmt[24];
   //Bad channel
-  Int_t badpmt = GetRecoParam()->GetRefPoint();
-  
-  Int_t low[110], high[110];
+  for (Int_t i=0; i<24; i++) {
+    badpmt[i] = GetRecoParam() -> GetBadChannels(i);
+    timeDelayCFD[i] =  Int_t (fParam->GetTimeDelayCFD(i));
+  }
+  Int_t low[500], high[500];
+  Float_t timefull=-9999;;
+  Float_t tvdc  = -9999; Float_t ora = -9999; Float_t orc = -9999;
 
   Int_t allData[110][5];
   
   Int_t timeCFD[24], timeLED[24], chargeQT0[24], chargeQT1[24];
-  Double32_t timeDiff=999999, meanTime=999999, timeclock=999999;
+  Double32_t timeDiff, meanTime, timeclock;
+  timeDiff =  meanTime = timeclock = 9999999;
   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));
-    }
-   
+  for (Int_t i0=0; i0<24; i0++) {
+    low[i0] = Int_t(fTime0vertex[i0]) - 200;
+    high[i0] = Int_t(fTime0vertex[i0]) + 200;
+  }
+  
+  for (Int_t i0=0; i0<110; i0++)
+    for (Int_t j0=0; j0<5; j0++)  allData[i0][j0]=0; 
+  
+  Float_t lowAmpThreshold =  GetRecoParam()->GetAmpLowThreshold();  
+  Float_t highAmpThreshold =  GetRecoParam()->GetAmpHighThreshold(); 
+  
   Double32_t besttimeA=9999999;
   Double32_t besttimeC=9999999;
   Int_t pmtBestA=99999;
   Int_t pmtBestC=99999;
-   
-  AliT0RecPoint* frecpoints= new AliT0RecPoint ();
+  Float_t channelWidth = fParam->GetChannelWidth() ;  
+       
+  AliT0RecPoint frecpoints;
+  AliT0RecPoint * pfrecpoints = &frecpoints;
   
-  recTree->Branch( "T0", "AliT0RecPoint" ,&frecpoints, 405,1);
+  recTree->Branch( "T0", "AliT0RecPoint" ,&pfrecpoints);
    
   AliDebug(10," before read data ");
   AliT0RawReader myrawreader(rawReader);
@@ -285,104 +350,63 @@ void AliT0Reconstructor::Reconstruct(AliRawReader* rawReader, TTree*recTree) con
       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 i=0; i<107; 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 in=0; in<12; in++)  
+         {
+           for (Int_t iHit=0; iHit<5; iHit++) 
              {
-               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][iHit] > low[in] && 
+                  allData[in+1][iHit] < high[in])
                  {
-                   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;
-                     }
+                   timeCFD[in] = allData[in+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 iHit=0; iHit<5; iHit++) 
-         {
-           for (Int_t in=0; in<12;  in++)
+           for (Int_t iHit=0; iHit<5; iHit++) 
              {
-               if(allData[2*in+25][iHit] > low[2*in+25] && 
-                  allData[2*in+25][iHit] < high[2*in+25])
-                 chargeQT0[in]=allData[2*in+25][iHit];
-               if(allData[2*in+26][iHit] > low[2*in+26] && 
-                  allData[2*in+26][iHit] < high[2*in+26])
-                 chargeQT1[in]=allData[2*in+26][iHit];
-               
+               if(allData[in+1+56][iHit] > low[in] && 
+                  allData[in+1+56][iHit] < high[in])
+                 {
+                   timeCFD[in+12] = allData[in+56+1][iHit] ;
+                   break;
+                 }
              }
+           timeLED[in+12] = allData[in+68+1][0] ;
+           timeLED[in] = allData[in+12+1][0] ;
+           AliDebug(5, 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=12; in<24;  in++)
-             {
-               if(allData[2*in+57][iHit] > low[2*in+57] && 
-                  allData[2*in+57][iHit] < high[2*in+57])                
-                 chargeQT0[in]=allData[2*in+57][iHit];
-               if(allData[2*in+58][iHit] > low[2*in+58] && 
-                  allData[2*in+58][iHit] < high[2*in+58])                
-                 chargeQT1[in]=allData[2*in+58][iHit];
-               
-             }
          }
        
        
-       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]));
-       for (Int_t iHit=0; iHit<5; iHit++) 
+       for (Int_t in=0; in<12;  in++)
+         {
+           chargeQT0[in]=allData[2*in+25][0];
+           chargeQT1[in]=allData[2*in+26][0];
+           AliDebug(25, Form(" readed Raw %i %i %i",
+                             in, chargeQT0[in],chargeQT1[in]));
+         }     
+       for (Int_t in=12; in<24;  in++)
          {
-               if(allData[49][iHit] > low[49] && 
-                  allData[49][iHit] < high[49])
-                 onlineMean = allData[49][iHit];       
+           chargeQT0[in]=allData[2*in+57][0];
+           chargeQT1[in]=allData[2*in+58][0];
+           AliDebug(25, Form(" readed Raw %i %i %i",
+                             in, chargeQT0[in],chargeQT1[in]));
          }
-       Double32_t time[24], adc[24],  noncalibtime[24];
+       
+       onlineMean = allData[49][0];
+       
+       Double32_t time[24], adc[24], adcmip[24], noncalibtime[24];
        for (Int_t ipmt=0; ipmt<24; ipmt++) {
-         if(timeCFD[ipmt]>0 ){
+         if(timeCFD[ipmt] >  0 /* && badpmt[ipmt]==0*/ ){
           //for simulated data
             //for physics  data
           if(( chargeQT0[ipmt] - chargeQT1[ipmt])>0)  {
@@ -390,86 +414,141 @@ void AliT0Reconstructor::Reconstruct(AliRawReader* rawReader, TTree*recTree) con
           }
           else
             adc[ipmt] = 0;
-          time[ipmt] = fCalib-> WalkCorrection(Int_t (refAmp), ipmt, Int_t(adc[ipmt]), timeCFD[ipmt] ) ;
+          //      time[ipmt] = fCalib-> WalkCorrection(refAmp, ipmt, Int_t(adc[ipmt]), timeCFD[ipmt] ) ;
           
+          time[ipmt] = fCalib-> WalkCorrection(Int_t (fTime0vertex[ipmt]), ipmt, Int_t(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]);
+          Double_t ampMip = 0;
+          TGraph * ampGraph =  (TGraph*)fAmpLED.At(ipmt);
+          if (ampGraph) ampMip = ampGraph->Eval(sl);
+          Double_t qtMip = 0;
+          TGraph * qtGraph = (TGraph*)fQTC.At(ipmt);
+          if (qtGraph) qtMip = qtGraph->Eval(adc[ipmt]);
           AliDebug(10,Form("  Amlitude in MIPS LED %f ; QTC %f;  in channels %f\n ",ampMip,qtMip, adc[ipmt]));
           //bad peak removing
-          if(sl<550) {
-            frecpoints->SetTime(ipmt, Float_t(time[ipmt]) );
-            // frecpoints->SetTime(ipmt,Double32_t(timeCFD[ipmt]));
-            frecpoints->SetAmp(ipmt, Double32_t( qtMip)); //for cosmic &pp beam 
-            frecpoints->SetAmpLED(ipmt, Double32_t(ampMip));        
+            frecpoints.SetTime(ipmt, Float_t(time[ipmt]) );
+            // frecpoints.SetTime(ipmt,Double32_t(timeCFD[ipmt]));
+            frecpoints.SetAmp(ipmt, Double32_t( qtMip)); 
+            adcmip[ipmt]=qtMip;
+            frecpoints.SetAmpLED(ipmt, Double32_t(ampMip));         
             noncalibtime[ipmt]= Double32_t (timeCFD[ipmt]);
-          }
         }
         else {
           time[ipmt] = 0;
           adc[ipmt] = 0;
+          adcmip[ipmt] = 0;
           noncalibtime[ipmt] = 0;
         }
        }
        fESDTZEROfriend->SetT0timeCorr(noncalibtime) ;     
        for (Int_t ipmt=0; ipmt<12; ipmt++){
-        if(time[ipmt] > 1 && ipmt != badpmt )
+        if(time[ipmt] !=0 /*&& badpmt[ipmt]==0 */&&  adcmip[ipmt]>lowAmpThreshold && adcmip[ipmt]<highAmpThreshold )
           {
+              // if(TMath::Abs(time[ipmt])<TMath::Abs(besttimeC)) {
             if(time[ipmt]<besttimeC){
               besttimeC=time[ipmt]; //timeC
-              pmtBestC=ipmt;
+                 pmtBestC=ipmt;
             }
           }
        }
        for ( Int_t ipmt=12; ipmt<24; ipmt++)
         {
-          if(time[ipmt] > 1 && ipmt != badpmt)
+          if(time[ipmt] != 0 /* && badpmt[ipmt]==0*/ && adcmip[ipmt]>lowAmpThreshold && adcmip[ipmt]<highAmpThreshold)
             {
               if(time[ipmt]<besttimeA) {
+                //            if(TMath::Abs(time[ipmt])<TMath::Abs(besttimeA)) {
                 besttimeA=time[ipmt]; //timeA
                 pmtBestA=ipmt;
               }
             }
         }
        if(besttimeA < 999999) 
-        frecpoints->SetTimeBestA(besttimeA * channelWidth - 1000.*fLatencyHPTDC + 1000.*fLatencyL1A);
+        frecpoints.SetTimeBestA((besttimeA * channelWidth)- 1000.*fLatencyHPTDC + 1000.*fLatencyL1A - 1000.*fGRPdelays - fTimeMeanShift[1] ); 
+       //       frecpoints.SetTimeBestA((besttimeA * channelWidth- fTimeMeanShift[1])); 
+
        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));
+        frecpoints.SetTimeBestC((besttimeC * channelWidth)- 1000.*fLatencyHPTDC +1000.*fLatencyL1C - 1000.*fGRPdelays - fTimeMeanShift[2]);
+       // frecpoints.SetTimeBestC((besttimeC * channelWidth - fTimeMeanShift[2]));
+       AliDebug(5,Form(" pmtA %i besttimeA %f shift A %f ps, pmtC %i besttimeC %f shiftC %f ps",
+                      pmtBestA,besttimeA, fTimeMeanShift[1],
+                      pmtBestC,  besttimeC,fTimeMeanShift[2]));
         if(besttimeA <999999 && besttimeC < 999999 ){
-        timeDiff = ( besttimeA - besttimeC)* 0.001* channelWidth + fLatencyL1A - fLatencyL1C;
-        timeclock = channelWidth * Float_t( besttimeA+besttimeC)/2. - 1000.*fLatencyHPTDC + 1000.*fLatencyL1;  
+         //     timeDiff = ( besttimeA - besttimeC)* 0.001* channelWidth + fLatencyL1A - fLatencyL1C;
+         timeclock = channelWidth * Float_t( besttimeA+besttimeC)/2. - 1000.*fLatencyHPTDC + 1000.*fLatencyL1 - 1000.*fGRPdelays - fTimeMeanShift[0] ;  
         meanTime = (besttimeA+besttimeC-2.*Float_t(ref))/2.;
+        timeDiff = ( besttimeA - besttimeC)* 0.001* channelWidth ;
+        // timeclock = channelWidth * Float_t( besttimeA+besttimeC)/2. - fTimeMeanShift[0] ;  
         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));
+      AliDebug(10,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 i=0; i<5; i++) tr[i] = false; 
       for (Int_t itr=0; itr<5; itr++) {
-       for (Int_t iHit=0; iHit<5; iHit++) 
+       for (Int_t iHit=0; iHit<1; iHit++) 
          {
            Int_t trr=trchan[itr];
-           if(allData[trr][iHit] > low[trr] &&
-              allData[trr][iHit] < high[trr]&&
-              allData[trr][iHit] > 0) tr[itr]=true;
-         }
+           if( allData[trr][iHit] > 0 && allData[trr][iHit] < 4000)  tr[itr]=true;
+
+           AliDebug(1,Form("Reconstruct :::  T0 triggers iHit %i tvdc %d orA %d orC %d centr %d semicentral %d",iHit, tr[0],tr[1],tr[2],tr[3],tr[4]));
+         }       
       }
-      frecpoints->SetT0Trig(tr);
-     } // if (else )raw data
+      frecpoints.SetT0Trig(tr);
+      
+      for (Int_t iHit=0; iHit<5; iHit++) 
+       {
+         timefull = -9999; 
+         tvdc = ora = orc = -9999;
+         if(allData[50][iHit]>0) 
+           tvdc = (Float_t(allData[50][iHit]) - meanTVDC) * channelWidth* 0.001; 
+         if(allData[51][iHit]>0)
+           ora = (Float_t(allData[51][iHit]) - meanOrA) * channelWidth* 0.001;
+         
+         if(allData[52][iHit]>0) 
+           orc = (Float_t(allData[52][iHit]) - meanOrC) * channelWidth* 0.001;
+         
+         frecpoints.SetOrC( iHit, orc);
+         frecpoints.SetOrA( iHit, ora);
+         frecpoints.SetTVDC( iHit, tvdc);
+         for (Int_t i0=0; i0<12; i0++) {
+           timefull = -9999; 
+           if(allData[i0+1][iHit]>1) 
+             timefull = (Float_t(allData[i0+1][iHit])-fTime0vertex[i0] - timeDelayCFD[i0])* channelWidth* 0.001;
+           frecpoints.SetTimeFull(i0, iHit,timefull) ;
+           //      if(allData[i0+1][iHit]>1)  printf("i0 %d iHit %d data %d fTime0vertex %f timefull %f \n",i0, iHit, allData[i0+1][iHit], fTime0vertex[i0], timefull);
+           
+         }
+         
+         for (Int_t i0=12; i0<24; i0++) {
+           timefull = -9999; 
+           if(allData[i0+45][iHit]>1) {
+             timefull = (Float_t(allData[i0+45][iHit]) - fTime0vertex[i0] - timeDelayCFD[i0])* channelWidth* 0.001;
+           }
+           //  if(allData[i0+45][iHit]>1)  printf("i0 %d iHit %d data %d fTime0vertex %f timefull %f \n",i0, iHit, allData[i0+45][iHit], fTime0vertex[i0], timefull);
+           frecpoints.SetTimeFull(i0, iHit, timefull) ;
+         }
+       }
+      
+      
+      //Set MPD
+      if(allData[53][0]>0 && allData[54][0]) 
+       frecpoints.SetMultA(allData[53][0]-allData[54][0]);
+      if(allData[105][0]>0 && allData[106][0]) 
+       frecpoints.SetMultC(allData[105][0]-allData[106][0]);
+      
+      
+    } // if (else )raw data
   recTree->Fill();
-  if(frecpoints) delete frecpoints;
 }
   
   
@@ -483,10 +562,17 @@ void AliT0Reconstructor::Reconstruct(AliRawReader* rawReader, TTree*recTree) con
   ****************************************************/
   
   AliDebug(1,Form("Start FillESD T0"));
+  if(!pESD) {
+    AliError("No ESD Event");
+    return;
+  }
+  pESD ->SetT0spread(fTimeSigmaShift);
+
   Float_t channelWidth = fParam->GetChannelWidth() ;  
   Float_t c = 0.0299792458; // cm/ps
   Float_t currentVertex=0, shift=0;
-  Int_t ncont=0;
+  Int_t ncont=-1;
   const AliESDVertex* vertex = pESD->GetPrimaryVertex();
   if (!vertex)        vertex = pESD->GetPrimaryVertexSPD();
   if (!vertex)        vertex = pESD->GetPrimaryVertexTPC();
@@ -498,24 +584,19 @@ void AliT0Reconstructor::Reconstruct(AliRawReader* rawReader, TTree*recTree) con
     currentVertex = vertex->GetZ();
     
     ncont = vertex->GetNContributors();
-    // cout<<" spdver "<<spdver<<" ncont "<<ncont<<endl;
-    if(ncont>2 ) {
+    if(ncont>0 ) {
       shift = currentVertex/c;
-      //         cout<<" vertex shif "<<shift<<" vertex "<<spdver<<" IsFromVertexer3D  "<<fverSPD->IsFromVertexer3D()<<endl;
     }
   }
   TTree *treeR = clustersTree;
   
-  AliT0RecPoint* frecpoints= new AliT0RecPoint ();
-  if (!frecpoints) {
-    AliError("Reconstruct Fill ESD >> no recpoints found");
-    return;
-  }
+  AliT0RecPoint frecpoints;
+  AliT0RecPoint * pfrecpoints = &frecpoints;
   
   AliDebug(1,Form("Start FillESD T0"));
   TBranch *brRec = treeR->GetBranch("T0");
   if (brRec) {
-    brRec->SetAddress(&frecpoints);
+    brRec->SetAddress(&pfrecpoints);
   }else{
     AliError(Form("EXEC Branch T0 rec not found"));
     return;
@@ -527,58 +608,156 @@ void AliT0Reconstructor::Reconstruct(AliRawReader* rawReader, TTree*recTree) con
   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;
+  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);
-    }
+    time[i] =  frecpoints.GetTime(i); // ps to ns
+    //    if ( time[i] >1) {
+    if ( time[i] != 0) {
+      ampQTC[i] = frecpoints.GetAmp(i);
+      amp[i] = frecpoints.AmpLED(i);
+      AliDebug(1,Form("T0: %i  time %f  ampQTC %f ampLED %f \n", i, time[i], ampQTC[i], amp[i]));
+   }
+  }
+  Int_t trig= frecpoints.GetT0Trig();
+  frecpoints.PrintTriggerSignals( trig);
+  printf(" FillESD trigger %i \n",trig);
+  fESDTZERO->SetT0Trig(trig);
+  //pESD->SetT0Trig(trig);
+  //  pESD->SetT0zVertex(zPosition); //vertex Z position 
+  fESDTZERO->SetT0zVertex(zPosition); //vertex Z position 
+
+  Double32_t multA=frecpoints.GetMultA();
+  Double32_t multC=frecpoints.GetMultC();
+  //  pESD->SetT0(multC);        // multiplicity Cside 
+  //  pESD->SetT0clock(multA);        // multiplicity Aside 
+  fESDTZERO->SetMultA(multA); // for backward compatubility
+  fESDTZERO->SetMultC(multC); // for backward compatubility
+
+
+  for (Int_t iHit =0; iHit<5; iHit++ ) {
+       AliDebug(10,Form("FillESD ::: iHit %i tvdc %f orA %f orC %f\n", iHit,
+          frecpoints.GetTVDC(iHit),
+          frecpoints.GetOrA(iHit),
+                      frecpoints.GetOrC(iHit) ));
+    fESDTZERO->SetTVDC(iHit,frecpoints.GetTVDC(iHit));
+    fESDTZERO->SetOrA(iHit,frecpoints.GetOrA(iHit));
+    fESDTZERO->SetOrC(iHit,frecpoints.GetOrC(iHit));
+    
+    for (Int_t i0=0; i0<24; i0++) {
+      //  if(frecpoints.GetTimeFull(i0,iHit)>0){
+      //       printf("FillESD ::: iHit %i cfd %i time %f \n", iHit, i0, frecpoints.GetTimeFull(i0,iHit));
+       fESDTZERO->SetTimeFull(i0, iHit,frecpoints.GetTimeFull(i0,iHit));
+       // }
+       
+    }               
   }
-  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
+    fESDTZERO->SetT0TOF(i,timeClock[i]);   // interaction time (ns) 
+  fESDTZERO->SetT0time(time);         // best TOF on each PMT 
+  fESDTZERO->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));
+  AliDebug(1,Form("T0: SPDshift %f Vertex %f (T0A+T0C)/2 %f #channels T0signal %f ns OrA %f ns OrC %f T0trig %i\n",shift, zPosition, timeStart, timeClock[0], timeClock[1], timeClock[2], trig));
+
+  //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+  // background flags
+  Bool_t background = BackgroundFlag();
+  fESDTZERO->SetBackgroundFlag(background);
+  Bool_t pileup =  PileupFlag();
+  fESDTZERO->SetPileupFlag(pileup);
+  for (Int_t i=0; i<5; i++) {
+    fESDTZERO->SetPileupTime(i, frecpoints.GetTVDC(i) ) ;
+    //   printf("!!!!!! FillESD :: pileup %i %f %f \n", i,fESDTZERO->GetPileupTime(i), frecpoints.GetTVDC(i));
+  }
+  Bool_t sat  = SatelliteFlag();
+  fESDTZERO->SetSatelliteFlag(sat);
   
+  //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   if (pESD) {
     
     AliESDfriend *fr = (AliESDfriend*)pESD->FindListObject("AliESDfriend");
     if (fr) {
-      AliDebug(1, Form("Writing TZERO friend data to ESD tree"));
+      AliDebug(10, Form("Writing TZERO friend data to ESD tree"));
 
-      if (ncont>2) {
+      //     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;
+         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(10,Form("T0 friend : %i time %f  ampQTC %f ampLED %f \n", i, timecorr[i], ampQTC[i], amp[i]));
        }
        fESDTZEROfriend->SetT0timeCorr( timecorr) ;
        fESDTZEROfriend->SetT0ampLEDminCFD(amp);
        fESDTZEROfriend->SetT0ampQTC(ampQTC);
-       fr->SetTZEROfriend(fESDTZEROfriend);
-      }//
+       fr->SetTZEROfriend(fESDTZEROfriend);
+       //      }//
     }
-  }
-     
 
+    pESD->SetTZEROData(fESDTZERO);
+  }
 
 } // vertex in 3 sigma
 
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ //____________________________________________________________
+  
+Bool_t AliT0Reconstructor::PileupFlag() const
+{
+  //
+  Bool_t pileup = false;
+  Float_t tvdc[5];
+  for (Int_t ih=0; ih<5; ih++) 
+    {
+      tvdc[ih] =  fESDTZERO->GetTVDC(ih);
+      
+     if(  tvdc[0] !=0 &&  tvdc[0]> -10 && tvdc[0]< 10 )
+       if(ih>0 && tvdc[ih]>20 )        pileup = true; 
+     if( tvdc[0] >20 || (tvdc[0] < -20  &&  tvdc[0] > -9000) ) pileup =true;
+     //    if (pileup) printf(" !!!!! pile up %i  tvdc %f \n",ih,  tvdc[ih]); 
+    }
+
+
+  return pileup;
+
+}
+
+ //____________________________________________________________
+  
+Bool_t AliT0Reconstructor::BackgroundFlag() const
+{
+  Bool_t background = false;
 
+  Float_t orA = fESDTZERO->GetOrA(0);
+  Float_t orC = fESDTZERO->GetOrC(0);
+  Float_t tvdc =  fESDTZERO->GetTVDC(0);
 
+  if ( (orA > -5 && orA <5) && (orC > -5 && orC <5) && (tvdc < -5 || tvdc > 5)) {
+    background = true;
+    //   printf(" orA %f orC %f tvdc %f\n", orA, orC, tvdc);
+  } 
+  return background;
 
 
+}
+
 
+ //____________________________________________________________
+  
+Bool_t  AliT0Reconstructor::SatelliteFlag() const
+{
+
+  Bool_t satellite = false;
+  for (Int_t i0=0; i0<24; i0++) {
+    Float_t timefull =  fESDTZERO -> GetTimeFull(i0,0);
+    if( timefull < -1.5 && timefull > -5) satellite=true;
+  }
+       
+  return satellite;
+
+}