X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HLT%2FPHOS%2FAliHLTPHOSRawAnalyzer.h;h=9a973be939069a77b3bcfdeb5ee67932caeed553;hb=921709814f8fa880b810fd1d9550d7f400fbec5e;hp=fe1c683b893abb680ebf3131d63dcafb1b277e8b;hpb=9c9d15d63ae86a79e17701c6fdea7bc963e286da;p=u%2Fmrichter%2FAliRoot.git

diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzer.h b/HLT/PHOS/AliHLTPHOSRawAnalyzer.h
index fe1c683b893..9a973be9390 100644
--- a/HLT/PHOS/AliHLTPHOSRawAnalyzer.h
+++ b/HLT/PHOS/AliHLTPHOSRawAnalyzer.h
@@ -1,3 +1,4 @@
+//-*- Mode: C++ -*-
 #ifndef ALIHLTPHOSRAWANALYZER_H
 #define ALIHLTPHOSRAWANALYZER_H
 /* Copyright(c) 1998-2004, ALICE Experiment at CERN, All rights reserved. *
@@ -5,10 +6,14 @@
 
 /* $Id$ */
 
+#include "Rtypes.h"
 
-#include "AliHLTPHOSBase.h"
 
-class AliHLTPHOSRawAnalyzer: public AliHLTPHOSBase
+//#include "AliHLTPHOSBase.h"
+class AliHLTPHOSUtilities;
+
+//class AliHLTPHOSRawAnalyzer: public AliHLTPHOSBase
+class AliHLTPHOSRawAnalyzer
 //class AliHLTPHOSRawAnalyzer
 {
  public:
@@ -16,27 +21,59 @@ class AliHLTPHOSRawAnalyzer: public AliHLTPHOSBase
   virtual ~AliHLTPHOSRawAnalyzer();
   AliHLTPHOSRawAnalyzer(double *dataPtr, double fs);
 
-  void BaselineCorrection(double *dataPtr, int N);
-  void BaselineCorrection(double *dataPtr, double baselineValue);  
+  void SetCorrectBaselineUsingFirstFiveSamples();
+  void CorrectBaselineUsingFirstFiveSamples(UInt_t *data, const int length);
+  // void CorrectBaselineUsingFirstFiveSamples(int *data, int length);
+  //void CorrectBaselineUsingFirstFiveSamples(double *data, int length);
+
+
+  //  void BaselineCorrection(double *dataPtr, int N);
+ void BaselineCorrection(double *dataPtr, double baselineValue);  
+
   int FindStartIndex(double treshold);
   float GetTiming() const;
   float GetEnergy() const;
 
-  void SetData(double *data);
-  void SetData(UInt_t *data);
+  //  void SetData(const double *data);
+  void SetData(const UInt_t *data, const int length);
+  void SetData(const UShort_t *data, const int length);
+  // void SetData(UInt_t *data, const int length);
+
+  // void SetData(double *data, const int length);
+  //  void SetData(int *data, const int length);
 
+ 
   void SetSampleFreq(double freq);
   void SetStartIndex(int startIndex);
   void MakeInitialGuess();
   void MakeInitialGuess(int treshold);
-
+  
   virtual void SetTVector(Double_t *tVector, Int_t size);
   virtual void SetAVector(Double_t *aVector, Int_t size);
+
   virtual void Evaluate(Int_t start = 0, Int_t lenght = 100) = 0;
 
+
  protected:
-  Double_t   *fFloatDataPtr;   /**<Float representation of data that should be fitted */
-  UInt_t     *fIntDataPtr;     /**<data that should be fitted */
+  bool fDoCorrectBaselineUsingFirstFiveSamples;
+
+  //  mutable  Double_t   *fFloatDataPtr;   /**<Float representation of data that should be fitted */
+  //  mutable  UInt_t     *fIntDataPtr;     /**<data that should be fitted */
+
+ /*  mutable const Double_t   *fFloatDataPtr;   /\**<Float representation of data that should be fitted *\/ */
+/*   mutable const unsigned int     *fIntDataPtr;     /\**<data that should be fitted *\/ */
+
+
+  //double   *fFloatDataPtr;   /**<Float representation of data that should be fitted */
+
+  double   *fDoubleDataPtr;   /**<Float representation of data that should be fitted */
+  UInt_t   *fIntDataPtr;     /**<data that should be fitted */
+  UShort_t   *fShortDataPtr;     /**<data that should be fitted */
+ //  int      *fIntDataPtr;     /**<data that should be fitted */
+
+
+  //  mutable const UInt_t     *fIntDataPtr;     /**<data that should be fitted */
+  
   double     fSampleFrequency; /**<The ADC sample frequency in MHz used under data taking */
   double     fDTofGuess;       /**<Initial guess for t0*/
   double     fDAmplGuess;      /**<Initial guess for amplitude*/
@@ -45,6 +82,13 @@ class AliHLTPHOSRawAnalyzer: public AliHLTPHOSBase
   double     fDAmpl;           /**<Amplitude in entities of ADC levels*/
   int        fStartIndex;      /**<Starindex of the time dependent altro signal*/
 
+  //  double unsigned fTest;
+
+  bool fUseShortValues;
+
+ protected:
+  AliHLTPHOSUtilities *fUtilitiesPtr;
+
  private:
   AliHLTPHOSRawAnalyzer(const AliHLTPHOSRawAnalyzer & );
   AliHLTPHOSRawAnalyzer & operator = (const AliHLTPHOSRawAnalyzer &);