all time measurements perfomed as difference with case vertex=0

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

diff --git a/T0/AliT0Reconstructor.cxx b/T0/AliT0Reconstructor.cxx
index 8fbdea801a206cd02da63628102f4261e3913778..1f331721c1774a08521a4e86b1328bcfec49ddd7 100644 (file)
--- a/T0/AliT0Reconstructor.cxx
+++ b/T0/AliT0Reconstructor.cxx
@@ -81,17 +81,16 @@ AliT0Reconstructor &AliT0Reconstructor::operator=(const AliT0Reconstructor &r)
 //_____________________________________________________________________________
 
 void AliT0Reconstructor::Reconstruct(TTree*digitsTree, TTree*clustersTree) const
-
+  
 {
-// T0 digits reconstruction
-// T0RecPoint writing 
-
+  // T0 digits reconstruction
+  // T0RecPoint writing 
   
-  Float_t  timeDelayLED[24];
-  Float_t zdetA,zdetC;
+  
+  Float_t time0vertex[24];
   TObjArray slewingLEDrec;
   TObjArray walk;
-    
+  
   TArrayI * timeCFD = new TArrayI(24); 
   TArrayI * timeLED = new TArrayI(24); 
   TArrayI * chargeQT0 = new TArrayI(24); 
@@ -101,20 +100,20 @@ void AliT0Reconstructor::Reconstruct(TTree*digitsTree, TTree*clustersTree) const
   param->Init();
   AliT0Calibrator *calib=new AliT0Calibrator(); 
 
-  Int_t mV2Mip = param->GetmV2Mip();     
+  //  Int_t mV2Mip = param->GetmV2Mip();     
   //mV2Mip = param->GetmV2Mip();     
   Int_t channelWidth = param->GetChannelWidth() ;  
+  Int_t meanT0 = param->GetMeanT0();
   
   for (Int_t i=0; i<24; i++){
     TGraph* gr = param ->GetSlewRec(i);
     slewingLEDrec.AddAtAndExpand(gr,i) ;  
+    time0vertex[i]= param->GetTimeDelayDA(i);
   }
-  zdetC = param->GetZPosition("C");
-  zdetA  = param->GetZPosition("A");
 
-    
+  
   AliDebug(1,Form("Start DIGITS reconstruction "));
-
+  
   TBranch *brDigits=digitsTree->GetBranch("T0");
   AliT0digit *fDigits = new AliT0digit() ;
   if (brDigits) {
@@ -140,21 +139,22 @@ void AliT0Reconstructor::Reconstruct(TTree*digitsTree, TTree*clustersTree) const
   
 
 
-   AliT0RecPoint* frecpoints= new AliT0RecPoint ();
-   clustersTree->Branch( "T0", "AliT0RecPoint" ,&frecpoints, 405,1);
-
+  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 ){
       Int_t qt0= chargeQT0->At(ipmt);
       Int_t qt1= chargeQT1->At(ipmt);
       if((qt1-qt0)>0)  adc[ipmt] = TMath::Exp( Double_t (channelWidth*(qt1-qt0)/1000));
-      time[ipmt] = channelWidth * (calib-> WalkCorrection( ipmt,qt1 , timeCFD->At(ipmt) ) ) ;
+      //     time[ipmt] = channelWidth * (calib-> WalkCorrection( ipmt,qt1 , timeCFD->At(ipmt) ) ) ;
+      time[ipmt] = calib-> WalkCorrection( ipmt,qt1 , timeCFD->At(ipmt) ) ;
       
       //LED
-      Double_t sl = (timeLED->At(ipmt) - timeCFD->At(ipmt)- (1000.*timeDelayLED[ipmt]/channelWidth))*channelWidth;
+      Double_t sl = (timeLED->At(ipmt) - timeCFD->At(ipmt))*channelWidth;
       Double_t qt=((TGraph*)slewingLEDrec.At(ipmt))->Eval(sl/1000.);
-      frecpoints->SetTime(ipmt,time[ipmt]);
+      //      frecpoints->SetTime(ipmt,time[ipmt]);
       frecpoints->SetAmp(ipmt,adc[ipmt]);
       frecpoints->SetAmpLED(ipmt,qt);
     }
@@ -163,7 +163,7 @@ void AliT0Reconstructor::Reconstruct(TTree*digitsTree, TTree*clustersTree) const
       adc[ipmt] = 0;
     }
   }
-
+  
   for (Int_t ipmt=0; ipmt<12; ipmt++){
     if(time[ipmt] > 1 ) {
       if(time[ipmt]<besttimeC){
@@ -185,14 +185,21 @@ void AliT0Reconstructor::Reconstruct(TTree*digitsTree, TTree*clustersTree) const
   Float_t c = 0.0299792; // cm/ps
   Float_t vertex = 0;
   if(besttimeA !=999999 && besttimeC != 999999 ){
-    timeDiff = besttimeC - besttimeA;
-    meanTime = (besttimeA + besttimeC)/2.;
+    timeDiff =(besttimeC - besttimeA)*channelWidth;
+    meanTime = (meanT0 - (besttimeA + besttimeC)/2) * channelWidth;
     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));
     
   }
+  //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] - time0vertex[ipmt])*channelWidth;
+      frecpoints->SetTime(ipmt,time[ipmt]);
+    }
+  }
   clustersTree->Fill();
 
   delete timeCFD;
@@ -206,16 +213,15 @@ 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 asked!!!
-  Float_t  timeDelayLED[24];
-  Float_t zdetA,zdetC;
+  // T0 raw ->
+  // T0RecPoint writing 
+  
+  //Q->T-> coefficients !!!! should be measured!!!
+  Float_t time0vertex[24];
   Int_t allData[110][5];
-   TObjArray slewingLEDrec;
+  TObjArray slewingLEDrec;
   TObjArray walk;
-    
+  
   TArrayI * timeCFD = new TArrayI(24); 
   TArrayI * timeLED = new TArrayI(24); 
   TArrayI * chargeQT0 = new TArrayI(24); 
@@ -239,14 +245,14 @@ void AliT0Reconstructor::Reconstruct(AliRawReader* rawReader, TTree*recTree) con
   Int_t mV2Mip = param->GetmV2Mip();     
   //mV2Mip = param->GetmV2Mip();     
   Int_t channelWidth = param->GetChannelWidth() ;  
+  Int_t meanT0 = param->GetMeanT0();
     
   for (Int_t i=0; i<24; i++){
     TGraph* gr = param ->GetSlewRec(i);
     slewingLEDrec.AddAtAndExpand(gr,i) ;  
+    time0vertex[i]= param->GetTimeDelayDA(i);
   }
   
-  zdetC = param->GetZPosition("T0/C/PMT1");
-  zdetA  = param->GetZPosition("T0/A/PMT15");
 
   for (Int_t in=0; in<24; in++)
      {
@@ -275,8 +281,9 @@ void AliT0Reconstructor::Reconstruct(AliRawReader* rawReader, TTree*recTree) con
       Int_t qt0= chargeQT0->At(ipmt);
       Int_t qt1= chargeQT1->At(ipmt);
       if((qt1-qt0)>0)  adc[ipmt] = TMath::Exp( Double_t (channelWidth*(qt1-qt0)/1000));
-       time[ipmt] = channelWidth * (calib-> WalkCorrection( ipmt,qt1 , timeCFD->At(ipmt) ) ) ;
-      Double_t sl = (timeLED->At(ipmt) - timeCFD->At(ipmt)- (1000.*timeDelayLED[ipmt]/channelWidth))*channelWidth;
+      //      time[ipmt] = channelWidth * (calib-> WalkCorrection( ipmt,qt1 , timeCFD->At(ipmt) ) ) ;
+      time[ipmt] = calib-> WalkCorrection( ipmt,qt1 , timeCFD->At(ipmt) ) ;
+      Double_t sl = (timeLED->At(ipmt) - timeCFD->At(ipmt))*channelWidth;
       Double_t qt=((TGraph*)slewingLEDrec.At(ipmt))->Eval(sl/1000.);
       frecpoints->SetTime(ipmt,time[ipmt]);
       frecpoints->SetAmp(ipmt,adc[ipmt]);
@@ -309,16 +316,24 @@ void AliT0Reconstructor::Reconstruct(AliRawReader* rawReader, TTree*recTree) con
   Float_t c = 0.0299792; // cm/ps
   Float_t vertex = 0;
   if(besttimeA !=999999 && besttimeC != 999999 ){
-    timeDiff = besttimeC - besttimeA;
-    meanTime = (besttimeA + besttimeC)/2.;
+    timeDiff = (besttimeC - besttimeA)*channelWidth;
+    //    meanTime = (besttimeA + besttimeC)/2.;
+    meanTime = (meanT0 - (besttimeA + besttimeC)/2) * channelWidth;
     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));
     
   }
+  //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] - time0vertex[ipmt])*channelWidth;
+      frecpoints->SetTime(ipmt,time[ipmt]);
+    }
+  }
   recTree->Fill();
-
+ 
 
   delete timeCFD;
   delete timeLED;
@@ -367,12 +382,11 @@ void AliT0Reconstructor::FillESD(AliRunLoader* runLoader, AliESD *pESD) const
     
     brRec->GetEntry(0);
     Float_t timeStart, Zposition, amp[24], time[24];
-    Int_t mean0 = 12450;
     Int_t i;
     Zposition = frecpoints -> GetVertex();
-    timeStart = frecpoints -> GetMeanTime() - mean0;
+    timeStart = frecpoints -> GetMeanTime() ;
     for ( i=0; i<24; i++) {
-       time[i] = Float_t (frecpoints -> GetTime(i)) / 1000.; // ps to ns
+      time[i] = Float_t (frecpoints -> GetTime(i)); // ps to ns
       amp[i] = frecpoints -> GetAmp(i);
     }
     pESD->SetT0zVertex(Zposition); //vertex Z position