Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h
===================================================================
--- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h	(revision 5036)
+++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h	(revision 5037)
@@ -2,12 +2,10 @@
 #define MARS_MHCalibrationCam
 
-#ifndef ROOT_TArrayI
-#include <TArrayI.h>
-#endif
-
-#ifndef ROOT_TArrayF
-#include <TArrayF.h>
-#endif
-
+#ifndef MARS_MArrayI
+#include "MArrayI.h"
+#endif
+#ifndef MARS_MArrayF
+#include "MArrayF.h"
+#endif
 #ifndef MARS_MH
 #include "MH.h"
@@ -64,10 +62,13 @@
   Float_t fNumLoGainSaturationLimit;     // Rel. amount sat. logain FADC slices until pixel is called saturated
 
-  TArrayI    fAverageAreaNum;            // Number of pixels in average pixels per area
-  TArrayF    fAverageAreaRelSigma;       // Re-normalized relative sigmas in average pixels per area
-  TArrayF    fAverageAreaRelSigmaVar;    // Variance Re-normalized relative sigmas in average pixels per area
-  TArrayI    fAverageAreaSat;            // Number of saturated slices in average pixels per area
-  TArrayF    fAverageAreaSigma;          // Re-normalized sigmas in average pixels per area
-  TArrayF    fAverageAreaSigmaVar;       // Variance Re-normalized sigmas in average pixels per area
+  MArrayI fRunNumbers;                   // Numbers of runs used
+
+  MArrayF fAverageAreaRelSigma;          // Re-normalized relative sigmas in average pixels per area
+  MArrayF fAverageAreaRelSigmaVar;       // Variance Re-normalized relative sigmas in average pixels per area
+  MArrayI fAverageAreaSat;               // Number of saturated slices in average pixels per area
+  MArrayF fAverageAreaSigma;             // Re-normalized sigmas in average pixels per area
+  MArrayF fAverageAreaSigmaVar;          // Variance Re-normalized sigmas in average pixels per area
+  MArrayI fAverageAreaNum;               // Number of pixels in average pixels per area
+  MArrayI fAverageSectorNum;             // Number of pixels in average pixels per sector 
 
   TObjArray *fAverageHiGainAreas;        // Array of calibration pixels, one per pixel area
@@ -75,6 +76,4 @@
   TObjArray *fAverageLoGainAreas;        // Array of calibration pixels, one per pixel area
   TObjArray *fAverageLoGainSectors;      // Array of calibration pixels, one per camera sector
-  TArrayI    fAverageSectorNum;          // Number of pixels in average pixels per sector 
-  TArrayI    fRunNumbers;                // Numbers of runs used
 
   MCalibrationCam::PulserColor_t fColor; // Colour of the pulsed LEDs
@@ -177,5 +176,5 @@
   const Float_t        GetNumHiGainSaturationLimit()     const  { return fNumHiGainSaturationLimit; }
   const Float_t        GetNumLoGainSaturationLimit()     const  { return fNumLoGainSaturationLimit; }
-  const TArrayI       &GetRunNumbers         ()          const { return fRunNumbers;            }
+  const MArrayI       &GetRunNumbers         ()          const { return fRunNumbers;            }
   const Int_t          GetSize               ()          const;