X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALRawUtils.h;h=6d4c12e47bdcf97d0eae1be9d91d960d5de69cef;hb=e658398a50b3844e1cca15b5eb43fdf2da17f2fe;hp=36964b49fc95f05db266ea96be998a0dcddd938f;hpb=e5bbbc4e90ac2a11ed6b88ef4e46529c107016e1;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/AliEMCALRawUtils.h b/EMCAL/AliEMCALRawUtils.h
index 36964b49fc9..6d4c12e47bd 100644
--- a/EMCAL/AliEMCALRawUtils.h
+++ b/EMCAL/AliEMCALRawUtils.h
@@ -19,8 +19,8 @@
 //
 #include "TObject.h" // for ROOT types
 #include <TString.h>
-//#include "AliCaloRawStream.h"
-class AliCaloRawStream;
+//#include "AliCaloRawStreamV3.h"
+class AliCaloRawStreamV3;
 class AliAltroMapping;
 class TGraph;
 class TF1;
@@ -47,15 +47,21 @@ class AliEMCALRawUtils : public TObject {
   Double_t GetRawFormatTau()               const { return fTau ; }    
   Int_t GetNoiseThreshold()                const { return fNoiseThreshold; }
   Int_t GetNPedSamples()                   const { return fNPedSamples; }
+  // get methods for fast fit simulation
+  Double_t GetPedestalValue()  const {return fgPedestalValue;}
+  Double_t GetFEENoise()       const {return fgFEENoise;}
 
   void SetRawFormatHighLowGainFactor(Double_t val) {fHighLowGainFactor=val;}
   void SetRawFormatOrder(Int_t val)                {fOrder=val; }   
   void SetRawFormatTau(Double_t val)               {fTau=val; }    
   void SetNoiseThreshold(Int_t val)                {fNoiseThreshold=val; }
   void SetNPedSamples(Int_t val)                   {fNPedSamples=val; }
-  
-  static Int_t GetRawFormatTimeBins() { return fgkTimeBins ; }    
-  static Double_t GetRawFormatTimeMax() { return fgkTimeBins*fgTimeBinWidth; }   
+  // set methods for fast fit simulation
+  void SetFEENoise(Double_t val)                   {fgFEENoise = val;}
+  void SetRawFormatTimeBins(Int_t val)             {fgTimeBins = val;}
+
+  static Int_t GetRawFormatTimeBins() { return fgTimeBins ; }    
+  static Double_t GetRawFormatTimeMax() { return fgTimeBins*fgTimeBinWidth; }   
   static Double_t GetRawFormatTimeBinWidth() { return fgTimeBinWidth; }   
   static Double_t GetRawFormatTimeBin() 
   { return GetRawFormatTimeMax() / GetRawFormatTimeBins(); }   
@@ -80,8 +86,8 @@ class AliEMCALRawUtils : public TObject {
   Int_t fNPedSamples;                   // number of samples to use in pedestal calculation
 
   static const Int_t fgkOverflowCut = 950;  // cut to discriminate overflowed channels
-  static const Int_t fgkTimeBins = 256 ; // number of sampling bins of the raw RO signal  
   static const Int_t fgkRawSignalOverflow = 0x3FF; // maximum signal (10 bits)
+  static Int_t fgTimeBins; // number of sampling bins of the raw RO signal  
 
   static Double_t fgTimeTrigger ;       // time of the trigger for the RO signal 
   static Double_t fgTimeBinWidth;       // maximum sampled time of the raw RO signal