Bug fixes

diff --git a/HLT/PHOS/AliHLTPHOSLinkDef.h b/HLT/PHOS/AliHLTPHOSLinkDef.h
index e5519be45e7f22581d0aa214cfb578e6eb2fe715..8aba5e97015a5733c0fa80573fbd36ff74eb2116 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSLinkDef.h
+++ b/HLT/PHOS/AliHLTPHOSLinkDef.h
@@ -4,17 +4,17 @@
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
-#pragma link C++ class AliHLTPHOSAnalyzerPeakFinder+; 
-#pragma link C++ class AliHLTPHOSAnalyzerCrude+;
-#pragma link C++ class AliHLTPHOSAnalyzerChiSquareFit+;
-#pragma link C++ class AliHLTPHOSAnalyzerKLevel+;
-#pragma link C++ class AliHLTPHOSAnalyzerLMS+;
+#pragma link C++ class AliHLTPHOSRawAnalyzerPeakFinder+; 
+#pragma link C++ class AliHLTPHOSRawAnalyzerCrude+;
+#pragma link C++ class AliHLTPHOSRawAnalyzerChiSquareFit+;
+#pragma link C++ class AliHLTPHOSRawAnalyzerKLevel+;
+#pragma link C++ class AliHLTPHOSRawAnalyzerLMS+;
 #pragma link C++ class AliHLTPHOSPulseGenerator+;
 #pragma link C++ class AliHLTPHOSEmcCalibData+; 
-//#pragma link C++ class AliHLTPHOSAnalyzerComponent+;
-//#pragma link C++ class AliHLTPHOSAnalyzerPeakFinderComponent+;
-//#pragma link C++ class AliHLTPHOSAnalyzerCrudeComponent+;
-//#pragma link C++ class AliHLTPHOSAnalyzerPeakFinderComponent+;
-//#pragma link C++ class AliHLTPHOSAnalyzer+;
+//#pragma link C++ class AliHLTPHOSRawAnalyzerComponent+;
+//#pragma link C++ class AliHLTPHOSRawAnalyzerPeakFinderComponent+;
+//#pragma link C++ class AliHLTPHOSRawAnalyzerCrudeComponent+;
+//#pragma link C++ class AliHLTPHOSRawAnalyzerPeakFinderComponent+;
+//#pragma link C++ class AliHLTPHOSRawAnalyzer+;
 
 #endif

diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzer.h b/HLT/PHOS/AliHLTPHOSRawAnalyzer.h
index 53518488139c5f6560b0abdb0030ca845edabff4..257be84e4d4ec98493b97fe8c1d6cdd078a96f80 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRawAnalyzer.h
+++ b/HLT/PHOS/AliHLTPHOSRawAnalyzer.h
@@ -5,14 +5,14 @@
 
 /* $Id$ */
 
-class AliHLTPHOSAnalyzer
+class AliHLTPHOSRawAnalyzer
 {
  public:
-  AliHLTPHOSAnalyzer();
-  virtual ~AliHLTPHOSAnalyzer();
-  AliHLTPHOSAnalyzer(double *dataPtr, double fs);
-  AliHLTPHOSAnalyzer(const AliHLTPHOSAnalyzer & );
-  AliHLTPHOSAnalyzer & operator = (const AliHLTPHOSAnalyzer &)
+  AliHLTPHOSRawAnalyzer();
+  virtual ~AliHLTPHOSRawAnalyzer();
+  AliHLTPHOSRawAnalyzer(double *dataPtr, double fs);
+  AliHLTPHOSRawAnalyzer(const AliHLTPHOSRawAnalyzer & );
+  AliHLTPHOSRawAnalyzer & operator = (const AliHLTPHOSRawAnalyzer &)
     {
       return *this;
     }

diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerCrude.h b/HLT/PHOS/AliHLTPHOSRawAnalyzerCrude.h
index 07805a5034d5bf4cb5d20afb6bffd9afa761ad0e..c3f3f7c499028e7ba06ebfedf52d9f982b4ae036 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRawAnalyzerCrude.h
+++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerCrude.h
@@ -2,27 +2,28 @@
 #define ALIHLTPHOSANALYZERCRUDE_H
 #include <Rtypes.h>
 #include "TObject.h"
-#include "AliHLTPHOSAnalyzer.h"
+//         "AliHLTPHOSRawAnalyzer"
+#include "AliHLTPHOSRawAnalyzer.h"
 
 
 /* Copyright(c) 2006, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                          */
 
 
-class AliHLTPHOSAnalyzerCrude : public AliHLTPHOSAnalyzer
+class AliHLTPHOSRawAnalyzerCrude : public AliHLTPHOSRawAnalyzer
 {
  public:
-  AliHLTPHOSAnalyzerCrude();
-  AliHLTPHOSAnalyzerCrude(const AliHLTPHOSAnalyzerCrude & );
-  AliHLTPHOSAnalyzerCrude & operator = (const AliHLTPHOSAnalyzerCrude)
+  AliHLTPHOSRawAnalyzerCrude();
+  AliHLTPHOSRawAnalyzerCrude(const AliHLTPHOSRawAnalyzerCrude & );
+  AliHLTPHOSRawAnalyzerCrude & operator = (const AliHLTPHOSRawAnalyzerCrude)
     {
       return *this; 
     }
   
-  virtual ~AliHLTPHOSAnalyzerCrude();
+  virtual ~AliHLTPHOSRawAnalyzerCrude();
   virtual void Evaluate(int start = 0, int lenght = 100);
  private:
-  ClassDef(AliHLTPHOSAnalyzerCrude, 2) 
+  ClassDef(AliHLTPHOSRawAnalyzerCrude, 2) 
   
     };
 

diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerLMS.cxx b/HLT/PHOS/AliHLTPHOSRawAnalyzerLMS.cxx
index 4209fc3e9169566654ae9a84eb16fb94f799b317..30f18d57ad1151351b225519fb9cd7934aa7769d 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRawAnalyzerLMS.cxx
+++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerLMS.cxx
@@ -14,16 +14,16 @@
  **************************************************************************/
 
 
-#include "AliHLTPHOSRawRawAnalyzerLMS.h"
+#include "AliHLTPHOSRawAnalyzerLMS.h"
 #include <iostream>
 
 using std::cout;
 using std::endl;
 
-ClassImp(AliHLTPHOSRawRawAnalyzerLMS) 
+ClassImp(AliHLTPHOSRawAnalyzerLMS) 
 
 
-AliHLTPHOSRawRawAnalyzerLMS::AliHLTPHOSRawRawAnalyzerLMS(const AliHLTPHOSRawRawAnalyzerLMS&):AliHLTPHOSRawRawAnalyzer(), kfMCovarPtrPtr(0), fPCovarPtrPtr(0)
+AliHLTPHOSRawAnalyzerLMS::AliHLTPHOSRawAnalyzerLMS(const AliHLTPHOSRawAnalyzerLMS&):AliHLTPHOSRawAnalyzer(), kfMCovarPtrPtr(0), fPCovarPtrPtr(0)
 {
 
 }
@@ -35,7 +35,7 @@ AliHLTPHOSRawRawAnalyzerLMS::AliHLTPHOSRawRawAnalyzerLMS(const AliHLTPHOSRawRawA
  * a sequense of ADC digitized 10 bit integer values, however for performance reasons all values used in
  * calculation is of type double.
  **/
-AliHLTPHOSRawRawAnalyzerLMS::AliHLTPHOSRawRawAnalyzerLMS():AliHLTPHOSRawRawAnalyzer(), kfMCovarPtrPtr(0), fPCovarPtrPtr(0) 
+AliHLTPHOSRawAnalyzerLMS::AliHLTPHOSRawAnalyzerLMS():AliHLTPHOSRawAnalyzer(), kfMCovarPtrPtr(0), fPCovarPtrPtr(0) 
 {
   cout <<"You cannot invoke the Fitter without arguments"<<endl;;
 }
@@ -46,17 +46,17 @@ AliHLTPHOSRawRawAnalyzerLMS::AliHLTPHOSRawRawAnalyzerLMS():AliHLTPHOSRawRawAnaly
 * @param dataPtr Data array for wich a subarray will be taken to perform the fit
 * @param fs the sampling frequency in entities of MHz. Needed in order to calculate physical time
 **/
-AliHLTPHOSRawRawAnalyzerLMS::AliHLTPHOSRawRawAnalyzerLMS(double *dtaPtr, double fs):AliHLTPHOSRawRawAnalyzer(),kfMCovarPtrPtr(0), fPCovarPtrPtr(0) 
+AliHLTPHOSRawAnalyzerLMS::AliHLTPHOSRawAnalyzerLMS(double *dtaPtr, double fs):AliHLTPHOSRawAnalyzer(),kfMCovarPtrPtr(0), fPCovarPtrPtr(0) 
 {
   fFloatDataPtr = dtaPtr;  
   fSampleFrequency = fs;
-} //end   AliHLTPHOSRawRawAnalyzerLMS 
+} //end   AliHLTPHOSRawAnalyzerLMS 
 
 
-AliHLTPHOSRawRawAnalyzerLMS::~AliHLTPHOSRawRawAnalyzerLMS()
+AliHLTPHOSRawAnalyzerLMS::~AliHLTPHOSRawAnalyzerLMS()
 {
 
-} //end AliHLTPHOSRawRawAnalyzerLMS
+} //end AliHLTPHOSRawAnalyzerLMS
 
 
 /**
@@ -71,7 +71,7 @@ AliHLTPHOSRawRawAnalyzerLMS::~AliHLTPHOSRawRawAnalyzerLMS()
 * @param length the number of samples to use starting from index 
 **/
 void 
-AliHLTPHOSRawRawAnalyzerLMS::Evaluate(int start, int length)
+AliHLTPHOSRawAnalyzerLMS::Evaluate(int start, int length)
 {
   /*
 

diff --git a/HLT/PHOS/Makefile.am b/HLT/PHOS/Makefile.am
index 2ca28d373fd01e8fe08a105131703b664319bc94..3a312abf8530a079421e587f0156cc61b8fc8cf0 100644 (file)
--- a/HLT/PHOS/Makefile.am
+++ b/HLT/PHOS/Makefile.am
@@ -11,30 +11,30 @@ lib_LTLIBRARIES                     =  libAliHLTPHOS.la
 
 # library sources
 libAliHLTPHOS_la_SOURCES       = AliHLTPHOSPulseGenerator.cxx \
-                                 AliHLTPHOSAnalyzerPeakFinder.cxx \
-                                 AliHLTPHOSAnalyzerCrude.cxx \
-                                 AliHLTPHOSAnalyzerKLevel.cxx \
-                                 AliHLTPHOSAnalyzerLMS.cxx \
-                                 AliHLTPHOSAnalyzerChiSquareFit.cxx \
-                                 AliHLTPHOSAnalyzer.cxx \
+                                 AliHLTPHOSRawAnalyzerPeakFinder.cxx \
+                                 AliHLTPHOSRawAnalyzerCrude.cxx \
+                                 AliHLTPHOSRawAnalyzerKLevel.cxx \
+                                 AliHLTPHOSRawAnalyzerLMS.cxx \
+                                 AliHLTPHOSRawAnalyzerChiSquareFit.cxx \
+                                 AliHLTPHOSRawAnalyzer.cxx \
                                  AliHLTPHOSEmcCalibData.cxx \
-                                 AliHLTPHOSAnalyzerComponent.cxx \
-                                 AliHLTPHOSAnalyzerCrudeComponent.cxx \
-                                 AliHLTPHOSAnalyzerPeakFinderComponent.cxx \
+                                 AliHLTPHOSRawAnalyzerComponent.cxx \
+                                 AliHLTPHOSRawAnalyzerCrudeComponent.cxx \
+                                 AliHLTPHOSRawAnalyzerPeakFinderComponent.cxx \
                                  PeakFinderTest.cxx
 
 # class header files, the link definition for the root dictionary
 # will be created from the names of the header files
 CLASS_HDRS                     = AliHLTPHOSPulseGenerator.h \
-                                 AliHLTPHOSAnalyzerPeakFinder.h \
-                                 AliHLTPHOSAnalyzerCrude.h \
-                                 AliHLTPHOSAnalyzerKLevel.h \
-                                 AliHLTPHOSAnalyzerLMS.h \
-                                 AliHLTPHOSAnalyzerChiSquareFit.h \
+                                 AliHLTPHOSRawAnalyzerPeakFinder.h \
+                                 AliHLTPHOSRawAnalyzerCrude.h \
+                                 AliHLTPHOSRawAnalyzerKLevel.h \
+                                 AliHLTPHOSRawAnalyzerLMS.h \
+                                 AliHLTPHOSRawAnalyzerChiSquareFit.h \
                                  AliHLTPHOSEmcCalibData.h \
-                                 AliHLTPHOSAnalyzerComponent.h \
-                                 AliHLTPHOSAnalyzerCrudeComponent.h \
-                                 AliHLTPHOSAnalyzerPeakFinderComponent.h 
+                                 AliHLTPHOSRawAnalyzerComponent.h \
+                                 AliHLTPHOSRawAnalyzerCrudeComponent.h \
+                                 AliHLTPHOSRawAnalyzerPeakFinderComponent.h 
 
 
 pkginclude_HEADERS             = $(CLASS_HDRS)