Index: trunk/MagicSoft/Mars/mbase/MReadTree.cc
===================================================================
--- trunk/MagicSoft/Mars/mbase/MReadTree.cc	(revision 962)
+++ trunk/MagicSoft/Mars/mbase/MReadTree.cc	(revision 963)
@@ -136,5 +136,5 @@
 //  out.
 //
-Bool_t MReadTree::PreProcess (MParList *pList)
+Bool_t MReadTree::PreProcess(MParList *pList)
 {
     //
@@ -145,5 +145,5 @@
     if (!fNumEntries)
     {
-        *fLog << dbginf << "No Entries found in chain (file/s)." << endl;
+        *fLog << dbginf << "No entries found in chain (file/s)." << endl;
         return kFALSE;
     }
@@ -152,5 +152,5 @@
     // output logging information
     //
-    *fLog << fNumEntries << " Entries found in file(s)." << endl;
+    *fLog << fNumEntries << " entries found in file(s)." << endl;
 
     //
@@ -160,5 +160,6 @@
     TIter Next(fChain->GetListOfBranches());
     TBranch *branch=NULL;
-    
+
+    Int_t num=0;
     //
     // loop over all tasks for processing
@@ -175,5 +176,8 @@
         //
         if (HasVeto(name))
+        {
+            *fLog << "Branch " << name << " has veto... skipped." << endl;
             continue;
+        }
 
         //
@@ -204,5 +208,10 @@
         //
         fChain->SetBranchAddress(name, pcont);
-    }
+        *fLog << "Branch " << name << " enabled for reading." << endl;
+
+        num++;
+    }
+
+    *fLog << "MReadTree will read " << num << " branches." << endl;
 
     return kTRUE;
@@ -238,5 +247,5 @@
 // Get the Event with the current EventNumber fNumEntry
 //
-Bool_t MReadTree::GetEvent() 
+Bool_t MReadTree::GetEvent()
 {
     fChain->GetEntry(fNumEntry);
Index: trunk/MagicSoft/Mars/mgui/MCamDisplay.h
===================================================================
--- trunk/MagicSoft/Mars/mgui/MCamDisplay.h	(revision 962)
+++ trunk/MagicSoft/Mars/mgui/MCamDisplay.h	(revision 963)
@@ -42,5 +42,5 @@
     TVirtualPad *fDrawingPad;
 
-    TBox *GetBox(Int_t i)   { return (TBox*) fLegend->At(i); }
+    TBox  *GetBox(Int_t i)  { return (TBox*) fLegend->At(i); }
     TText *GetText(Int_t i) { return (TText*)fLegText->At(i); }
 
@@ -50,8 +50,12 @@
     }
 
+    MHexagon &operator[](int i) { return *((MHexagon*)fPixels->At(i)); }
+
+    Int_t GetColor(Float_t wert);
+
+    void UpdateLegend();
+
 public:
-
-    MCamDisplay (MGeomCam *geom);
-
+    MCamDisplay(MGeomCam *geom);
     ~MCamDisplay();
 
@@ -62,10 +66,4 @@
 
     void Reset();
-
-    MHexagon &operator[](int i) { return *((MHexagon*)fPixels->At(i)); }
-
-    Int_t GetColor(Float_t wert);
-
-    void UpdateLegend();
 
     void SetAutoScale(Bool_t input = kTRUE)
Index: trunk/MagicSoft/Mars/mgui/MGeomCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mgui/MGeomCam.cc	(revision 962)
+++ trunk/MagicSoft/Mars/mgui/MGeomCam.cc	(revision 963)
@@ -24,4 +24,14 @@
 \* ======================================================================== */
 
+///////////////////////////////////////////////////////////////////////
+//
+// MGeomCam
+//
+// This is the base class of different camera geometries. It creates
+// a pixel object for a given number of pixels and defines the
+// interface of how to acccess the geometry information.
+//
+///////////////////////////////////////////////////////////////////////
+
 #include "MGeomCam.h"
 
@@ -29,6 +39,11 @@
 #include "MHexagon.h"
 
-ClassImp(MGeomCam)
+ClassImp(MGeomCam);
 
+// --------------------------------------------------------------------------
+//
+// Initializes a Camera Geometry with npix pixels. All pixels
+// are deleted when the corresponding array is deleted.
+//
 MGeomCam::MGeomCam(UInt_t npix, const char *name, const char *title)
 {
@@ -48,16 +63,8 @@
 }
 
-void MGeomCam::Draw( Option_t * )
-{
-    //
-    // Draw the Camera
-    //
-    for (UInt_t i=0; i<fNumPixels; i++)
-    {
-        MHexagon *el = new MHexagon((*this)[i]);
-        el->Draw();
-    }
-}
-
+// --------------------------------------------------------------------------
+//
+//  Prints the Geometry information of all pixels in the camera
+//
 void MGeomCam::Print(Option_t *)
 {
@@ -65,10 +72,10 @@
     //   Print Information about the Geometry of the camera
     //
-    *fLog << " Number of Pixels: " << fNumPixels << endl ;
+    *fLog << " Number of Pixels (" << GetTitle() << "): " << fNumPixels << endl;
 
-    for (UInt_t i=0; i<fNumPixels; i++ )
+    for (UInt_t i=0; i<fNumPixels; i++)
     {
         *fLog << " Pixel: " << i << "  ";
-        (*this)[i].Print() ;
+        (*this)[i].Print();
     }
 } 
Index: trunk/MagicSoft/Mars/mgui/MGeomCam.h
===================================================================
--- trunk/MagicSoft/Mars/mgui/MGeomCam.h	(revision 962)
+++ trunk/MagicSoft/Mars/mgui/MGeomCam.h	(revision 963)
@@ -27,6 +27,4 @@
     virtual ~MGeomCam() { delete fPixels; }
 
-    virtual void Draw(Option_t *option = "" );
-
     UInt_t GetNumPixels() const { return fNumPixels; }
 
Index: trunk/MagicSoft/Mars/mgui/MGeomCamCT1.cc
===================================================================
--- trunk/MagicSoft/Mars/mgui/MGeomCamCT1.cc	(revision 962)
+++ trunk/MagicSoft/Mars/mgui/MGeomCamCT1.cc	(revision 963)
@@ -24,4 +24,14 @@
 \* ======================================================================== */
 
+///////////////////////////////////////////////////////////////////////
+//
+// MGeomCamCT1
+//
+// This class stores the geometrz information of the CT1 camera.
+// The next neighbor information comes from a table, the geometry layout
+// is calculated (for Algorithm see CreateCam
+//
+///////////////////////////////////////////////////////////////////////
+
 #include "MGeomCamCT1.h"
 
@@ -32,6 +42,11 @@
 #include "MLog.h"
 
-ClassImp(MGeomCamCT1)
-
+ClassImp(MGeomCamCT1);
+
+// --------------------------------------------------------------------------
+//
+//  CT1 camera has 127 pixels. For geometry and Next Neighbor info see
+//  CreateCam and CreateNN
+//
 MGeomCamCT1::MGeomCamCT1(const char *name) : MGeomCam(127, name, "Geometry information of CT1 camera")
 {
@@ -40,14 +55,8 @@
 } 
 
-void MGeomCamCT1::Draw( Option_t * )
-{ 
-    TCanvas *can = new TCanvas("cam", "Camera Geometry", 4 ) ;
-
-    can->Range(-175, -175, 175, 175 ) ;
-
-    MGeomCam::Draw();
-} 
-
-
+// --------------------------------------------------------------------------
+//
+//  Create Next Neighbors: Fill the NN Info into the pixel objects.
+//
 void MGeomCamCT1::CreateNN()
 { 
@@ -179,5 +188,5 @@
       { 88,  89, 123, 125,  -1,  -1},
       { 89,  90, 124, 126,  -1,  -1}   // 126
-  } ;
+  };
 
   for (Int_t i=0; i<127; i++)
@@ -186,4 +195,9 @@
 }
 
+// --------------------------------------------------------------------------
+//
+//  Calculate the geometry information of CT1 and fill this information
+//  into the pixel objects.
+//
 void MGeomCamCT1::CreateCam()
 {
@@ -197,5 +211,5 @@
     // it was punt into a root/C++ context by Harald Kornmayer and Thomas Bretz
    
-    const Float_t diameter = 21 ;    // units are mm
+    const Float_t diameter = 21;    // units are mm
     const Float_t kS32  = sqrt(3)/2;
 
Index: trunk/MagicSoft/Mars/mgui/MGeomCamCT1.h
===================================================================
--- trunk/MagicSoft/Mars/mgui/MGeomCamCT1.h	(revision 962)
+++ trunk/MagicSoft/Mars/mgui/MGeomCamCT1.h	(revision 963)
@@ -20,6 +20,4 @@
     MGeomCamCT1(const char *name=NULL);
 
-    void Draw(Option_t *option = "" ) ;
-
     ClassDef(MGeomCamCT1, 1)		// Geometry class for the CT1 camera
 };
Index: trunk/MagicSoft/Mars/mgui/MGeomCamMagic.cc
===================================================================
--- trunk/MagicSoft/Mars/mgui/MGeomCamMagic.cc	(revision 962)
+++ trunk/MagicSoft/Mars/mgui/MGeomCamMagic.cc	(revision 963)
@@ -24,4 +24,13 @@
 \* ======================================================================== */
 
+///////////////////////////////////////////////////////////////////////
+//
+// MGeomCamMagic
+//
+// This class stores the geometry information of the Magic camera.
+// All information are copied from tables, see source code.
+//
+///////////////////////////////////////////////////////////////////////
+
 #include "MGeomCamMagic.h"
 
@@ -32,4 +41,9 @@
 ClassImp(MGeomCamMagic)
 
+// --------------------------------------------------------------------------
+//
+//  Magic camera has 577 pixels. For geometry and Next Neighbor info see
+//  CreateCam and CreateNN
+//
 MGeomCamMagic::MGeomCamMagic(const char *name) : MGeomCam(577, name, "Geometry information of Magic Camera")
 {
@@ -38,13 +52,8 @@
 }
 
-void MGeomCamMagic::Draw(Option_t *)
-{ 
-    TCanvas *can = new TCanvas("can", "Camera Geometry", 4 ) ;
-
-    can->Range(-600, -600, 600, 600 ) ;
-
-    MGeomCam::Draw();
-}
-
+// --------------------------------------------------------------------------
+//
+//  This fills the geometry information from a table into the pixel objects.
+//
 void MGeomCamMagic::CreateCam()
 {
@@ -292,4 +301,9 @@
 }
 
+// --------------------------------------------------------------------------
+//
+//  This fills the next neighbor information from a table into the pixel
+//  objects.
+//
 void MGeomCamMagic::CreateNN()
 {
Index: trunk/MagicSoft/Mars/mgui/MGeomCamMagic.h
===================================================================
--- trunk/MagicSoft/Mars/mgui/MGeomCamMagic.h	(revision 962)
+++ trunk/MagicSoft/Mars/mgui/MGeomCamMagic.h	(revision 963)
@@ -19,6 +19,4 @@
     MGeomCamMagic(const char *name=NULL);
 
-    void Draw(Option_t *option = "");
-
     ClassDef(MGeomCamMagic, 1)		// Geometry class for the Magic camera
 };
Index: trunk/MagicSoft/Mars/mgui/MGeomPix.cc
===================================================================
--- trunk/MagicSoft/Mars/mgui/MGeomPix.cc	(revision 962)
+++ trunk/MagicSoft/Mars/mgui/MGeomPix.cc	(revision 963)
@@ -24,10 +24,23 @@
 \* ======================================================================== */
 
+///////////////////////////////////////////////////////////////////////
+//
+// MGeomPix
+//
+// This container stores the geometry (position) information of
+// a single pixel together with the information about next neighbors.
+//
+///////////////////////////////////////////////////////////////////////
+
 #include "MGeomPix.h"
 
 #include "MLog.h"
 
-ClassImp(MGeomPix)
+ClassImp(MGeomPix);
 
+// --------------------------------------------------------------------------
+//
+// Initialiyes one pixel
+//
 MGeomPix::MGeomPix(Float_t x, Float_t y, Float_t r) : fX(x), fY(y), fR(r)
 {
@@ -35,4 +48,11 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Initialiyes Next Neighbors.
+//
+// WARNING: This function is public, but it is not ment for user access.
+// It should only be used from geometry classes (like MGeomCam)
+//
 void MGeomPix::SetNeighbors(Short_t i0, Short_t i1, Short_t i2,
                             Short_t i3, Short_t i4, Short_t i5)
@@ -53,5 +73,8 @@
 }
 
-
+// --------------------------------------------------------------------------
+//
+// Print the geometry information of one pixel.
+//
 void MGeomPix::Print(Option_t *opt)
 {