correcting small memory leak, removing unnecessary pointer checks (Theo)

diff --git a/HLT/TRD/AliHLTTRDCalibFitComponent.cxx b/HLT/TRD/AliHLTTRDCalibFitComponent.cxx
index 8df13c1d095ef32785094acb942cdcb1de4ff0e0..dfcdd38b44693bfd2d0cb6739e2c61234dfc6001 100644 (file)
--- 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 b59eb284604ed208dbeb3a07c8cb1608316e6e82..6a4b618ee852b2fe280bc130e31c6e960be30131 100644 (file)
--- 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 e3ffb23ed2517b3f5fb919ea499fe4b4942f4a49..05965f543b74021f6e35b12ca9e5393f074d4a77 100644 (file)
--- 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,