X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HLT%2FPHOS%2FAliHLTPHOSRawAnalyzerPeakFinderComponent.cxx;h=d5372675b8be067d1d0d0ce55ccabb0f3ab645a1;hb=53daa147c11b78e351757c10f8332150001b14ca;hp=03084d3144d3d62d66eeee9b6ec8e54f664f991a;hpb=0bba835721a3d29362dfc30ed965b7640f607789;p=u%2Fmrichter%2FAliRoot.git diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerPeakFinderComponent.cxx b/HLT/PHOS/AliHLTPHOSRawAnalyzerPeakFinderComponent.cxx index 03084d3144d..d5372675b8b 100644 --- a/HLT/PHOS/AliHLTPHOSRawAnalyzerPeakFinderComponent.cxx +++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerPeakFinderComponent.cxx @@ -16,19 +16,16 @@ **************************************************************************/ #include "AliHLTPHOSRawAnalyzerPeakFinderComponent.h" -#include "AliHLTPHOSRawAnalyzerPeakFinder.h" -//#include -//#include "AliHLTPHOSCommonDefs.h" - +#include "AliHLTCaloRawAnalyzerPeakFinder.h" AliHLTPHOSRawAnalyzerPeakFinderComponent gAliHLTPHOSRawAnalyzerPeakFinderComponent; //___________________________________________________________________________________________________________ AliHLTPHOSRawAnalyzerPeakFinderComponent::AliHLTPHOSRawAnalyzerPeakFinderComponent():AliHLTPHOSRawAnalyzerComponentv3() { - fAnalyzerPtr = new AliHLTPHOSRawAnalyzerPeakFinder(); + fAnalyzerPtr = new AliHLTCaloRawAnalyzerPeakFinder(); - if(LoadPFVector() == kFALSE) + if(1)//LoadPFVector() == kFALSE) { // cout << "Warning, could not load PF vectors" << endl; } @@ -82,7 +79,8 @@ AliHLTPHOSRawAnalyzerPeakFinderComponent::GetComponentID() Bool_t AliHLTPHOSRawAnalyzerPeakFinderComponent::LoadPFVector() { - return LoadPFVector(PFDEFAULTSTARTINDEX, PFDEFAULTNSAMPLES, DEFAULTTAU, DEFAULTFS ); + return LoadPFVector(fCaloConstants->GetPFDEFAULTSTARTINDEX(), fCaloConstants->GetPFDEFAULTNSAMPLES(), + fCaloConstants->GetDEFAULTTAU(), fCaloConstants->GetDEFAULTFS() ); } @@ -90,7 +88,8 @@ AliHLTPHOSRawAnalyzerPeakFinderComponent::LoadPFVector() Bool_t AliHLTPHOSRawAnalyzerPeakFinderComponent::LoadPFVector(int startIndex, int nSamples, int tau, int fs) { - char tmpPFPath[PFMAXPATHLENGTH]; + + char tmpPFPath[fCaloConstants->GetPFMAXPATHLENGTH()]; 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); @@ -111,8 +110,8 @@ AliHLTPHOSRawAnalyzerPeakFinderComponent::LoadPFVector(int startIndex, int nSamp { res = fscanf(fp, "%lf", &tmpTVector[i]); } - fAnalyzerPtr->SetAVector(tmpAVector, nSamples); - fAnalyzerPtr->SetTVector(tmpTVector, nSamples); + // fAnalyzerPtr->SetAVector(tmpAVector, nSamples); + // fAnalyzerPtr->SetTVector(tmpTVector, nSamples); fclose(fp); delete [] tmpAVector; delete [] tmpTVector;