Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 6210)
+++ trunk/MagicSoft/Mars/Changelog	(revision 6211)
@@ -22,4 +22,8 @@
 
  2005/02/02 Markus Gaug
+
+   * mcalib/MCalibrationChargeCam.cc
+     - fixed small bug in the display of mean charges when low-gain was
+       used.
 
    * msignal/MExtractor.cc
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc	(revision 6210)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc	(revision 6211)
@@ -436,20 +436,20 @@
       if (pix.IsExcluded())
         return kFALSE;
-      val = pix.GetMean();
+      val = pix.GetConvertedMean();
       break;
     case 1:
       if (pix.IsExcluded())
         return kFALSE;
-      val = pix.GetMeanErr();
+      val = pix.GetConvertedMeanErr();
       break;
     case 2:
       if (pix.IsExcluded())
         return kFALSE;
-      val = pix.GetSigma();
+      val = pix.GetConvertedSigma();
       break;
     case 3:
       if (pix.IsExcluded())
         return kFALSE;
-      val = pix.GetSigmaErr();
+      val = pix.GetConvertedSigmaErr();
       break;
     case 4:
@@ -463,5 +463,5 @@
       if (pix.GetRSigma() == -1.)
 	  return kFALSE;
-      val = pix.GetRSigma();
+      val = pix.GetConvertedRSigma();
       break;
     case 6:
@@ -470,5 +470,5 @@
       if (pix.GetRSigma() == -1.)
 	  return kFALSE;
-      val = pix.GetRSigmaErr();
+      val = pix.GetConvertedRSigmaErr();
       break;
     case 7:
Index: trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc	(revision 6210)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc	(revision 6211)
@@ -175,5 +175,5 @@
   disp10.SetYTitle("\\sigma_{t} [FADC units]");
   
-  TCanvas &c = fDisplay->AddTab("TestCharges");
+  TCanvas &c = fDisplay->AddTab("TestPhes");
   c.Divide(4,4);
   
@@ -183,4 +183,6 @@
   disp4.CamDraw(c, 4, 4, 2, 1);        
   
+  /*
+
   TCanvas &c2 = fDisplay->AddTab("TestResult");
   c2.Divide(2,4);
@@ -188,4 +190,6 @@
   disp5.CamDraw(c2, 1, 2, 2, 1);
   disp6.CamDraw(c2, 2, 2, 2, 1);        
+
+  */
 
   TCanvas &c3 = fDisplay->AddTab("TestDefects");
@@ -505,5 +509,5 @@
 
   badcalc.SetNamePedPhotCam("MPedPhotFundamental");
-  //badtreat.SetUseInterpolation();
+  badtreat.SetUseInterpolation();
   badtreat.AddNamePedPhotCam("MPedPhotFundamental");
 
Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 6210)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 6211)
@@ -475,4 +475,5 @@
     // at the Wuerzburg software meeting 26.01.05
     //
+#warning Default calibration now in equiv. photo-electrons!
     calib.SetSignalType(MCalibrateData::kPhe);