Index: trunk/MagicSoft/Mars/manalysis/MArrivalTime.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MArrivalTime.cc	(revision 2901)
+++ trunk/MagicSoft/Mars/manalysis/MArrivalTime.cc	(revision 2902)
@@ -62,4 +62,28 @@
 }
 
+void MArrivalTime::InitSize(Int_t i)
+{
+  
+  if (fData.GetSize() >= i)
+    return;
+  else
+    fData.Set(i);
+}
+
+// 
+// Set the arrival time in one pixel
+//
+void MArrivalTime::SetTime(Int_t i, Float_t t)
+{
+
+  if (i < fData.GetSize())
+    fData.AddAt(t,i);
+  else
+    {
+      fData.Set(i+1);
+      fData.AddAt(t,i);
+    }
+}
+
 //
 // Calculates the arrival time for each pixel 
Index: trunk/MagicSoft/Mars/manalysis/MArrivalTime.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MArrivalTime.h	(revision 2901)
+++ trunk/MagicSoft/Mars/manalysis/MArrivalTime.h	(revision 2902)
@@ -21,5 +21,6 @@
 class MArrivalTime : public MCamEvent
 {
-private:
+
+ private:
     TArrayF fData;  // Stores the arrival times
  
@@ -32,5 +33,7 @@
     TArrayS fCluster; // Idxs of the pixels in the current cluster
     TArrayS fakeData; //Test purpose
+
 public:
+
     MArrivalTime(const char *name=NULL, const char *title=NULL);
     ~MArrivalTime() { }
@@ -48,4 +51,7 @@
 				       Short_t idx, Short_t *dimCluster);
 
+    void SetTime(Int_t i, Float_t time);
+    void InitSize(Int_t i);
+    
     const TArrayF &GetData() const { return fData; }
 
Index: trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.cc	(revision 2901)
+++ trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.cc	(revision 2902)
@@ -72,7 +72,7 @@
 {
 
-  fExtractedSignalHiGain = gkSignalInitializer;
+  fExtractedSignalHiGain      = gkSignalInitializer;
   fExtractedSignalHiGainError = gkSignalInitializer;
-  fExtractedSignalLoGain = gkSignalInitializer;
+  fExtractedSignalLoGain      = gkSignalInitializer;
   fExtractedSignalLoGainError = gkSignalInitializer;
   
@@ -82,4 +82,46 @@
 
 }
+
+void MExtractedSignalPix::SetExtractedSignal(Float_t sig, Float_t sigerr)   
+{
+  
+  fExtractedSignalHiGain      = sig; 
+  fExtractedSignalHiGainError = sigerr;
+
+  return;
+}
+
+
+void MExtractedSignalPix::SetExtractedSignal(Float_t sighi, Float_t sighierr,
+                                             Float_t siglo, Float_t sigloerr)   
+{
+  fExtractedSignalHiGain = sighi;
+  fExtractedSignalHiGainError = sighierr;
+  fExtractedSignalLoGain = siglo;
+  fExtractedSignalLoGainError = sigloerr;
+  
+  return;
+}
+
+Bool_t MExtractedSignalPix::IsValid() const
+{
+
+ return fExtractedSignalHiGain >= 0. || fExtractedSignalHiGainError >= 0.; 
+  
+}
+
+
+void MExtractedSignalPix::SetGainSaturation(Bool_t sat, Byte_t higain, Byte_t logain) 
+{
+
+  fIsLoGainUsed = sat; 
+  fNumHiGainSaturated = higain; 
+  fNumLoGainSaturated = logain;
+
+  return;
+
+}
+
+
 
 void MExtractedSignalPix::PrintOut()
Index: trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h	(revision 2901)
+++ trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h	(revision 2902)
@@ -19,9 +19,4 @@
   Byte_t fNumLoGainSaturated;
 
-    // FIXME: Will be removed. Must be stored in MArrivalTime
-  Float_t fMeanArrivalTime;
-  Float_t fWidthArrivalTime;
-  Float_t fTailArrivalTime;
-
 public:
 
@@ -31,26 +26,7 @@
 
     // Setter
-    void SetExtractedSignal(Float_t sig, Float_t sigerr)   
-    {
-        fExtractedSignalHiGain = sig; fExtractedSignalHiGainError = sigerr;
-    }
-
-    void SetExtractedSignal(Float_t sighi, Float_t sighierr,Float_t siglo, Float_t sigloerr)   
-    {
-        fExtractedSignalHiGain = sighi;
-        fExtractedSignalHiGainError = sighierr;
-        fExtractedSignalLoGain = siglo;
-        fExtractedSignalLoGainError = sigloerr;
-    }
-
-    void SetGainSaturation(Bool_t sat, Byte_t higain, Byte_t logain) 
-    {
-        fIsLoGainUsed = sat; fNumHiGainSaturated = higain; fNumLoGainSaturated = logain;
-    }
-
-    void SetArrivalTimes(Float_t mean, Float_t width, Float_t tail) 
-    {
-        fMeanArrivalTime = mean; fWidthArrivalTime = width; fTailArrivalTime = tail;
-    }
+    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);
 
     // Getter
@@ -61,12 +37,8 @@
     Float_t GetExtractedSignalLoGainError() const { return fExtractedSignalLoGainError; }
 
-    Float_t GetMeanArrivalTime()            const { return fMeanArrivalTime; }
-    Float_t GetWidthArrivalTime()           const { return fWidthArrivalTime; }
-    Float_t GetTailArrivalTime()            const { return fTailArrivalTime; }
-
     Byte_t GetNumLoGainSaturated()          const { return fNumLoGainSaturated; }
 
     Bool_t IsLoGainUsed() const { return fIsLoGainUsed; }
-    Bool_t IsValid() const      { return fExtractedSignalHiGain >= 0. || fExtractedSignalHiGainError >= 0.; }
+    Bool_t IsValid() const;   
 
     void PrintOut();