Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 2900)
+++ trunk/MagicSoft/Mars/Changelog	(revision 2901)
@@ -5,8 +5,10 @@
                                                  -*-*- END OF LINE -*-*-
 
- 2004/01/23: Abelardo Moralejo
+ 2004/01/23: Markus Gaug
 
    * manalysis/MExtractSignal.[h,cc]
+   * manalysis/MExtractedSignalPix.[h,cc]
      - use MArrivalTime for Storage (or calculation) of time
+  
 
 
Index: trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc	(revision 2900)
+++ trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc	(revision 2901)
@@ -47,4 +47,6 @@
 #include "MExtractedSignalPix.h"
 
+#include "MArrivalTime.h"
+
 ClassImp(MExtractSignal);
 
@@ -117,5 +119,8 @@
         *fLog << err << AddSerialNumber("MPedestalCam") << " not found... aborting" << endl;
         return kFALSE;
+
       }
+
+    fArrivalTime = (MArrivalTime*)pList->FindCreateObj(AddSerialNumber("MArrivalTime"));
     
     return kTRUE;
@@ -142,4 +147,6 @@
     fSignals->InitSize(cam->GetNumPixels());    
 
+    fArrivalTime->InitSize(cam->GetNumPixels());
+
     return kTRUE;
 }
@@ -153,4 +160,5 @@
 Int_t MExtractSignal::Process()
 {
+
     MRawEvtPixelIter pixel(fRawEvt);
     fSignals->Clear();
@@ -222,14 +230,15 @@
 	pix.SetExtractedSignal((Float_t)sumHi - pedes*(Float_t)fNumHiGainSamples,
 			       pedrms*fSqrtHiGainSamples,
-			       ((Float_t)sumLo - pedes*(Float_t)fNumLoGainSamples),
-			       pedrms*fSqrtLoGainSamples);
+                               (Float_t)sumLo - pedes*(Float_t)fNumLoGainSamples,
+                               pedrms*fSqrtLoGainSamples);
 
 	pix.SetGainSaturation(satHi, satHi, satLo);
 
-        // FIXME: Arrival time has to be stored in MArrivalTime!
-	if (satHi)
-	  pix.SetArrivalTimes((Float_t)(midlo+fLoGainFirst),0.,0.);
-	else
-	  pix.SetArrivalTimes((Float_t)(midhi+fHiGainFirst),0.,0.);
+        if (satHi)
+          fArrivalTime->SetTime(pixid,(Float_t)(midlo+fLoGainFirst));
+        else
+          fArrivalTime->SetTime(pixid,(Float_t)(midhi+fHiGainFirst));
+
+
 
       } /* while (pixel.Next()) */
Index: trunk/MagicSoft/Mars/manalysis/MExtractSignal.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MExtractSignal.h	(revision 2900)
+++ trunk/MagicSoft/Mars/manalysis/MExtractSignal.h	(revision 2901)
@@ -20,4 +20,5 @@
 class MPedestalCam;
 class MExtractedSignalCam;
+class MArrivalTime;
 
 class MExtractSignal : public MTask
@@ -34,4 +35,6 @@
     MRawRunHeader            *fRunHeader;    // RunHeader information
 
+    MArrivalTime             *fArrivalTime;  // Arrival Time of FADC sample
+  
     Byte_t fHiGainFirst;
     Byte_t fLoGainFirst;