Index: trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 3664)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 3667)
@@ -196,4 +196,11 @@
 }
 
+void MCalibrationCam::Init(const MGeomCam &geom)
+{
+    InitSize          (geom.GetNumPixels() );
+    InitAverageAreas  (geom.GetNumAreas()  );
+    InitAverageSectors(geom.GetNumSectors());
+}
+
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h	(revision 3664)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h	(revision 3667)
@@ -14,4 +14,6 @@
 class MBadPixelsPix;
 class MBadPixelsCam;
+class MGeomCam;
+
 class MCalibrationCam : public MParContainer, public MCamEvent
 {
@@ -31,4 +33,5 @@
   
   virtual void Clear(    Option_t *o="" );
+  void Init(const MGeomCam &geom);
   void InitSize( const UInt_t i );
   void InitAverageAreas(  const UInt_t i );
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc	(revision 3664)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc	(revision 3667)
@@ -639,5 +639,5 @@
 {
   
-  for (Int_t j=0; j<fGeom->GetNumAreas(); j++)
+  for (UInt_t j=0; j<fGeom->GetNumAreas(); j++)
     {
   
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc	(revision 3664)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc	(revision 3667)
@@ -387,8 +387,8 @@
     }
   
-  const Int_t npixels  = fGeom->GetNumPixels();
-  const Int_t nareas   = fGeom->GetNumAreas();
-  const Int_t nsectors = fGeom->GetNumSectors();
-  const Int_t lofirst  = signal->GetFirstUsedSliceLoGain();
+  const UInt_t npixels  = fGeom->GetNumPixels();
+  const UInt_t nareas   = fGeom->GetNumAreas();
+  const UInt_t nsectors = fGeom->GetNumSectors();
+  const UInt_t lofirst  = signal->GetFirstUsedSliceLoGain();
 
   Float_t sumhiarea  [nareas],   sumloarea  [nareas],   timehiarea  [nareas],   timeloarea  [nareas];
@@ -410,5 +410,5 @@
   
 
-  for (Int_t i=0; i<npixels; i++)
+  for (UInt_t i=0; i<npixels; i++)
     {
 
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimeCam.cc	(revision 3664)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimeCam.cc	(revision 3667)
@@ -297,7 +297,7 @@
     }
   
-  const Int_t npixels  = fGeom->GetNumPixels();
-  const Int_t nareas   = fGeom->GetNumAreas();
-  const Int_t nsectors = fGeom->GetNumSectors();
+  const UInt_t npixels  = fGeom->GetNumPixels();
+  const UInt_t nareas   = fGeom->GetNumAreas();
+  const UInt_t nsectors = fGeom->GetNumSectors();
 
   Float_t sumareahi  [nareas],   sumarealo  [nareas];