X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HLT%2FPHOS%2FAliHLTPHOSRawAnalyzerPeakFinderComponent.cxx;h=03084d3144d3d62d66eeee9b6ec8e54f664f991a;hb=ab846928f114c031ffb722773f10d29f67e1212c;hp=d1ad9ec266f5dee2b884c1d4b5fbe0ec7fa4a385;hpb=146c463a4a3635579d853e66608cd42506356ae6;p=u%2Fmrichter%2FAliRoot.git

diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerPeakFinderComponent.cxx b/HLT/PHOS/AliHLTPHOSRawAnalyzerPeakFinderComponent.cxx
index d1ad9ec266f..03084d3144d 100644
--- a/HLT/PHOS/AliHLTPHOSRawAnalyzerPeakFinderComponent.cxx
+++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerPeakFinderComponent.cxx
@@ -1,3 +1,5 @@
+// $Id$
+
 /**************************************************************************
  * Copyright(c) 2006, ALICE Experiment at CERN, All rights reserved.      *
  *                                                                        *
@@ -15,13 +17,14 @@
 
 #include "AliHLTPHOSRawAnalyzerPeakFinderComponent.h"
 #include "AliHLTPHOSRawAnalyzerPeakFinder.h"
-#include <cstdlib>
-#include "AliHLTPHOSCommonDefs.h"
+//#include <cstdlib>
+//#include "AliHLTPHOSCommonDefs.h"
 
 
 AliHLTPHOSRawAnalyzerPeakFinderComponent gAliHLTPHOSRawAnalyzerPeakFinderComponent;
 
-AliHLTPHOSRawAnalyzerPeakFinderComponent::AliHLTPHOSRawAnalyzerPeakFinderComponent():AliHLTPHOSRawAnalyzerComponent()
+//___________________________________________________________________________________________________________
+AliHLTPHOSRawAnalyzerPeakFinderComponent::AliHLTPHOSRawAnalyzerPeakFinderComponent():AliHLTPHOSRawAnalyzerComponentv3()
 {
   fAnalyzerPtr = new AliHLTPHOSRawAnalyzerPeakFinder();
 
@@ -36,68 +39,97 @@ AliHLTPHOSRawAnalyzerPeakFinderComponent::AliHLTPHOSRawAnalyzerPeakFinderCompone
 } 
 
 
+//___________________________________________________________________________________________________________
 AliHLTPHOSRawAnalyzerPeakFinderComponent::~AliHLTPHOSRawAnalyzerPeakFinderComponent()
 {
 
+  if(fAnalyzerPtr)
+    {
+      delete fAnalyzerPtr;
+      fAnalyzerPtr = 0;
+    }
 }
 
 
-AliHLTPHOSRawAnalyzerPeakFinderComponent::AliHLTPHOSRawAnalyzerPeakFinderComponent(const AliHLTPHOSRawAnalyzerPeakFinderComponent & ) : AliHLTPHOSRawAnalyzerComponent()
+//___________________________________________________________________________________________________________
+AliHLTPHOSRawAnalyzerPeakFinderComponent::AliHLTPHOSRawAnalyzerPeakFinderComponent(const AliHLTPHOSRawAnalyzerPeakFinderComponent & ) : AliHLTPHOSRawAnalyzerComponentv3()
 {
 
 }
 
+//-----------------------------------------------------------------------------------------------------------
+int
+AliHLTPHOSRawAnalyzerPeakFinderComponent::Deinit()
+{
+  
+  if(fAnalyzerPtr)
+    {
+      delete fAnalyzerPtr;
+      fAnalyzerPtr = 0;
+    }
+  Logging(kHLTLogInfo, "HLT", "PHOS", ",AliHLTPHOSRawAnalyzerCrudeComponent Deinit");
+  return 0;
+}
 
+//___________________________________________________________________________________________________________
 const char* 
 AliHLTPHOSRawAnalyzerPeakFinderComponent::GetComponentID()
 {
   return "PhosRawPeakFinder";
 }
 
+//___________________________________________________________________________________________________________
 Bool_t 
 AliHLTPHOSRawAnalyzerPeakFinderComponent::LoadPFVector()
 {
-  return LoadPFVector(PF_DEFAULT_STARTINDEX,  PF_DEFAULT_N_SAMPLES, DEFAULT_TAU, DEFAULT_FS );
+  return LoadPFVector(PFDEFAULTSTARTINDEX,  PFDEFAULTNSAMPLES, DEFAULTTAU, DEFAULTFS );
 }
 
 
+//___________________________________________________________________________________________________________
 Bool_t 
 AliHLTPHOSRawAnalyzerPeakFinderComponent::LoadPFVector(int startIndex, int nSamples, int tau, int fs)
 {
-  char tmpPFPath[PF_MAX_PATH_LENGTH];
-  Double_t tmpAVector[nSamples];
-  Double_t tmpTVector[nSamples]; 
-  sprintf(tmpPFPath,"%s%s/start%dN%dtau%dfs%d.txt", getenv("ALICE_ROOT"), PF_VECTOR_DIR, startIndex, nSamples, tau, fs);
+  char tmpPFPath[PFMAXPATHLENGTH];
+  Double_t * tmpAVector = new Double_t[nSamples];
+  Double_t * tmpTVector = new Double_t[nSamples]; 
+  sprintf(tmpPFPath,"%s%s/start%dN%dtau%dfs%d.txt", getenv("ALICE_ROOT"), PFVECTORDIR, startIndex, nSamples, tau, fs);
   FILE *fp;
   fp = fopen(tmpPFPath, "r");
   
+  Int_t res = 0; //OD to get rid of warnings
   if(fp != 0)
     {
       for(int i=0; i <  nSamples; i++)
 	{
-	  fscanf(fp, "%lf", &tmpAVector[i]);
+	  res = fscanf(fp, "%lf", &tmpAVector[i]);
 	}
 
-      fscanf(fp, "\n");
+      res = fscanf(fp, "\n");
 
       for(int i=0; i < nSamples; i++)
 	{
-	  	  fscanf(fp, "%lf", &tmpTVector[i]);
+	  res = fscanf(fp, "%lf", &tmpTVector[i]);
 	}
       fAnalyzerPtr->SetAVector(tmpAVector,  nSamples);
       fAnalyzerPtr->SetTVector(tmpTVector,  nSamples);
       fclose(fp);
+      delete [] tmpAVector;
+      delete [] tmpTVector;
       return kTRUE;
     }
   
   else
     {
+      delete [] tmpAVector;
+      delete [] tmpTVector;
       HLTFatal("ERROR: could not  open PF vector file");
       return kFALSE;
     }
 }
 
 
+//___________________________________________________________________________________________________________
 AliHLTComponent*
 AliHLTPHOSRawAnalyzerPeakFinderComponent::Spawn()
 {