Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc	(revision 3357)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc	(revision 3358)
@@ -431,5 +431,5 @@
 
       (*this)[pixid].FillAbsTime(timehi);
-      (*this)(pixid).FillAbsTime(timelo);
+      (*this)(pixid).FillAbsTime(timelo+15.);
 
       if (fGeom->GetPixRatio(pixel.GetPixelId()) == 1.)
Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h	(revision 3357)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h	(revision 3358)
@@ -39,4 +39,7 @@
   MRawEvtData            *fRawEvt;                   //!  Raw event data (time slices)
   MGeomCam               *fGeom;                     //!  MAGIC geometry
+
+  Int_t fNumInnerPixels;
+  Int_t fNumOuterPixels;
 
   void FinalizeHiGainHists(MHCalibrationChargeHiGainPix &hist, MCalibrationChargePix &pix);
Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.cc	(revision 3357)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.cc	(revision 3358)
@@ -53,6 +53,6 @@
 const Axis_t  MHCalibrationChargeLoGainPix::fgChargeLast      = 199.5;
 const Int_t   MHCalibrationChargeLoGainPix::fgAbsTimeNbins    = 15;
-const Axis_t  MHCalibrationChargeLoGainPix::fgAbsTimeFirst    = -0.5;
-const Axis_t  MHCalibrationChargeLoGainPix::fgAbsTimeLast     = 14.5;
+const Axis_t  MHCalibrationChargeLoGainPix::fgAbsTimeFirst    = 14.5;
+const Axis_t  MHCalibrationChargeLoGainPix::fgAbsTimeLast     = 29.5;
 // --------------------------------------------------------------------------
 //
Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.cc	(revision 3357)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.cc	(revision 3358)
@@ -58,5 +58,5 @@
 
 const Int_t   MHCalibrationChargePix::fgPickupLimit     = 5;
-const Int_t   MHCalibrationChargePix::fgPulserFrequency = 200;
+const Int_t   MHCalibrationChargePix::fgPulserFrequency = 500;
 // --------------------------------------------------------------------------
 //
@@ -173,29 +173,47 @@
   Int_t win = 1;
   
-  TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas(this,600, 600);
-
-  pad->SetBorderMode(0);
-    
-  if (option.Contains("time"))
+  TVirtualPad *oldpad = gPad ? gPad : MH::MakeDefCanvas(this,600, 600);
+  TVirtualPad *pad    = NULL;
+
+  if (option.Contains("all"))
   {
-      option.ReplaceAll("events","");
-      win++;
+      option.ReplaceAll("all","");
+      oldpad->Divide(2,1);
+      win = 2;
+      oldpad->cd(1);
+      TVirtualPad *newpad = gPad;
+      pad = newpad;
+      pad->Divide(1,2);
+      pad->cd(1);
   }
-
-  pad->Divide(1,win);
-  pad->cd(1);
+  else
+  {
+      pad = oldpad;
+      pad->Divide(1,2);
+      pad->cd(1);
+  }
 
   if (!IsEmpty())
-    gPad->SetLogy();
+      gPad->SetLogy();
 
   gPad->SetTicks();
-  MHGausEvents::Draw(opt);
-
-  if (win > 1)
-    {
-      pad->cd(2);
-      gPad->SetTicks();
-      fHAbsTime.Draw(opt);
-    }
+
+  fHGausHist.Draw(opt); 
+  if (fFGausFit)
+  {
+      fFGausFit->SetLineColor(IsGausFitOK() ? kGreen : kRed);
+      fFGausFit->Draw("same");
+  }
+
+  pad->cd(2);
+  gPad->SetTicks();
+  fHAbsTime.Draw(opt);
+
+  if (win < 2)
+      return;
+
+  oldpad->cd(2);
+  MHGausEvents::Draw("fourierevents");
+
 }