Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc	(revision 5660)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc	(revision 5661)
@@ -169,5 +169,8 @@
 {
   for (UInt_t i=a; i<b; i++)
-    fPixels->AddAt(new MCalibrationChargePix,i);
+    {
+      fPixels->AddAt(new MCalibrationChargePix,i);
+      (*this)[i].SetPixId(i);
+    }
 }
 
@@ -179,5 +182,8 @@
 {
   for (UInt_t i=a; i<b; i++)
-    fAverageAreas->AddAt(new MCalibrationChargePix,i);
+    {
+      fAverageAreas->AddAt(new MCalibrationChargePix,i);
+      GetAverageArea(i).SetPixId(i);
+    }
 }
 
@@ -189,5 +195,8 @@
 {
   for (UInt_t i=a; i<b; i++)
-    fAverageSectors->AddAt(new MCalibrationChargePix,i);
+    {
+      fAverageSectors->AddAt(new MCalibrationChargePix,i);
+      GetAverageSector(i).SetPixId(i);
+    }
 }
 
@@ -589,5 +598,5 @@
       break;
     case 32:
-      val = pix.GetMean() == 0. ? 0. : pix.GetHiGainRms()/pix.GetMean();
+      val = pix.GetMean() == 0. ? 0. : pix.GetRms()/pix.GetMean();
       break;
     default:
@@ -666,6 +675,6 @@
 
   TArrayF arr(2);
-  arr[0] = nr   ? mean/nr : -1;
-  arr[1] = nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0;
+  arr[0] = nr   ? mean/nr : -1.;
+  arr[1] = nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0.;
 
   return arr;