Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 4141)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 4142)
@@ -18,4 +18,14 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/05/24: Markus Gaug
+
+   * mcalib/MCalibrationCam.cc
+     - initialize AverageAreas and AverageSectors with the number of 
+       aidx and sector as SetPixId()
+
+   * mcalib/MCalibrationChargeCam.cc
+     - small modification in the Print()
+
 
  2004/05/22: Markus Gaug
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 4141)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 4142)
@@ -191,4 +191,7 @@
   fAverageAreas->ExpandCreate(i);
   fAverageBadAreas->ExpandCreate(i);
+
+  for (UInt_t j=0; j<i; j++)
+    GetAverageArea(j).SetPixId(j);
   
   fNumUnsuitable.Set(i);
@@ -206,4 +209,8 @@
   fAverageSectors->ExpandCreate(i);
   fAverageBadSectors->ExpandCreate(i);
+
+  for (UInt_t j=0; j<i; j++)
+    GetAverageSector(j).SetPixId(j);
+
 }
 
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc	(revision 4141)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc	(revision 4142)
@@ -237,8 +237,13 @@
   *fLog << endl;
 
+  *fLog << all << endl;
+  *fLog << all << "Averaged Areas:" << endl;
+  *fLog << all << endl;
+
   TIter Next5(fAverageAreas);
   while ((pix=(MCalibrationChargePix*)Next5()))
   {
     *fLog << all << "Average Area:" 
+          << Form("%s%3i","Area Idx: ",pix->GetPixId())
           << "   Ped.  Rms: "            << pix->GetPedRms()        << " +- " << pix->GetPedRmsErr() 
           << "   Mean signal: "          << pix->GetMean()    << " +- " << pix->GetMeanErr() 
@@ -249,8 +254,13 @@
   }
 
+  *fLog << all << endl;
+  *fLog << all << "Averaged Sectors:" << endl;
+  *fLog << all << endl;
+
   TIter Next6(fAverageSectors);
   while ((pix=(MCalibrationChargePix*)Next6()))
   {
     *fLog << all << "Average Sector:" 
+          << Form("%s%3i","Sector: ",pix->GetPixId())
           << "   Ped.  Rms: "            << pix->GetPedRms()        << " +- " << pix->GetPedRmsErr() 
           << "   Mean signal: "          << pix->GetMean()    << " +- " << pix->GetMeanErr()