Index: trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.cc	(revision 2767)
+++ trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.cc	(revision 2768)
@@ -39,10 +39,18 @@
 
 using namespace std;
-
+static const Float_t gkSignalInitializer = 99999.9;
+//
+// MExtractedSignalPix holds the extracted signal (HiGain and LoGain) 
+// of the FADC slices and its error. 
+//
+// Additionally, the number of saturated HiGain and LoGain Slices are stored. 
+// 
+// Default values for the extracted signals are: 99999.9 
+//
 MExtractedSignalPix::MExtractedSignalPix(const char* name, const char* title)
-  : fExtractedSignalHiGain(-1.),
-    fExtractedSignalHiGainError(-1.),
-    fExtractedSignalLoGain(-1.),
-    fExtractedSignalLoGainError(-1.),
+  : fExtractedSignalHiGain(gkSignalInitializer),
+    fExtractedSignalHiGainError(gkSignalInitializer),
+    fExtractedSignalLoGain(gkSignalInitializer),
+    fExtractedSignalLoGainError(gkSignalInitializer),
     fIsLoGainUsed(kFALSE),
     fNumHiGainSaturated(0),
@@ -64,8 +72,9 @@
 {
 
-  fExtractedSignalHiGain = 0.;
-  //  fExtractedSignalHiGain = -1.;
-  fExtractedSignalHiGainError = -1.;
-
+  fExtractedSignalHiGain = gkSignalInitializer;
+  fExtractedSignalHiGainError = gkSignalInitializer;
+  fExtractedSignalLoGain = gkSignalInitializer;
+  fExtractedSignalLoGainError = gkSignalInitializer;
+  
   fIsLoGainUsed = kFALSE;
   fNumHiGainSaturated = 0;
Index: trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h	(revision 2767)
+++ trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h	(revision 2768)
@@ -9,19 +9,18 @@
 {
 private:
-    // FIXME: We can only store ONE signal. Everything else takes
-    //        too much storage space - will change in the future.
-    Float_t fExtractedSignalHiGain;      // mean value of the extracted signal
-    Float_t fExtractedSignalHiGainError; // error of the mean value of the extracted signal
-    Float_t fExtractedSignalLoGain;      // mean value of the extracted signal
-    Float_t fExtractedSignalLoGainError; // error of the mean value of the extracted signal
 
-    Bool_t fIsLoGainUsed;
-    Byte_t fNumHiGainSaturated;
-    Byte_t fNumLoGainSaturated;
+  Float_t fExtractedSignalHiGain;      // mean value of the extracted signal
+  Float_t fExtractedSignalHiGainError; // error of the mean value of the extracted signal
+  Float_t fExtractedSignalLoGain;      // mean value of the extracted signal
+  Float_t fExtractedSignalLoGainError; // error of the mean value of the extracted signal
+
+  Bool_t fIsLoGainUsed;
+  Byte_t fNumHiGainSaturated;
+  Byte_t fNumLoGainSaturated;
 
     // FIXME: Will be removed. Must be stored in MArrivalTime
-    Float_t fMeanArrivalTime;
-    Float_t fWidthArrivalTime;
-    Float_t fTailArrivalTime;
+  Float_t fMeanArrivalTime;
+  Float_t fWidthArrivalTime;
+  Float_t fTailArrivalTime;
 
 public: