Index: trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- trunk/MagicSoft/Mars/macros/calibration.C	(revision 2633)
+++ trunk/MagicSoft/Mars/macros/calibration.C	(revision 2634)
@@ -220,20 +220,4 @@
     disp16.SetYTitle("Sigma per Charge [1]");
 
-    disp1.SetPrettyPalette();
-    disp3.SetPrettyPalette();
-    disp5.SetPrettyPalette();
-    disp6.SetPrettyPalette();
-    disp7.SetPrettyPalette();
-    disp8.SetPrettyPalette();
-    disp9.SetPrettyPalette();
-    disp10.SetPrettyPalette();
-    disp11.SetPrettyPalette();
-    disp12.SetPrettyPalette();
-    disp13.SetPrettyPalette();
-    disp14.SetPrettyPalette();
-    disp15.SetPrettyPalette();
-    disp16.SetPrettyPalette();
-
-
 
     MStatusDisplay *d2 = new MStatusDisplay;
@@ -251,4 +235,5 @@
     obj=disp1.DrawCopy("hist");
     ((MHCamera*)obj)->AddNotify(*cam);
+    ((MHCamera*)obj)->SetPrettyPalette();
 
     c1->cd(3);
@@ -260,4 +245,5 @@
     obj=disp3.DrawCopy("hist");
     ((MHCamera*)obj)->AddNotify(*cam);
+    ((MHCamera*)obj)->SetPrettyPalette();
 
     c1->cd(4);
@@ -273,4 +259,5 @@
     obj=disp5.DrawCopy("hist");
     ((MHCamera*)obj)->AddNotify(*cam);
+    ((MHCamera*)obj)->SetPrettyPalette();
 
     c12->cd(2);
@@ -285,4 +272,5 @@
     obj=disp6.DrawCopy("hist");
     ((MHCamera*)obj)->AddNotify(*cam);
+    ((MHCamera*)obj)->SetPrettyPalette();
 
     c2->cd(4);
@@ -293,4 +281,5 @@
     obj=disp7.DrawCopy("hist");
     ((MHCamera*)obj)->AddNotify(*cam);
+    ((MHCamera*)obj)->SetPrettyPalette();
 
     c2->cd(5);
@@ -301,4 +290,5 @@
     obj=disp8.DrawCopy("hist");
     ((MHCamera*)obj)->AddNotify(*cam);
+    ((MHCamera*)obj)->SetPrettyPalette();
 
     c2->cd(6);
@@ -312,4 +302,5 @@
     obj=disp9.DrawCopy("hist");
     ((MHCamera*)obj)->AddNotify(*cam);
+    ((MHCamera*)obj)->SetPrettyPalette();
 
     c3->cd(3);
@@ -320,4 +311,5 @@
     obj=disp10.DrawCopy("hist");
     ((MHCamera*)obj)->AddNotify(*cam);
+    ((MHCamera*)obj)->SetPrettyPalette();
 
     c3->cd(4);
@@ -331,4 +323,5 @@
     obj=disp11.DrawCopy("hist");
     ((MHCamera*)obj)->AddNotify(*cam);
+    ((MHCamera*)obj)->SetPrettyPalette();
 
     c4->cd(3);
@@ -339,4 +332,5 @@
     obj=disp16.DrawCopy("hist");
     ((MHCamera*)obj)->AddNotify(*cam);
+    ((MHCamera*)obj)->SetPrettyPalette();
 
     c4->cd(4);
@@ -350,4 +344,5 @@
     obj=disp12.DrawCopy("hist");
     ((MHCamera*)obj)->AddNotify(*cam);
+    ((MHCamera*)obj)->SetPrettyPalette();
 
     c5->cd(3);
@@ -358,4 +353,5 @@
     obj=disp13.DrawCopy("hist");
     ((MHCamera*)obj)->AddNotify(*cam);
+    ((MHCamera*)obj)->SetPrettyPalette();
 
     c5->cd(4);
@@ -369,4 +365,5 @@
     obj=disp14.DrawCopy("hist");
     ((MHCamera*)obj)->AddNotify(*cam);
+    ((MHCamera*)obj)->SetPrettyPalette();
 
     c6->cd(3);
@@ -377,4 +374,5 @@
     obj=disp15.DrawCopy("hist");
     ((MHCamera*)obj)->AddNotify(*cam);
+    ((MHCamera*)obj)->SetPrettyPalette();
 
     c6->cd(4);
Index: trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc	(revision 2633)
+++ trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc	(revision 2634)
@@ -304,5 +304,6 @@
 
 	MExtractedSignalPix &sig =  (*fSignals)[pixid];
-	Float_t sum = sig.GetExtractedSignal();
+
+	Float_t sum    = sig.GetExtractedSignal();
 	Bool_t  logain = sig.IsLoGainUsed();
 
Index: trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc	(revision 2633)
+++ trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc	(revision 2634)
@@ -102,6 +102,6 @@
 
   if (fPed && fPedRms)
-    fHist->SetLowerFitRange(3.5*fPedRms);
-  //    fHist->SetLowerFitRange(fPed + 3.5*fPedRms);
+    fHist->SetLowerFitRange(1.5*fPedRms);
+
   else
     *fLog << warn << "Cannot set lower fit range to suppress cosmics: Pedestals not available" << endl;
@@ -116,5 +116,5 @@
 	  *fLog << warn << "Could not fit Lo Gain charges of pixel " << fPixId << endl;
 	  fHist->PrintChargeFitResult();
-	  return kFALSE;
+	  //	  return kFALSE;
 	}
     }
@@ -125,5 +125,5 @@
 	  *fLog << warn << "Could not fit Hi Gain charges of pixel " << fPixId << endl;
 	  fHist->PrintChargeFitResult();
-	  return kFALSE;
+	  //	  return kFALSE;
 	}
     }
Index: trunk/MagicSoft/Mars/manalysis/MExtractSignal.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MExtractSignal.h	(revision 2633)
+++ trunk/MagicSoft/Mars/manalysis/MExtractSignal.h	(revision 2634)
@@ -41,7 +41,7 @@
 
   Bool_t ReInit(MParList *pList); 
-  Int_t PreProcess(MParList *pList);
-  Int_t Process();
-  Int_t PostProcess();
+  Int_t  PreProcess(MParList *pList);
+  Int_t  Process();
+  Int_t  PostProcess();
   
 public:
Index: trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h	(revision 2633)
+++ trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h	(revision 2634)
@@ -16,4 +16,7 @@
     Byte_t fNumLoGainSaturated;
 
+    Float_t fMeanArrivalTime;
+    Float_t fWidthArrivalTime;
+
 public:
 
@@ -25,9 +28,22 @@
     Float_t GetExtractedSignalError() const   { return fExtractedSignalError; }
 
-    void SetExtractedSignal(Float_t sig, Float_t sigerr)   { fExtractedSignal = sig; fExtractedSignalError = sigerr; }
+    Float_t GetMeanArrivalTime()      const   { return fMeanArrivalTime; }
+    Float_t GetWidthArrivalTime()     const   { return fWidthArrivalTime; }
+
+    void SetExtractedSignal(Float_t sig, Float_t sigerr)   
+                                        { 
+					  fExtractedSignal = sig; 
+					  fExtractedSignalError = sigerr; 
+					}
+
     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) 
+                                     { fMeanArrivalTime = mean;
+                                       fWidthArrivalTime  = width;
+				     }
 
     Bool_t IsLoGainUsed()               { return fIsLoGainUsed; }