Index: trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 4260)
+++ trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 4261)
@@ -144,5 +144,7 @@
 // pixel in the MArrivalTimeCam container.
 // Calculate the integral of the FADC time slices and store them as a new
-// pixel in the MExtractedSignalCam container.
+// pixel in the MExtractedSignalCam container. 
+// The functions FindTimeAndChargeHiGain() and FindTimeAndChargeLoGain are 
+// supposed to extract the signal themselves.
 //
 Int_t MExtractTimeAndCharge::Process()
@@ -182,10 +184,5 @@
       MArrivalTimePix     &tix = (*fArrTime)[pixid];      
 
-      const Float_t pedes  = ped.GetPedestal();
-      const Float_t pedrms = ped.GetPedestalRms();
-      
-      pix.SetExtractedSignal(sumhi - pedes*fNumHiGainSamples, pedrms*fSqrtHiGainSamples,
-                             sumlo - pedes*fNumLoGainSamples, pedrms*fSqrtLoGainSamples);
-      
+      pix.SetExtractedSignal(sumhi, deltasumhi,sumlo, deltasumlo);
       pix.SetGainSaturation(sathi, sathi, satlo);