Index: trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- trunk/MagicSoft/Mars/macros/calibration.C	(revision 2634)
+++ trunk/MagicSoft/Mars/macros/calibration.C	(revision 2642)
@@ -120,6 +120,6 @@
 
     tlist2.AddToList(&read2);
+    tlist2.AddToList(&sigsig);
     tlist2.AddToList(&calcalc);
-    tlist2.AddToList(&sigsig);
 
     MHCamEvent hist2;
@@ -129,4 +129,7 @@
     tlist2.AddToList(&fill2);
 
+    MStatusDisplay *d2 = new MStatusDisplay;
+    d2->SetUpdateTime(3000);
+
     //
     // Create and setup the eventloop
@@ -134,4 +137,5 @@
     MEvtLoop evtloop2;
     evtloop2.SetParList(&plist2);
+    evtloop2.SetDisplay(d2);
 
     //
@@ -174,5 +178,5 @@
     MHCamera disp14  (geomcam, "MCalibrationCam;photons", "Nr. of Photons (Blind Pixel Method)");
     MHCamera disp15  (geomcam, "MCalibrationCam;convphot", "Conversion Factor (Blind Pixel Method)");
-    MHCamera disp16  (geomcam, "MCalibrationCam;sigma/charge", "Sigma per Charge");
+    MHCamera disp16  (geomcam, "MCalibrationCam;sigma/charge", "Sigma^2 per Charge^2");
 
     disp1.SetCamContent(*cam, 0);
@@ -186,10 +190,10 @@
 
     disp6.SetCamContent(*cam, 5);
-    disp6.SetCamError(*cam,6);
+    disp6.SetCamError(*cam, 6);
     disp7.SetCamContent(*cam, 6);
     disp8.SetCamContent(*cam, 7);
 
     disp9.SetCamContent(*cam, 8);
-    disp9.SetCamError(*cam,9);
+    disp9.SetCamError(*cam, 9);
     disp10.SetCamContent(*cam, 9);
 
@@ -211,6 +215,6 @@
     disp7.SetYTitle("\\Delta T [FADC slices]");
     disp8.SetYTitle("P [au]");
-    disp9.SetYTitle("P [FADC counts/ slice ]");
-    disp10.SetYTitle("RMS_{P} [FADC counts / slice ]");
+    disp9.SetYTitle("P [Total FADC counts ]");
+    disp10.SetYTitle("RMS_{P} [Total FADC counts ]");
     disp11.SetYTitle("\\sigma^2_{Q} - RMS^2_{P} [FADC counts^2]");
     disp12.SetYTitle("Nr Phe's");
@@ -218,13 +222,12 @@
     disp14.SetYTitle("Nr Photons");
     disp15.SetYTitle("Conversion Factor [Ph/FADC count]");
-    disp16.SetYTitle("Sigma per Charge [1]");
-
-
-    MStatusDisplay *d2 = new MStatusDisplay;
+    disp16.SetYTitle("Sigma^2 per Charge^2 [1]");
+
+    MStatusDisplay *d3 = new MStatusDisplay;
  
     // Set update time to 1s
-    d2->SetUpdateTime(1000);
-
-    TCanvas *c1 = &d2->AddTab("Fitted Charges"); 
+    d3->SetUpdateTime(1000);
+
+    TCanvas *c1 = &d3->AddTab("Fitted Charges"); 
     c1->Divide(2, 2);
 
@@ -252,5 +255,5 @@
 
 
-    TCanvas *c12 = &d2->AddTab("Fit Prob."); 
+    TCanvas *c12 = &d3->AddTab("Fit Prob."); 
     c12->Divide(1, 2);
 
@@ -265,5 +268,5 @@
     obj->Draw();
 
-    TCanvas *c2 = &d2->AddTab("Fitted Times");
+    TCanvas *c2 = &d3->AddTab("Fitted Times");
     c2->Divide(3, 2);
 
@@ -295,5 +298,5 @@
     obj->Draw();
 
-    TCanvas *c3 = &d2->AddTab("Pedestals");
+    TCanvas *c3 = &d3->AddTab("Pedestals");
     c3->Divide(2, 2);
 
@@ -316,5 +319,5 @@
     obj->Draw();
 
-    TCanvas *c4 = &d2->AddTab("Reduced Charges");
+    TCanvas *c4 = &d3->AddTab("Reduced Charges");
     c4->Divide(2,2);
 
@@ -337,5 +340,5 @@
     obj->Draw();
 
-    TCanvas *c5 = &d2->AddTab("F-Factor Method");
+    TCanvas *c5 = &d3->AddTab("F-Factor Method");
     c5->Divide(2, 2);
 
@@ -358,5 +361,5 @@
     obj->Draw();
 
-    TCanvas *c6 = &d2->AddTab("Blind Pixel Method");
+    TCanvas *c6 = &d3->AddTab("Blind Pixel Method");
     c6->Divide(2, 2);