Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 4664)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 4665)
@@ -96,4 +96,5 @@
 #include <TLegend.h>
 #include <TPaveText.h>
+#include <TPaveStats.h>
 
 #include "MLog.h"
@@ -262,11 +263,11 @@
 
     // Create histograms to display
-    MHCamera disp1 (geomcam, "Charge",            "Fitted Mean Charges");
-    MHCamera disp2 (geomcam, "SigmaCharge",       "Sigma of Fitted Charges");
+    MHCamera disp1 (geomcam, "Charge",            "Fitted Mean Signal (Charges)");
+    MHCamera disp2 (geomcam, "SigmaCharge",       "Sigma of Fitted Signal");
     MHCamera disp3 (geomcam, "RSigma",            "Reduced Sigmas");
     MHCamera disp4 (geomcam, "RSigmaPerCharge",   "Reduced Sigma per Charge");
-    MHCamera disp5 (geomcam, "NumPhes",           "Number of Phes");
+    MHCamera disp5 (geomcam, "NumPhes",           "Number Photo-electrons");
     MHCamera disp6 (geomcam, "ConvFADC2Phes",     "Conversion Factor to Phes");
-    MHCamera disp7 (geomcam, "TotalFFactor",      "Total F-Factor (F-Factor Method)");
+    MHCamera disp7 (geomcam, "TotalFFactor",      "Total F-Factor(F-Factor Method)");
     MHCamera disp8 (geomcam, "CascadesQEFFactor", "Cascades QE (F-Factor Method)");
     MHCamera disp9 (geomcam, "CascadesQEBlindPix","Cascades QE (Blind Pixel Method)");
@@ -367,5 +368,5 @@
     disp4.SetYTitle("Red.Sigma/<Q> [1]");
 
-    disp5.SetYTitle("Phes [1]");
+    disp5.SetYTitle("Photo-electons [1]");
     disp6.SetYTitle("Conv.Factor [PhE/FADC counts]");
     disp7.SetYTitle("Total F-Factor [1]");
@@ -479,4 +480,13 @@
       TF1 *fun2 = obj2->GetFunction("gaus");
       fun2->SetLineColor(kYellow);
+      gPad->Modified();
+      gPad->Update();      
+      TPaveStats *st = (TPaveStats*)obj2->GetListOfFunctions()->FindObject("stats");
+      st->SetY1NDC(0.62);
+      st->SetY2NDC(0.89);
+      st->SetX1NDC(0.65);
+      st->SetX2NDC(0.99);
+      gPad->Modified();
+      gPad->Update();      
       //
       // Set the datacheck sizes:
@@ -488,10 +498,10 @@
       // Display the outliers as dead and noisy pixels
       //
-      DisplayOutliers(obj2,"dead","noisy");
+      DisplayOutliers(obj2,"low-ampl.","high-ampl.");
       TLatex flattex;
       flattex.SetTextSize(0.06);
       const Double_t minl = obj2->GetBinCenter(obj2->GetXaxis()->GetFirst());
       const Double_t maxl = obj2->GetBinCenter(obj2->GetXaxis()->GetLast());
-      flattex.DrawLatex(minl+0.1*(maxl-minl),obj2->GetBinContent(obj2->GetMaximumBin())/1.3,
+      flattex.DrawLatex(minl+0.03*(maxl-minl),obj2->GetBinContent(obj2->GetMaximumBin())/1.3,
                         Form("Flatfielding precision: %4.2f%%",
                              fun2->GetParameter(2)/fun2->GetParameter(1)*100.));
@@ -1060,10 +1070,10 @@
   TLatex deadtex;
   deadtex.SetTextSize(0.06);
-  deadtex.DrawLatex(minl+0.1*(maxl-minl),max/1.1,
+  deadtex.DrawLatex(minl+0.03*(maxl-minl),max/1.1,
                     Form("%3i %s pixels",(Int_t)dead,whatsmall));
 
   TLatex noisytex;
   noisytex.SetTextSize(0.06);
-  noisytex.DrawLatex(minl+0.1*(maxl-minl),max/1.2,
+  noisytex.DrawLatex(minl+0.03*(maxl-minl),max/1.2,
                      Form("%3i %s pixels",(Int_t)noisy,whatbig));
 
@@ -1927,6 +1937,15 @@
       inout[i]->Draw();
       inout[i]->Fit("gaus", "Q");
-      
-      TLegend *leg2 = new TLegend(0.6,0.5,0.9,0.7);
+      gPad->Modified();
+      gPad->Update();      
+      TPaveStats *st = (TPaveStats*)inout[i]->GetListOfFunctions()->FindObject("stats");
+      st->SetY1NDC(0.62);
+      st->SetY2NDC(0.9);
+      st->SetX1NDC(0.5);
+      st->SetX2NDC(0.99);
+      gPad->Modified();
+      gPad->Update();      
+
+      TLegend *leg2 = new TLegend(0.55,0.4,0.99,0.6);
       //
       // Display the outliers as dead and noisy pixels