-
/**************************************************************************
* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
* *
#include "AliESDfriend.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>
fLatencyL1(0),
fLatencyL1A(0),
fLatencyL1C(0),
+ fGRPdelays(0),
+ fTimeMeanShift(0x0),
+ fTimeSigmaShift(0x0),
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();
+
+ 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();
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));
+ 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"));
fCalib = new AliT0Calibrator();
fESDTZEROfriend = new AliESDTZEROfriend();
//_____________________________________________________________________________
void AliT0Reconstructor::Reconstruct(TTree*digitsTree, TTree*clustersTree) const
-
{
// T0 digits reconstruction
- Int_t refAmp = GetRecoParam()->GetRefAmp();
+ Int_t refAmp = Int_t (GetRecoParam()->GetRefAmp());
TArrayI * timeCFD = new TArrayI(24);
TArrayI * timeLED = new TArrayI(24);
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() ;
Int_t pmtBestC=99999;
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], 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
adc[ipmt] = 0;
- // time[ipmt] = fCalib-> WalkCorrection(refAmp, ipmt, adc[ipmt], timeCFD->At(ipmt)) ;
+ 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 ",
+ // time[ipmt] = fCalib-> WalkCorrection( refAmp,ipmt, Int_t(sl), timeCFD->At(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]));
+ 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->SetAmp(ipmt, Float_t( ampMip)); //for cosmic &pp beam
- frecpoints->SetAmpLED(ipmt, Float_t(qtMip));
+ frecpoints->SetAmpLED(ipmt, Float_t( ampMip)); //for cosmic &pp beam
+ frecpoints->SetAmp(ipmt, Float_t(qtMip));
+ adcmip[ipmt]=qtMip;
}
else {
}
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;
}
}
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));
+ frecpoints->SetTimeBestA(Int_t(besttimeA *channelWidth - fdZonA/c));
tr[1]=true;
}
if( besttimeC < 999999 ) {
- frecpoints->SetTimeBestC(Int_t(besttimeC *channelWidth));
+ 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;
meanTime = (besttimeA + besttimeC)/2;// * channelWidth);
- timeclock = meanTime *channelWidth ;
+ timeclock = meanTime *channelWidth -fdZonA/c ;
vertex = meanVertex - c*(timeDiff)/2.;// + (fdZonA - fdZonC)/2;
tr[0]=true;
}
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]));
+ 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));
- 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));
+ 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));
//
// reference amplitude and time ref. point from reco param
- Int_t refAmp = GetRecoParam()->GetRefAmp();
- Int_t refPoint = GetRecoParam()->GetRefPoint();
+ Float_t refAmp = GetRecoParam()->GetRefAmp();
+
+ // Int_t refPoint = 0;
+
+ //Bad channel
+ Int_t badpmt = GetRecoParam()->GetRefPoint();
+
+ Int_t low[500], high[500];
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=999999, meanTime=999999, 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 i0=0; i0<110; i0++)
{
- for (Int_t j0=0; j0<5; j0++) allData[i0][j0]=0;
- }
-
+ 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));
+ }
+ Float_t lowAmpThreshold = GetRecoParam()->GetLow(200);
+ Float_t highAmpThreshold = GetRecoParam()->GetHigh(200);
+ printf(" lowAmpThreshold %f highAmpThreshold %f \n",lowAmpThreshold, highAmpThreshold);
+
Double32_t besttimeA=9999999;
Double32_t besttimeC=9999999;
Int_t pmtBestA=99999;
AliT0RecPoint* frecpoints= new AliT0RecPoint ();
- recTree->Branch( "T0", "AliT0RecPoint" ,&frecpoints, 405,1);
+ recTree->Branch( "T0", "AliT0RecPoint" ,&frecpoints);
AliDebug(10," before read data ");
AliT0RawReader myrawreader(rawReader);
AliDebug(1,Form(" no raw data found!!"));
else
{
- if(type == 7) { //only physics
- for (Int_t i=0; i<105; i++) {
+ 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<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;
+ }
+ Int_t ref=0;
- 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){
+ // 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(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=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], adcmip[24], noncalibtime[24];
+ for (Int_t ipmt=0; ipmt<24; ipmt++) {
+ if(timeCFD[ipmt]>0 && ipmt != badpmt ){
//for simulated data
//for physics data
if(( chargeQT0[ipmt] - chargeQT1[ipmt])>0) {
}
else
adc[ipmt] = 0;
-
-
- // time[ipmt] = fCalib-> WalkCorrection(refAmp, ipmt, adc[ipmt], timeCFD[ipmt] ) ;
+ time[ipmt] = fCalib-> WalkCorrection(Int_t (refAmp), 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] ) ;
+ // 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(0,Form(" Amlitude in MIPS LED %f ; QTC %f; in channels %i\n ",ampMip,qtMip, 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<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));
+ 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;
}
fESDTZEROfriend->SetT0timeCorr(noncalibtime) ;
for (Int_t ipmt=0; ipmt<12; ipmt++){
- if(time[ipmt] > 1
- && (timeLED[ipmt] - timeCFD[ipmt])<550 )
+ if(time[ipmt] > 1 && ipmt != badpmt && adcmip[ipmt]>lowAmpThreshold && adcmip[ipmt]<highAmpThreshold )
{
if(time[ipmt]<besttimeC){
- besttimeC=time[ipmt]; //timeC
- pmtBestC=ipmt;
+ besttimeC=time[ipmt]; //timeC
+ pmtBestC=ipmt;
}
}
}
for ( Int_t ipmt=12; ipmt<24; ipmt++)
{
- if(time[ipmt] > 1
- && (timeLED[ipmt] - timeCFD[ipmt])<550 )
+ if(time[ipmt] > 1 && ipmt != badpmt && adcmip[ipmt]>lowAmpThreshold && adcmip[ipmt]<highAmpThreshold)
{
if(time[ipmt]<besttimeA) {
besttimeA=time[ipmt]; //timeA
}
}
if(besttimeA < 999999)
- frecpoints->SetTimeBestA(besttimeA * channelWidth - 1000.*fLatencyHPTDC + 1000.*fLatencyL1A);
+ frecpoints->SetTimeBestA(besttimeA * channelWidth - 1000.*fLatencyHPTDC + 1000.*fLatencyL1A - 1000.*fGRPdelays - 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]);
+ 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;
+ timeclock = channelWidth * Float_t( besttimeA+besttimeC)/2. - 1000.*fLatencyHPTDC + 1000.*fLatencyL1 - 1000.*fGRPdelays - fTimeMeanShift[0];
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));
+ 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);
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);
+ for (Int_t iHit=0; iHit<5; iHit++)
+ {
+ Int_t trr=trchan[itr];
+ if( allData[trr][iHit] > 0) tr[itr]=true;
+ }
}
+ frecpoints->SetT0Trig(tr);
+
+ //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;
****************************************************/
AliDebug(1,Form("Start FillESD T0"));
+ pESD ->SetT0spread(fTimeSigmaShift);
+
+
Float_t channelWidth = fParam->GetChannelWidth() ;
- Float_t c = 29.9792458; // cm/ns
+ 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();
currentVertex = vertex->GetZ();
ncont = vertex->GetNContributors();
- // cout<<" spdver "<<spdver<<" ncont "<<ncont<<endl;
- if(ncont>2 ) {
+ // cout<<"@@ spdver "<<spdver<<" ncont "<<ncont<<endl;
+ if(ncont>0 ) {
shift = currentVertex/c;
- // cout<<" vertex shif "<<shift<<" vertex "<<spdver<<" IsFromVertexer3D "<<fverSPD->IsFromVertexer3D()<<endl;
}
}
TTree *treeR = clustersTree;
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();
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);
- }
+ 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
+
+ Double32_t multA=frecpoints ->GetMultA();
+ Double32_t multC=frecpoints ->GetMultC();
+ // pESD->SetT0MultC(multC); // multiplicity Cside
+ // pESD->SetT0MultA(multA); // multiplicity Aside
+ pESD->SetT0(multA); // for backward compatubility
+ pESD->SetT0clock(multC); // for backward compatubility
+
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
+ 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 (fr) {
AliDebug(1, 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 : 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);
- }//
+ fr->SetTZEROfriend(fESDTZEROfriend);
+ // }//
}
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff