From 5e0dedf72234f432566dd13355cfb8cd19bb882d Mon Sep 17 00:00:00 2001 From: richterm Date: Tue, 22 Mar 2011 11:21:58 +0000 Subject: [PATCH] correcting small memory leak, removing unnecessary pointer checks (Theo) --- HLT/TRD/AliHLTTRDCalibFitComponent.cxx | 10 +++++----- HLT/TRD/AliHLTTRDCalibrationComponent.cxx | 11 +++++------ HLT/TRD/AliHLTTRDClusterizerComponent.cxx | 3 ++- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/HLT/TRD/AliHLTTRDCalibFitComponent.cxx b/HLT/TRD/AliHLTTRDCalibFitComponent.cxx index 8df13c1d095..dfcdd38b446 100644 --- a/HLT/TRD/AliHLTTRDCalibFitComponent.cxx +++ b/HLT/TRD/AliHLTTRDCalibFitComponent.cxx @@ -353,11 +353,11 @@ Int_t AliHLTTRDCalibFitComponent::EORCalibration() coefdrift->SetName("coefdrift"); coefdriftsecond->SetName("coefdriftsecond"); coeft0->SetName("coeft0"); - if(coefgain) fAfterRunArray->Add(coefgain); - if(coefprf) fAfterRunArray->Add(coefprf); - if(coefdrift) fAfterRunArray->Add(coefdrift); - if(coefdriftsecond) fAfterRunArray->Add(coefdriftsecond); - if(coeft0) fAfterRunArray->Add(coeft0); + fAfterRunArray->Add(coefgain); + fAfterRunArray->Add(coefprf); + fAfterRunArray->Add(coefdrift); + fAfterRunArray->Add(coefdriftsecond); + fAfterRunArray->Add(coeft0); if(coefgain||coefprf||coefdrift||coeft0||coefdriftsecond) { diff --git a/HLT/TRD/AliHLTTRDCalibrationComponent.cxx b/HLT/TRD/AliHLTTRDCalibrationComponent.cxx index b59eb284604..6a4b618ee85 100644 --- a/HLT/TRD/AliHLTTRDCalibrationComponent.cxx +++ b/HLT/TRD/AliHLTTRDCalibrationComponent.cxx @@ -568,12 +568,11 @@ Int_t AliHLTTRDCalibrationComponent::EORCalibration() coefdrift->SetName("coefdrift"); coefdriftsecond->SetName("coefdriftsecond"); coeft0->SetName("coeft0"); - if(coefgain) fAfterRunArray->Add(coefgain); - if(coefprf) fAfterRunArray->Add(coefprf); - if(coefdrift) fAfterRunArray->Add(coefdrift); - if(coefdriftsecond) fAfterRunArray->Add(coefdriftsecond); - if(coeft0) fAfterRunArray->Add(coeft0); - + fAfterRunArray->Add(coefgain); + fAfterRunArray->Add(coefprf); + fAfterRunArray->Add(coefdrift); + fAfterRunArray->Add(coefdriftsecond); + fAfterRunArray->Add(coeft0); if(coefgain||coefprf||coefdrift||coeft0||coefdriftsecond) { PushBack(fAfterRunArray, AliHLTTRDDefinitions::fgkEORCalibrationDataType); diff --git a/HLT/TRD/AliHLTTRDClusterizerComponent.cxx b/HLT/TRD/AliHLTTRDClusterizerComponent.cxx index e3ffb23ed25..05965f543b7 100644 --- a/HLT/TRD/AliHLTTRDClusterizerComponent.cxx +++ b/HLT/TRD/AliHLTTRDClusterizerComponent.cxx @@ -188,7 +188,6 @@ int AliHLTTRDClusterizerComponent::DoDeinit() fReconstructor->SetClusters(0x0); delete fReconstructor; fReconstructor = 0x0; - return 0; if (fRecoParam) { @@ -196,6 +195,8 @@ int AliHLTTRDClusterizerComponent::DoDeinit() delete fRecoParam; fRecoParam = 0; } + + return 0; } int AliHLTTRDClusterizerComponent::DoEvent( const AliHLTComponentEventData& evtData, -- 2.31.1