From 74cd22f8e2e780882558f736d0aaa7a132ff978c Mon Sep 17 00:00:00 2001 From: decaro Date: Fri, 1 Feb 2008 15:03:20 +0000 Subject: [PATCH] Added some memory cleaning --- TOF/AliTOFRawStream.cxx | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/TOF/AliTOFRawStream.cxx b/TOF/AliTOFRawStream.cxx index bd45a08ac37..2faa25dddfd 100644 --- a/TOF/AliTOFRawStream.cxx +++ b/TOF/AliTOFRawStream.cxx @@ -362,8 +362,11 @@ void AliTOFRawStream::LoadRawData(Int_t indexDDL) indexDDL++) { */ - fTOFrawData = new TClonesArray("AliTOFrawData",1000); //potential memory leak - //fTOFrawData->Clear(); + fTOFrawData->Clear(); + //fTOFrawData = new TClonesArray("AliTOFrawData",1000); //potential memory leak + //fTOFrawData->Clear(); + TClonesArray &arrayTofRawData = *fTOFrawData; + fPackedDigits = 0; // create raw data map @@ -377,7 +380,7 @@ void AliTOFRawStream::LoadRawData(Int_t indexDDL) Bool_t signal = kFALSE; - + AliTOFrawData *rawDigit = NULL; while(Next()) { @@ -392,7 +395,7 @@ void AliTOFRawStream::LoadRawData(Int_t indexDDL) if (rawMap->TestHit(slot) != kEmpty) { - AliTOFrawData *rawDigit = static_cast(rawMap->GetHit(slot)); + rawDigit = static_cast(rawMap->GetHit(slot)); if (rawDigit->GetLeading()!=-1 && rawDigit->GetTrailing()==-1 && fLeadingEdge==-1 && fTrailingEdge!=-1) { @@ -408,18 +411,18 @@ void AliTOFRawStream::LoadRawData(Int_t indexDDL) fLeadingEdge!=-1 && fTrailingEdge==-1) */) { - TClonesArray &arrayTofRawData = *fTOFrawData; - new (arrayTofRawData[fPackedDigits++]) AliTOFrawData(fTRM, fTRMchain, fTDC, fTDCchannel, fTime, fToT, fLeadingEdge, fTrailingEdge, fPSbit, fACQ, fErrorFlag); + //TClonesArray &arrayTofRawData = *fTOFrawData; + new (arrayTofRawData[fPackedDigits++]) AliTOFrawData(fTRM, fTRMchain, fTDC, fTDCchannel, fTime, fToT, fLeadingEdge, fTrailingEdge, fPSbit, fACQ, fErrorFlag); - rawMap->SetHit(slot); + rawMap->SetHit(slot); - } + } } else { - TClonesArray &arrayTofRawData = *fTOFrawData; + //TClonesArray &arrayTofRawData = *fTOFrawData; new (arrayTofRawData[fPackedDigits++]) AliTOFrawData(fTRM, fTRMchain, fTDC, fTDCchannel, fTime, fToT, fLeadingEdge, fTrailingEdge, fPSbit, fACQ, fErrorFlag); rawMap->SetHit(slot); @@ -457,7 +460,7 @@ void AliTOFRawStream::LoadRawData(Int_t indexDDL) //} // closed loop on indexDDL - + rawMap->Delete(); } -- 2.43.0