X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=HLT%2FTPCLib%2FHWCFemulator%2FAliHLTTPCHWCFEmulator.h;h=6dfe4c0d5788ff137ff0a636e4d68f432a734f57;hp=2004d348647fdff46fc89ef07e807de48f23f587;hb=97aca2689138ac2b569255155dc226bd97494656;hpb=b7ea7fe975569a871717e3397bca72a38a6f99eb

diff --git a/HLT/TPCLib/HWCFemulator/AliHLTTPCHWCFEmulator.h b/HLT/TPCLib/HWCFemulator/AliHLTTPCHWCFEmulator.h
index 2004d348647..6dfe4c0d578 100644
--- a/HLT/TPCLib/HWCFemulator/AliHLTTPCHWCFEmulator.h
+++ b/HLT/TPCLib/HWCFemulator/AliHLTTPCHWCFEmulator.h
@@ -1,3 +1,5 @@
+//-*- Mode: C++ -*-
+// $Id$
 #ifndef ALIHLTTPCHWCFEMULATOR_H
 #define ALIHLTTPCHWCFEMULATOR_H
 
@@ -6,6 +8,7 @@
 //* See cxx source for full Copyright notice                               *
 
 #include "AliHLTTPCHWCFExtractorUnit.h"
+#include "AliHLTTPCHWCFPeakFinderUnit.h"
 #include "AliHLTTPCHWCFProcessorUnit.h"
 #include "AliHLTTPCHWCFMergerUnit.h"
 #include "AliHLTTPCHWCFDivisionUnit.h"
@@ -34,7 +37,7 @@ class AliHLTTPCHWCFEmulator
 
   /** initialisation 
    */
-  void Init( const AliHLTUInt32_t *mapping, AliHLTUInt32_t configWord );
+  void Init( const AliHLTUInt32_t *mapping, AliHLTUInt32_t configWord1, AliHLTUInt32_t configWord2 );
   
   /** Loops over all rows finding the clusters 
    */
@@ -59,15 +62,17 @@ class AliHLTTPCHWCFEmulator
 
   /** create configuration word 
    **/
-  static AliHLTUInt32_t CreateConfiguration
+  static void CreateConfiguration
     ( bool doDeconvTime, bool doDeconvPad, bool doFlowControl,  
       bool doSinglePadSuppression, bool bypassMerger, 
-      AliHLTUInt32_t clusterLowerLimit,AliHLTUInt32_t singleSeqLimit );
+      AliHLTUInt32_t clusterLowerLimit,AliHLTUInt32_t singleSeqLimit, 
+      AliHLTUInt32_t mergerDistance, bool useTimeBinWindow, AliHLTUInt32_t chargeFluctuation,
+      AliHLTUInt32_t &configWord1, AliHLTUInt32_t &configWord2  );
  
   /** create default configuration word 
    **/
-  static AliHLTUInt32_t CreateDefaultConfiguration(){
-    return CreateConfiguration(0,0,0,1,0,0,0);
+  static void CreateDefaultConfiguration( AliHLTUInt32_t &configWord1, AliHLTUInt32_t &configWord2 ){
+    CreateConfiguration(0,0,0,1,0,0,0, 3, 1, 0, configWord1, configWord2 );
   }
   
  private: 
@@ -80,6 +85,7 @@ class AliHLTTPCHWCFEmulator
   int  fDebug; // debug level
   const AliHLTUInt32_t *fkMapping; //! mapping array
   AliHLTTPCHWCFExtractorUnit fChannelExtractor; //! transient
+  AliHLTTPCHWCFPeakFinderUnit fPeakFinderUnit; //! transient
   AliHLTTPCHWCFProcessorUnit fChannelProcessor; //! transient
   AliHLTTPCHWCFMergerUnit    fChannelMerger; //! transient
   AliHLTTPCHWCFDivisionUnit  fDivisionUnit;   //! transient