Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc	(revision 3354)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc	(revision 3355)
@@ -140,4 +140,7 @@
     SetNumHiGainSaturationLimit();
     SetNumLoGainSaturationLimit();
+
+    fNumInnerPixels = 0;
+    fNumOuterPixels = 0; 
 }
 
@@ -367,6 +370,4 @@
   Int_t   sumhioutersat = 0;
   Int_t   sumlooutersat = 0;
-  Int_t   numinner = 0;
-  Int_t   numouter = 0;
 
   for (int i=0; i<n; i++)
@@ -393,5 +394,5 @@
 	  sumhiinnersat += sathi;
 	  sumloinnersat += satlo;
-	  numinner++;
+	  fNumInnerPixels++;
       }
       else
@@ -401,18 +402,18 @@
 	  sumhioutersat += sathi;
 	  sumlooutersat += satlo;
-	  numouter++;
+	  fNumOuterPixels++;
       }
 
     }
 
-  fAverageHiGainInnerPix->FillHistAndArray(sumhiinnertot/numinner); 
-  fAverageLoGainInnerPix->FillHistAndArray(sumloinnertot/numinner); 
-  fAverageHiGainOuterPix->FillHistAndArray(sumhioutertot/numouter); 
-  fAverageLoGainOuterPix->FillHistAndArray(sumlooutertot/numouter); 
-
-  fAverageHiGainInnerPix->SetSaturated(sumhiinnersat/numinner); 
-  fAverageLoGainInnerPix->SetSaturated(sumloinnersat/numinner); 
-  fAverageHiGainOuterPix->SetSaturated(sumhioutersat/numouter); 
-  fAverageLoGainOuterPix->SetSaturated(sumlooutersat/numouter); 
+  fAverageHiGainInnerPix->FillHistAndArray(sumhiinnertot/fNumInnerPixels); 
+  fAverageLoGainInnerPix->FillHistAndArray(sumloinnertot/fNumInnerPixels); 
+  fAverageHiGainOuterPix->FillHistAndArray(sumhioutertot/fNumOuterPixels); 
+  fAverageLoGainOuterPix->FillHistAndArray(sumlooutertot/fNumOuterPixels); 
+
+  fAverageHiGainInnerPix->SetSaturated(sumhiinnersat/fNumInnerPixels); 
+  fAverageLoGainInnerPix->SetSaturated(sumloinnersat/fNumInnerPixels); 
+  fAverageHiGainOuterPix->SetSaturated(sumhioutersat/fNumOuterPixels); 
+  fAverageLoGainOuterPix->SetSaturated(sumlooutersat/fNumOuterPixels); 
 
   //
@@ -420,5 +421,5 @@
   //
   sumhiinnertot = sumloinnertot = sumhioutertot = sumlooutertot = 0.;
-  numinner = numouter = 0;
+  fNumInnerPixels = fNumOuterPixels = 0;
   MRawEvtPixelIter pixel(fRawEvt);
   while (pixel.Next())
@@ -445,8 +446,8 @@
     }
 
-  fAverageHiGainInnerPix-> FillAbsTime(sumhiinnertot/numinner); 
-  fAverageLoGainInnerPix-> FillAbsTime(sumloinnertot/numinner); 
-  fAverageHiGainOuterPix-> FillAbsTime(sumhioutertot/numouter); 
-  fAverageLoGainOuterPix-> FillAbsTime(sumlooutertot/numouter); 
+  fAverageHiGainInnerPix-> FillAbsTime(sumhiinnertot/fNumInnerPixels); 
+  fAverageLoGainInnerPix-> FillAbsTime(sumloinnertot/fNumInnerPixels); 
+  fAverageHiGainOuterPix-> FillAbsTime(sumhioutertot/fNumOuterPixels); 
+  fAverageLoGainOuterPix-> FillAbsTime(sumlooutertot/fNumOuterPixels); 
 
   return kTRUE;
@@ -488,4 +489,9 @@
     FinalizeHiGainHists(*fAverageHiGainOuterPix,*fCam->GetAverageOuterPix());
     FinalizeLoGainHists(*fAverageLoGainOuterPix,*fCam->GetAverageOuterPix());
+
+    fCam->GetAverageInnerPix()->SetSigmaCharge   (fCam->GetAverageInnerPix()->GetSigmaCharge()   *TMath::Sqrt((Float_t)fNumInnerPixels));
+    fCam->GetAverageOuterPix()->SetSigmaCharge   (fCam->GetAverageOuterPix()->GetSigmaCharge()   *TMath::Sqrt((Float_t)fNumOuterPixels));
+    fCam->GetAverageInnerPix()->SetSigmaChargeErr(fCam->GetAverageInnerPix()->GetSigmaChargeErr()*TMath::Sqrt((Float_t)fNumInnerPixels));
+    fCam->GetAverageOuterPix()->SetSigmaChargeErr(fCam->GetAverageOuterPix()->GetSigmaChargeErr()*TMath::Sqrt((Float_t)fNumOuterPixels));
 
     return kTRUE;
Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.cc	(revision 3354)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.cc	(revision 3355)
@@ -88,5 +88,8 @@
   Int_t win = 1;
 
-  TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas(this,600, 600);
+  TVirtualPad *oldpad = gPad ? gPad : MH::MakeDefCanvas(this,600, 600);
+  TVirtualPad *pad    = NULL;
+
+  oldpad->SetBorderMode(0);  
 
   pad->SetTicks();
Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.h	(revision 3354)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.h	(revision 3355)
@@ -34,7 +34,4 @@
   void SetAbsTimeLast (const Axis_t last =fgAbsTimeLast)         { fAbsTimeLast  = last;    }
 
-  // Draw
-  void Draw(Option_t *opt="");
-
   ClassDef(MHCalibrationChargeHiGainPix, 1)  // Histogram class for a Calibration Pixel with extracted Hi Gain 
 };