Index: /trunk/MagicSoft/Mars/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/Makefile	(revision 1047)
+++ /trunk/MagicSoft/Mars/Makefile	(revision 1048)
@@ -97,26 +97,26 @@
 	@echo "Removing htmldoc-tree"
 	@rm -rf htmldoc
+	@echo "Doing Mr.Proper in manalysis"
+	@cd manalysis; (make mrproper > /dev/null); cd ..
 	@echo "Doing Mr.Proper in mbase"
 	@cd mbase; (make mrproper > /dev/null); cd ..
-	@echo "Doing Mr.Proper in mraw"
-	@cd mraw; (make mrproper > /dev/null); cd ..
-	@echo "Doing Mr.Proper in mhist"
-	@cd mhist; (make mrproper > /dev/null); cd ..
+	@echo "Doing Mr.Proper in mdatacheck"
+	@cd mdatacheck; (make mrproper > /dev/null); cd ..
+	@echo "Doing Mr.Proper in mevtdisp"
+	@cd meventdisp; (make mrproper > /dev/null); cd ..
 	@echo "Doing Mr.Proper in mfilter"
 	@cd mfilter; (make mrproper > /dev/null); cd ..
 	@echo "Doing Mr.Proper in mgui"
 	@cd mgui; (make mrproper > /dev/null); cd ..
-	@echo "Doing Mr.Proper in mdatacheck"
-	@cd mdatacheck; (make mrproper > /dev/null); cd ..
+	@echo "Doing Mr.Proper in mhist"
+	@cd mhist; (make mrproper > /dev/null); cd ..
+	@echo "Doing Mr.Proper in mmain"
+	@cd mmain; (make mrproper > /dev/null); cd ..
 	@echo "Doing Mr.Proper in mmc"
 	@cd mmc; (make mrproper > /dev/null); cd ..
-	@echo "Doing Mr.Proper in mevtdisp"
-	@cd meventdisp; (make mrproper > /dev/null); cd ..
-	@echo "Doing Mr.Proper in manalysis"
-	@cd manalysis; (make mrproper > /dev/null); cd ..
 	@echo "Doing Mr.Proper in mmontecarlo"
 	@cd mmontecarlo; (make mrproper > /dev/null); cd ..
-	@echo "Doing Mr.Proper in mmain"
-	@cd mmain; (make mrproper > /dev/null); cd ..
+	@echo "Doing Mr.Proper in mraw"
+	@cd mraw; (make mrproper > /dev/null); cd ..
 	@echo "Done."
 
Index: /trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc	(revision 1047)
+++ /trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc	(revision 1048)
@@ -232,4 +232,6 @@
     // too the list with it's id, number of photons and error
     //
+    fNphot->InitSize(127);
+
     for (Int_t i = 0; i<127; i++ )
     {
Index: /trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc	(revision 1047)
+++ /trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc	(revision 1048)
@@ -45,8 +45,9 @@
 #include "MLogManip.h"
 
-#include "MRawEvtPixelIter.h"
+#include "MRawEvtData.h"       // MRawEvtData::GetNumPixels
 #include "MCerPhotEvt.h"
 #include "MPedestalPix.h"
 #include "MPedestalCam.h"
+#include "MRawEvtPixelIter.h"
 
 ClassImp(MCerPhotCalc);
@@ -65,5 +66,4 @@
     AddToBranchList("fHiGainFadcSamples");
     AddToBranchList("fLoGainFadcSamples");
-
 }
 
@@ -108,9 +108,9 @@
 Bool_t MCerPhotCalc::Process()
 {
+    fCerPhotEvt->InitSize(fRawEvt->GetNumPixels());
+
     MRawEvtPixelIter pixel(fRawEvt);
-
     while (pixel.Next())
     {
-
         const UInt_t pixid = pixel.GetPixelId();
 
Index: /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc	(revision 1047)
+++ /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc	(revision 1048)
@@ -47,10 +47,5 @@
     fTitle = title ? title : "(Number of Photon)-Event Information";
 
-    fPixels = new TClonesArray ("MCerPhotPix", 577);
-
-    //
-    // FIXME: is this really necessary?
-    //
-    Reset();
+    fPixels = new TClonesArray ("MCerPhotPix", 0);
 }
 
@@ -82,5 +77,5 @@
     // TClonesArray -> 'operator new with placement' should be used
 
-    fPixels->ExpandCreate(fNumPixels);
+    //    fPixels->ExpandCreate(fNumPixels);
     new ((*fPixels)[fNumPixels++]) MCerPhotPix(id, nph, err);
 }
@@ -93,5 +88,5 @@
 {
     fNumPixels = 0;
-//    fPixels->Delete();
+    fPixels->Delete();
 }
 
Index: /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h	(revision 1047)
+++ /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h	(revision 1048)
@@ -22,4 +22,6 @@
 
     UInt_t GetNumPixels() const { return fNumPixels; }
+    void   InitSize(UInt_t num) { fPixels->Expand(num); }
+
     void   AddPixel(Int_t id, Float_t nph, Float_t err);
 
@@ -31,6 +33,6 @@
     Float_t GetNumPhotonsMax() const;
 
-    MCerPhotPix &operator[](int i)       { return *(MCerPhotPix*)(fPixels->At(i)); }
-    MCerPhotPix &operator[](int i) const { return *(MCerPhotPix*)(fPixels->At(i)); }
+    MCerPhotPix &operator[](int i)       { return *(MCerPhotPix*)(fPixels->UncheckedAt(i)); }
+    MCerPhotPix &operator[](int i) const { return *(MCerPhotPix*)(fPixels->UncheckedAt(i)); }
 
     void Reset();
Index: /trunk/MagicSoft/Mars/manalysis/MPedestalCam.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MPedestalCam.h	(revision 1047)
+++ /trunk/MagicSoft/Mars/manalysis/MPedestalCam.h	(revision 1048)
@@ -23,8 +23,8 @@
     ~MPedestalCam();
 
-    void InitSize(const UInt_t i) { fArray->ExpandCreateFast(i); }
+    void InitSize(const UInt_t i) { fArray->ExpandCreate(i); }
 
-    MPedestalPix &operator[](Int_t i)       { return *(MPedestalPix*)fArray->At(i); }
-    MPedestalPix &operator[](Int_t i) const { return *(MPedestalPix*)fArray->At(i); }
+    MPedestalPix &operator[](Int_t i)       { return *(MPedestalPix*)fArray->UncheckedAt(i); }
+    MPedestalPix &operator[](Int_t i) const { return *(MPedestalPix*)fArray->UncheckedAt(i); }
 
     ClassDef(MPedestalCam, 1)	// Storage Container for all pedestal information of the camera
Index: /trunk/MagicSoft/Mars/mbase/MEvtLoop.cc
===================================================================
--- /trunk/MagicSoft/Mars/mbase/MEvtLoop.cc	(revision 1047)
+++ /trunk/MagicSoft/Mars/mbase/MEvtLoop.cc	(revision 1048)
@@ -214,10 +214,10 @@
     clock.Print();
 
-    *fLog << dec << endl << "CPU   - "
+    *fLog << dec << endl << "CPU  - "
         << "Time: " << clock.CpuTime() << "s"
         << " for " << (maxcnt<0?dummy:maxcnt) << " Events"
         << " --> " << (maxcnt<0?dummy:maxcnt)/clock.CpuTime() << " Events/s"
         << endl;
-    *fLog << "Total - "
+    *fLog << "Real - "
         << "Time: " << clock.RealTime() << "s"
         << " for " << (maxcnt<0?dummy:maxcnt) << " Events"
Index: /trunk/MagicSoft/Mars/mgui/MGeomCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mgui/MGeomCam.cc	(revision 1047)
+++ /trunk/MagicSoft/Mars/mgui/MGeomCam.cc	(revision 1048)
@@ -36,6 +36,4 @@
 #include "MGeomCam.h"
 
-#include <TObjArray.h>
-
 #include "MLog.h"
 #include "MGeomPix.h"
@@ -73,22 +71,4 @@
 {
     delete fPixels;
-}
-
-// --------------------------------------------------------------------------
-//
-// Return the i-th pixel object
-//
-MGeomPix &MGeomCam::operator[](Int_t i)
-{
-    return *(MGeomPix*)fPixels->At(i);
-}
-
-// --------------------------------------------------------------------------
-//
-// Return the i-th pixel object
-//
-MGeomPix &MGeomCam::operator[](Int_t i) const
-{
-    return *(MGeomPix*)fPixels->At(i);
 }
 
Index: /trunk/MagicSoft/Mars/mgui/MGeomCam.h
===================================================================
--- /trunk/MagicSoft/Mars/mgui/MGeomCam.h	(revision 1047)
+++ /trunk/MagicSoft/Mars/mgui/MGeomCam.h	(revision 1048)
@@ -5,7 +5,9 @@
 #include "MParContainer.h"
 #endif
+#ifndef ROOT_TObjArray
+#include "TObjArray.h"
+#endif
 
 class MGeomPix;
-class TObjArray;
 
 class MGeomCam : public MParContainer
@@ -29,6 +31,6 @@
     Float_t GetMaxRadius() const { return fMaxRadius; }
 
-    MGeomPix &operator[](Int_t i);
-    MGeomPix &operator[](Int_t i) const;
+    MGeomPix &operator[](Int_t i)       { return *(MGeomPix*)fPixels->UncheckedAt(i); }
+    MGeomPix &operator[](Int_t i) const { return *(MGeomPix*)fPixels->UncheckedAt(i); }
 
     virtual void Print(Option_t *opt=NULL) const;
Index: /trunk/MagicSoft/Mars/mhist/MHHillas.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhist/MHHillas.cc	(revision 1047)
+++ /trunk/MagicSoft/Mars/mhist/MHHillas.cc	(revision 1048)
@@ -36,5 +36,5 @@
     // connect all the histogram with the container fHist
     //
-    fAlpha  = new TH1F("Alpha [°]", "Alpha of Hillas",   90, 0,  90);
+    fAlpha  = new TH1F("\\alpha [^\\circ]", "Alpha of Hillas",   90, 0,  90);
     fWidth  = new TH1F("Width [mm]",  "Width of Hillas",  100, 0, 300);
     fLength = new TH1F("Length [mm]", "Length of Hillas", 100, 0, 300);