From cfceaf15bfa4c6b248f7c41f7c16c0d0f530f1a5 Mon Sep 17 00:00:00 2001 From: decaro Date: Wed, 17 Sep 2008 14:57:59 +0000 Subject: [PATCH] Delay correction update --- TOF/AliTOFDDLRawData.cxx | 7 ++++--- TOF/AliTOFRawStream.cxx | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/TOF/AliTOFDDLRawData.cxx b/TOF/AliTOFDDLRawData.cxx index cc9725b5953..2d7bda76208 100644 --- a/TOF/AliTOFDDLRawData.cxx +++ b/TOF/AliTOFDDLRawData.cxx @@ -1056,10 +1056,11 @@ void AliTOFDDLRawData::MakeTDCdigits(Int_t nDDL, Int_t nTRM, Int_t iChain, digs->GetPadz() !=volume[4]) AliWarning(" --- ERROR --- "); timeOfFlight = (Int_t)(digs->GetTdc()) - + - fTOFCableLengthMap->GetCableTimeShiftBin(nDDL, nTRM, iChain, nTDC); + /*+ + fTOFCableLengthMap->GetCableTimeShiftBin(nDDL, nTRM, iChain, nTDC)*/; - if (timeOfFlight>=fMatchingWindow+1000) continue; // adc + //if (timeOfFlight>=fMatchingWindow+1000) continue; // adc + if (timeOfFlight>=fMatchingWindow) continue; // adc //numberOfMeasuresPerChannel++; diff --git a/TOF/AliTOFRawStream.cxx b/TOF/AliTOFRawStream.cxx index 8b92fadb92b..5bedd77f1bb 100644 --- a/TOF/AliTOFRawStream.cxx +++ b/TOF/AliTOFRawStream.cxx @@ -112,7 +112,7 @@ ClassImp(AliTOFRawStream) const Int_t AliTOFRawStream::fgkddlBCshift[72] = { 2, 2, -1, -1, - 2, 3, 0, 0, + 2, 2, 0, 0, 2, 2, 0, 0, 2, 2, 0, 0, 2, 2, 0, 0, @@ -756,8 +756,8 @@ Bool_t AliTOFRawStream::Next() case 0: // packing ok, digit time and TOT fToT = GetField(data,TRM_TOT_WIDTH_MASK, TRM_TOT_WIDTH_POSITION); fTime = GetField(data,TRM_DIGIT_TIME_MASK,TRM_DIGIT_TIME_POSITION) - - - fCableLengthMap->GetCableTimeShiftBin(fDDL, fTRM, fTRMchain, fTDC) + /*- + fCableLengthMap->GetCableTimeShiftBin(fDDL, fTRM, fTRMchain, fTDC)*/ /*+ (Int_t)(fgkddlBCshift[fDDL]*25.*1000./AliTOFGeometry::TdcBinWidth()) + @@ -769,8 +769,8 @@ Bool_t AliTOFRawStream::Next() //fToT = -1; //fTime = -1; fLeadingEdge = GetField(data,TRM_LONG_DIGIT_TIME_MASK,TRM_LONG_DIGIT_TIME_POSITION) - - - fCableLengthMap->GetCableTimeShiftBin(fDDL, fTRM, fTRMchain, fTDC) + /*- + fCableLengthMap->GetCableTimeShiftBin(fDDL, fTRM, fTRMchain, fTDC)*/ /*+ (Int_t)(fgkddlBCshift[fDDL]*25.*1000./AliTOFGeometry::TdcBinWidth()) + @@ -782,8 +782,8 @@ Bool_t AliTOFRawStream::Next() //fToT = -1; //fTime = -1; fTrailingEdge = GetField(data,TRM_LONG_DIGIT_TIME_MASK,TRM_LONG_DIGIT_TIME_POSITION) - - - fCableLengthMap->GetCableTimeShiftBin(fDDL, fTRM, fTRMchain, fTDC) + /*- + fCableLengthMap->GetCableTimeShiftBin(fDDL, fTRM, fTRMchain, fTDC)*/ /*+ (Int_t)(fgkddlBCshift[fDDL]*25.*1000./AliTOFGeometry::TdcBinWidth()) + @@ -794,8 +794,8 @@ Bool_t AliTOFRawStream::Next() case 3: // TOT overflow fToT = GetField(data,TRM_TOT_WIDTH_MASK, TRM_TOT_WIDTH_POSITION); fTime = GetField(data,TRM_DIGIT_TIME_MASK,TRM_DIGIT_TIME_POSITION) - - - fCableLengthMap->GetCableTimeShiftBin(fDDL, fTRM, fTRMchain, fTDC) + /*- + fCableLengthMap->GetCableTimeShiftBin(fDDL, fTRM, fTRMchain, fTDC)*/ /*+ (Int_t)(fgkddlBCshift[fDDL]*25.*1000./AliTOFGeometry::TdcBinWidth()) + @@ -1458,8 +1458,8 @@ AliTOFRawStream::LoadRawDataBuffers(Int_t indexDDL, Int_t verbose) Int_t hitTOTBin = hitData->GetTOTBin(); Int_t hitLeading = hitData->GetTimeBin() - - - fCableLengthMap->GetCableTimeShiftBin(indexDDL, hitSlotID, hitChain, hitTDC);//-1; // adc + /*- + fCableLengthMap->GetCableTimeShiftBin(indexDDL, hitSlotID, hitChain, hitTDC)*/;//-1; // adc Int_t hitTrailing = -1; Int_t hitError = -1; -- 2.43.0