Index: trunk/MagicSoft/Mars/manalysis/MCalibrationCam.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCalibrationCam.h	(revision 2661)
+++ trunk/MagicSoft/Mars/manalysis/MCalibrationCam.h	(revision 2662)
@@ -110,5 +110,5 @@
   Bool_t CalcNrPhotInnerPixel();
   Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;
-  void DrawPixelContent(Int_t num) const;    
+  void   DrawPixelContent(Int_t num) const;    
   
   MCalibrationPix      *GetCalibrationPix(Int_t idx) const;
Index: trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc	(revision 2661)
+++ trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc	(revision 2662)
@@ -127,6 +127,6 @@
     //fNumHiGainSamples =  fRunHeader->GetNumSamplesHiGain();
     //fNumLoGainSamples =  fRunHeader->GetNumSamplesLoGain();
-    fNumHiGainSamples =  fAfter+fBefore;
-    fNumLoGainSamples =  fAfter+fBefore;
+    fNumHiGainSamples =  6;
+    fNumLoGainSamples =  6;
 
     fSqrtHiGainSamples = TMath::Sqrt((float)fNumHiGainSamples); 
@@ -221,7 +221,7 @@
 	  }
 
-	pix.SetExtractedSignal((float)sumHi - pedes*(float)fNumHiGainSamples,
+	pix.SetExtractedSignal((Float_t)sumHi - pedes*(Float_t)fNumHiGainSamples,
 			       pedrms*fSqrtHiGainSamples,
-			       ((float)sumLo - pedes*(float)fNumLoGainSamples)*fConversionHiLo,
+			       ((Float_t)sumLo - pedes*(Float_t)fNumLoGainSamples)*fConversionHiLo,
 			       pedrms*fSqrtLoGainSamples
 			       );