Index: trunk/MagicSoft/Mars/mbase/MArray.h
===================================================================
--- trunk/MagicSoft/Mars/mbase/MArray.h	(revision 653)
+++ trunk/MagicSoft/Mars/mbase/MArray.h	(revision 654)
@@ -21,9 +21,9 @@
 {
 protected:
-    Int_t fN; // Number of array elements
+    UInt_t fN; // Number of array elements
 
 public:
    MArray()                              { fN = 0; }
-   MArray(Int_t n)                       { fN = n; }
+   MArray(UInt_t n)                      { fN = n; }
    MArray(const MArray &a)               { fN = a.fN; }
    virtual ~MArray()                     { fN = 0; }
@@ -31,6 +31,6 @@
    MArray &operator=(const MArray &rhs)  { fN = rhs.fN; return *this; }
 
-   Int_t        GetSize() const          { return fN; }
-   virtual void Set(Int_t n) = 0;
+   UInt_t       GetSize() const          { return fN; }
+   virtual void Set(UInt_t n) = 0;
 
    ClassDef(MArray, 1)  //Abstract array base class for TObject derived Arrays
Index: trunk/MagicSoft/Mars/mbase/MArrayB.h
===================================================================
--- trunk/MagicSoft/Mars/mbase/MArrayB.h	(revision 653)
+++ trunk/MagicSoft/Mars/mbase/MArrayB.h	(revision 654)
@@ -26,21 +26,22 @@
     MArrayB()
     {
-        fN = 0;
+        fN     = 0;
         fArray = NULL;
     }
 
-    MArrayB(Int_t n)
+    MArrayB(UInt_t n)
     {
-        fN = 0;
+        fN     = 0;
         fArray = NULL;
-        if (n > 0)
-            Set(n);
+
+        Set(n);
     }
 
-    MArrayB(Int_t n, Byte_t *array)
+    MArrayB(UInt_t n, Byte_t *array)
     {
         // Create TArrayC object and initialize it with values of array.
-        fN = 0;
+        fN     = 0;
         fArray = NULL;
+
         Set(n, array);
     }
@@ -53,5 +54,5 @@
     }
 
-    Int_t GetSize() const
+    UInt_t GetSize() const
     {
         return fN;
@@ -73,5 +74,5 @@
     }
 
-    void Adopt(Int_t n, Byte_t *array)
+    void Adopt(UInt_t n, Byte_t *array)
     {
         // Adopt array arr into TArrayC, i.e. don't copy arr but use it directly
@@ -84,5 +85,5 @@
     }
 
-    void AddAt(Byte_t c, Int_t i)
+    void AddAt(Byte_t c, UInt_t i)
     {
         // Add char c at position i. Check for out of bounds.
@@ -90,5 +91,5 @@
     }
 
-    void AddAt(Byte_t *array, Int_t i, Int_t n)
+    void AddAt(Byte_t *array, UInt_t i, UInt_t n)
     {
         // Add char c at position i. Check for out of bounds.
@@ -96,5 +97,5 @@
     }
 
-    Byte_t     At(Int_t i)
+    Byte_t     At(UInt_t i)
     {
         return fArray[i];
@@ -111,5 +112,5 @@
     }
 
-    void Set(Int_t n)
+    void Set(UInt_t n)
     {
         // Set size of this array to n chars.
@@ -117,9 +118,11 @@
         // then the old array is deleted.
 
-        if (n < 0 || n==fN)
+        if (n==fN)
             return;
 
         Byte_t *temp = fArray;
-        if (n != 0)
+        if (n == 0)
+            fArray = 0;
+        else
         {
             fArray = new Byte_t[n];
@@ -132,8 +135,4 @@
             }
         }
-        else
-        {
-            fArray = 0;
-        }
 
         if (fN)
@@ -143,8 +142,8 @@
     }
 
-    void Set(Int_t n, Byte_t *array)
+    void Set(UInt_t n, Byte_t *array)
     {
         // Set size of this array to n chars and set the contents.
-        if (n < 0 || array == 0)
+        if (!array)
             return;
 
@@ -154,4 +153,5 @@
             fArray = 0;
         }
+
         fN = n;
 
@@ -165,5 +165,5 @@
     }
 
-    Byte_t &operator[](Int_t i)
+    Byte_t &operator[](UInt_t i)
     {
         return fArray[i];
Index: trunk/MagicSoft/Mars/mbase/MArrayS.h
===================================================================
--- trunk/MagicSoft/Mars/mbase/MArrayS.h	(revision 653)
+++ trunk/MagicSoft/Mars/mbase/MArrayS.h	(revision 654)
@@ -25,20 +25,19 @@
     MArrayS()
     {
-        fN = 0;
+        fN     = 0;
         fArray = NULL;
     }
 
-    MArrayS(Int_t n)
+    MArrayS(UInt_t n)
     {
-        fN = 0;
+        fN     = 0;
         fArray = NULL;
-        if (n > 0)
-            Set(n);
+        Set(n);
     }
 
-    MArrayS(Int_t n, UShort_t *array)
+    MArrayS(UInt_t n, UShort_t *array)
     {
         // Create TArrayC object and initialize it with values of array.
-        fN = 0;
+        fN     = 0;
         fArray = NULL;
         Set(n, array);
@@ -52,5 +51,5 @@
     }
 
-    Int_t GetSize() const
+    UInt_t GetSize() const
     {
         return fN;
@@ -72,5 +71,5 @@
     }
 
-    void Adopt(Int_t n, UShort_t *array)
+    void Adopt(UInt_t n, UShort_t *array)
     {
         // Adopt array arr into TArrayC, i.e. don't copy arr but use it directly
@@ -83,5 +82,5 @@
     }
 
-    void AddAt(UShort_t c, Int_t i)
+    void AddAt(UShort_t c, UInt_t i)
     {
         // Add char c at position i. Check for out of bounds.
@@ -89,5 +88,5 @@
     }
 
-    UShort_t     At(Int_t i)
+    UShort_t     At(UInt_t i)
     {
         return fArray[i];
@@ -104,5 +103,5 @@
     }
 
-    void Set(Int_t n)
+    void Set(UInt_t n)
     {
         // Set size of this array to n chars.
@@ -110,9 +109,11 @@
         // then the old array is deleted.
 
-        if (n < 0 || n==fN)
+        if (n==fN)
             return;
 
         UShort_t *temp = fArray;
-        if (n != 0)
+        if (n == 0)
+            fArray = NULL;
+        else
         {
             fArray = new UShort_t[n];
@@ -125,8 +126,4 @@
             }
         }
-        else
-        {
-            fArray = NULL;
-        }
 
         if (fN)
@@ -136,8 +133,8 @@
     }
 
-    void Set(Int_t n, UShort_t *array)
+    void Set(UInt_t n, UShort_t *array)
     {
         // Set size of this array to n chars and set the contents.
-        if (n < 0 || array == 0)
+        if (!array)
             return;
 
@@ -158,5 +155,5 @@
     }
 
-    UShort_t &operator[](Int_t i)
+    UShort_t &operator[](UInt_t i)
     {
         return fArray[i];
Index: trunk/MagicSoft/Mars/mbase/MLogManip.h
===================================================================
--- trunk/MagicSoft/Mars/mbase/MLogManip.h	(revision 653)
+++ trunk/MagicSoft/Mars/mbase/MLogManip.h	(revision 654)
@@ -53,5 +53,5 @@
 //
 #ifndef __CINT__
-#define __DINF__        __FILE__ << " " << __LINE__ << ": "
+#define dbginf        __FILE__ << " " << __LINE__ << ": "
 #endif
 //
@@ -63,5 +63,5 @@
 //
 #ifndef __CINT__
-#define DEBUG(lvl)      flush << debug(lvl) << __DINF__
+#define DEBUG(lvl)    flush << debug(lvl) << dbginf
 #endif
 
Index: trunk/MagicSoft/Mars/mbase/MReadTree.cc
===================================================================
--- trunk/MagicSoft/Mars/mbase/MReadTree.cc	(revision 653)
+++ trunk/MagicSoft/Mars/mbase/MReadTree.cc	(revision 654)
@@ -43,5 +43,5 @@
 {
     //
-    // open file
+    // open file and check if file is really open
     //
     fFile = new TFile(fFileName, "READ");
@@ -54,6 +54,8 @@
     }
 
+    //
+    // try to get the tree and check if it was found
+    //
     fTree = (TTree*)fFile->Get(fTreeName);
-
     if (!fTree)
     {
@@ -63,7 +65,17 @@
     }
 
+    //
+    // get number of events in this tree
+    //
     fNumEntries = (UInt_t)fTree->GetEntries();
+
+    //
+    // set pointer to first event
+    //
     fNumEntry   = 0;
 
+    //
+    // output logging information
+    //
     *fLog << "File: '" << fFileName << "'  Tree: '" << fTreeName;
     *fLog << "' with " << fNumEntries << " Entries opened." << endl;