X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliCaloRawAnalyzerPeakFinder.h;h=a46a9964958740911b8164803e22bb47f91eefe3;hb=3e95957ef962ab28eec73431788f76b59767bece;hp=616fdaa40ad89ae3795238e3850e0aceb1f55eae;hpb=fc7cd737b71d596132d81074685f0eb1d9b64dcd;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/AliCaloRawAnalyzerPeakFinder.h b/EMCAL/AliCaloRawAnalyzerPeakFinder.h
index 616fdaa40ad..a46a9964958 100644
--- a/EMCAL/AliCaloRawAnalyzerPeakFinder.h
+++ b/EMCAL/AliCaloRawAnalyzerPeakFinder.h
@@ -1,7 +1,6 @@
+// -*- mode: c++ -*-
 #ifndef ALICALORAWANALYZERPEAKFINDER_H
 #define ALICALORAWANALYZERPEAKFINDER_H
-
-
 /**************************************************************************
  * This file is property of and copyright by                              *
  * the Relativistic Heavy Ion Group (RHIG), Yale University, US, 2009     *
@@ -26,42 +25,36 @@
 // best possible weights.
 
 #include "AliCaloRawAnalyzer.h"
-#include "AliCaloPeakFinderConstants.h"
-
-using namespace PeakFinderConstants;
+#include "AliCaloConstants.h"
 
 class AliCaloBunchInfo;
 class AliCaloPeakFinderVectors;
 
-
 class  AliCaloRawAnalyzerPeakFinder : public AliCaloRawAnalyzer
 {
+  friend class AliCaloRawAnalyzerFactory; // shutting up the rule checker
  public:
-  AliCaloRawAnalyzerPeakFinder();
   virtual ~AliCaloRawAnalyzerPeakFinder();
   virtual AliCaloFitResults Evaluate( const std::vector<AliCaloBunchInfo> &bunchvector, 
 				      const UInt_t altrocfg1,  const UInt_t altrocfg2 );
 
  private:
+  AliCaloRawAnalyzerPeakFinder();
   AliCaloRawAnalyzerPeakFinder( const AliCaloRawAnalyzerPeakFinder   & );
   AliCaloRawAnalyzerPeakFinder   & operator = ( const  AliCaloRawAnalyzerPeakFinder  & );
-  void     LoadVectorsASCII();
   void     LoadVectorsOCDB();
   void     CopyVectors(const AliCaloPeakFinderVectors *const pfvectors );
   void     ResetVectors();
-  void     InitOCDB(bool alien) const;
   void     WriteRootFile() const;
+  void PrintVectors();
   Double_t ScanCoarse(const Double_t *const array, const int length ) const ; // Find a rough estimate of peak position and t0
-
-  Double_t fPFAmpVectorsCoarse[MAXSTART][SAMPLERANGE][100];  // Vectors for Amplitude extraction, first iteration
-  Double_t fPFTofVectorsCoarse[MAXSTART][SAMPLERANGE][100];  // Vectors for TOF extraction, first iteration
-  Double_t fPFAmpVectors[MAXSTART][SAMPLERANGE][100];        // Vectors for Amplitude extraction, second iteration
-  Double_t fPFTofVectors[MAXSTART][SAMPLERANGE][100];        // Vectors for TOF extraction, second iteration
-  Double_t fAmp; // The amplitude in entities of ADC counts
+  Double_t fPFAmpVectorsCoarse[PF::MAXSTART][PF::SAMPLERANGE][100];  // Vectors for Amplitude extraction, first iteration
+  Double_t fPFTofVectorsCoarse[PF::MAXSTART][PF::SAMPLERANGE][100];  // Vectors for TOF extraction, first iteration
+  Double_t fPFAmpVectors[PF::MAXSTART][PF::SAMPLERANGE][100];        // Vectors for Amplitude extraction, second iteration
+  Double_t fPFTofVectors[PF::MAXSTART][PF::SAMPLERANGE][100];        // Vectors for TOF extraction, second iteration
   AliCaloPeakFinderVectors  *fPeakFinderVectors; // Collection of Peak-Fincer vectors
-  
   bool fRunOnAlien; // Wether or not we are running on the GRID
-
+  bool fIsInitialized; // init flag
   ClassDef( AliCaloRawAnalyzerPeakFinder, 1 )
 };