Index: trunk/MagicSoft/Mars/msignal/MExtractedSignalCam.h
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractedSignalCam.h	(revision 5738)
+++ trunk/MagicSoft/Mars/msignal/MExtractedSignalCam.h	(revision 5739)
@@ -16,15 +16,18 @@
 {
 private:
-    TClonesArray *fArray; //-> FIXME: Change TClonesArray away from a pointer?
 
-    Byte_t fFirstUsedSliceHiGain;
-    Byte_t fFirstUsedSliceLoGain;
+  TClonesArray *fArray;                //-> FIXME: Change TClonesArray away from a pointer?
 
-    Byte_t fLastUsedSliceHiGain;
-    Byte_t fLastUsedSliceLoGain;
+  Byte_t fFirstUsedSliceHiGain;        // First High Gain FADC used for extraction (incl.)
+  Byte_t fFirstUsedSliceLoGain;        // First Low Gain FADC used for extraction (incl.)
+  
+  Byte_t fLastUsedSliceHiGain;         // Last High Gain FADC used for extraction (incl.)
+  Byte_t fLastUsedSliceLoGain;         // Last Low Gain FADC used for extraction (incl.)
+  
+  Float_t fUsedWindowHiGain;           // High Gain FADC extraction window 
+  Float_t fUsedWindowLoGain;           // Low Gain FADC extraction window 
 
-    Float_t fUsedWindowHiGain;
-    Float_t fUsedWindowLoGain;
-    
+  Int_t   fNdf;                        // Number of degrees of freedom for a possible fit
+  
 public:
 
@@ -32,23 +35,27 @@
     ~MExtractedSignalCam();
 
-    void Print(Option_t *o="") const;
-    void Clear(Option_t *o="");
-    void SetLogStream(MLog *lg);
-    void Reset() { Clear(); }
+    void    Print(Option_t *o="") const;
+    void    Clear(Option_t *o="");
+    void    Reset() { Clear(); }
 
-    void InitSize(const UInt_t i);
-    Int_t GetSize() const;
+    void    InitSize(const UInt_t i);
+    Int_t   GetSize () const;
 
-    Float_t GetNumUsedHiGainFADCSlices() const { return fUsedWindowHiGain; }
-    Float_t GetNumUsedLoGainFADCSlices() const { return fUsedWindowLoGain; }
+    Byte_t  GetFirstUsedSliceHiGain()    const { return fFirstUsedSliceHiGain; }
+    Byte_t  GetFirstUsedSliceLoGain()    const { return fFirstUsedSliceLoGain; }
 
-    Byte_t GetFirstUsedSliceHiGain() const    { return fFirstUsedSliceHiGain; }
-    Byte_t GetFirstUsedSliceLoGain() const    { return fFirstUsedSliceLoGain; }
+    Byte_t  GetLastUsedSliceHiGain()     const { return fLastUsedSliceHiGain;  }
+    Byte_t  GetLastUsedSliceLoGain()     const { return fLastUsedSliceLoGain;  }
 
-    Byte_t GetLastUsedSliceHiGain()  const    { return fLastUsedSliceHiGain; }
-    Byte_t GetLastUsedSliceLoGain()  const    { return fLastUsedSliceLoGain; }
+    Float_t GetNumUsedHiGainFADCSlices() const { return fUsedWindowHiGain;     }
+    Float_t GetNumUsedLoGainFADCSlices() const { return fUsedWindowLoGain;     }
 
-    void   SetUsedFADCSlices(Byte_t firsth, Byte_t lasth, Float_t winh,
-                             Byte_t firstl, Byte_t lastl, Float_t winl)
+    Float_t GetNdf()                     const { return fNdf;                  }
+    Float_t GetProb( const Int_t pixidx) const;
+
+    void    SetLogStream     ( MLog *lg  );
+    void    SetNdf           ( Int_t ndf ) { fNdf = ndf;  }
+    void    SetUsedFADCSlices(Byte_t firsth, Byte_t lasth, Float_t winh,
+                              Byte_t firstl, Byte_t lastl, Float_t winl)
     {
       fFirstUsedSliceHiGain    = firsth;
@@ -66,5 +73,5 @@
     void DrawPixelContent(Int_t num) const;
 
-    ClassDef(MExtractedSignalCam, 1)	// Storage Container for extracted signals in the camera
+    ClassDef(MExtractedSignalCam, 2)	// Storage Container for extracted signals in the camera
 };
 
Index: trunk/MagicSoft/Mars/msignal/MExtractedSignalPix.h
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractedSignalPix.h	(revision 5738)
+++ trunk/MagicSoft/Mars/msignal/MExtractedSignalPix.h	(revision 5739)
@@ -9,4 +9,5 @@
 {
 private:
+
   Float_t fExtractedSignalHiGain;      // mean value of the extracted signal
   Float_t fExtractedSignalHiGainError; // error of the mean value of the extracted signal
@@ -14,4 +15,6 @@
   Float_t fExtractedSignalLoGainError; // error of the mean value of the extracted signal
 
+  Float_t fChisquare;                  // Chi-square of a possible fit the pulse
+  
   Bool_t fLoGainUsed;
   Byte_t fNumHiGainSaturated;
@@ -19,28 +22,31 @@
 
 public:
-    MExtractedSignalPix(const char* name=NULL, const char* title=NULL);
+  MExtractedSignalPix(const char* name=NULL, const char* title=NULL);
 
-    void Clear(Option_t *o="");
-    void Print(Option_t *o="") const;
+  void Clear(Option_t *o="");
+  void Print(Option_t *o="") const;
 
-    // Setter
-    void SetExtractedSignal(Float_t sig, Float_t sigerr);
-    void SetExtractedSignal(Float_t sighi, Float_t sighierr,Float_t siglo, Float_t sigloerr);
-    void SetGainSaturation(Bool_t sat, Byte_t higain, Byte_t logain);
+  // Setter
+  void SetExtractedSignal( Float_t sig, Float_t sigerr);
+  void SetExtractedSignal( Float_t sighi, Float_t sighierr,Float_t siglo, Float_t sigloerr);
+  void SetGainSaturation ( Bool_t sat, Byte_t higain, Byte_t logain);
+  void SetChisquare      ( Float_t chi2 )   { fChisquare = chi2; }
+    
+  // Getter
+  Float_t GetExtractedSignalHiGain()      const { return fExtractedSignalHiGain;       }
+  Float_t GetExtractedSignalHiGainError() const { return fExtractedSignalHiGainError;  }
 
-    // Getter
-    Float_t GetExtractedSignalHiGain()      const { return fExtractedSignalHiGain; }
-    Float_t GetExtractedSignalHiGainError() const { return fExtractedSignalHiGainError; }
+  Float_t GetExtractedSignalLoGain()      const { return fExtractedSignalLoGain;       }
+  Float_t GetExtractedSignalLoGainError() const { return fExtractedSignalLoGainError;  }
 
-    Float_t GetExtractedSignalLoGain()      const { return fExtractedSignalLoGain; }
-    Float_t GetExtractedSignalLoGainError() const { return fExtractedSignalLoGainError; }
+  Byte_t GetNumHiGainSaturated()          const { return fNumHiGainSaturated;          }
+  Byte_t GetNumLoGainSaturated()          const { return fNumLoGainSaturated;          }
 
-    Byte_t GetNumHiGainSaturated()          const { return fNumHiGainSaturated; }
-    Byte_t GetNumLoGainSaturated()          const { return fNumLoGainSaturated; }
+  Float_t GetChisquare()                  const { return fChisquare;                   }
+    
+  Bool_t IsLoGainUsed()                   const { return fLoGainUsed;                  }
+  Bool_t IsValid()                        const;   
 
-    Bool_t IsLoGainUsed() const { return fLoGainUsed; }
-    Bool_t IsValid() const;   
-
-    ClassDef(MExtractedSignalPix, 1)	// Storage Container for Extracted Signal information of one pixel
+  ClassDef(MExtractedSignalPix, 2) // Storage Container for Extracted Signal information of one pixel
 };