Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8286)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8287)
@@ -37,4 +37,20 @@
      - small improvements to splitting number rows
      - handle possible tabs correctly
+
+   * mbase/MStatusArray.[h,cc]:
+     - improved handling in Read(). We make sure now that Read doesn't
+       produce a memory leak
+
+   * mhist/MHCamera.[h,cc]:
+     - overwrote Clone function to make sure that a cloned MHCamera
+       is never added to the current directory
+
+   * mcamera/MCameraTH.h:
+     - added a workaround to get rid of the obsolete discriminator thresholds
+       for the non-trigger pixels
+
+   * mreport/MReportCC.cc:
+     - added a sanity \o-Terminator to the dicriminator threshold extraction
+
 
 
Index: trunk/MagicSoft/Mars/NEWS
===================================================================
--- trunk/MagicSoft/Mars/NEWS	(revision 8286)
+++ trunk/MagicSoft/Mars/NEWS	(revision 8287)
@@ -15,4 +15,6 @@
    - general: fixed the error display of the camera display. It showed
      wrong results.
+
+   - general: fixed a memory leak when reading many MStatusDisplays
 
    - callisto: Redone the signal extraction this includes:
Index: trunk/MagicSoft/Mars/mcamera/MCameraTH.h
===================================================================
--- trunk/MagicSoft/Mars/mcamera/MCameraTH.h	(revision 8286)
+++ trunk/MagicSoft/Mars/mcamera/MCameraTH.h	(revision 8287)
@@ -1,2 +1,5 @@
+/* ======================================================================== *\
+!  $Name: not supported by cvs2svn $:$Id: MCameraTH.h,v 1.7 2007-02-01 15:56:17 tbretz Exp $
+\* ======================================================================== */
 #ifndef MARS_MCameraTH
 #define MARS_MCameraTH
@@ -40,4 +43,23 @@
             return kFALSE;
 
+        // FIXME: This is a stupid workaround to describe the trigger area
+        //        and only valid for the MAGIC-I camera!
+        if (idx>=397 ||
+            (idx>=339 && idx<=345) ||
+            (idx>=279 && idx<=283) ||
+            (idx>=331 && idx<=334) ||
+            (idx>=394 && idx<=396) ||
+            (idx>=271 && idx<=273) ||
+            (idx>=329 && idx<=330) ||
+            (idx>=383 && idx<=389) ||
+            (idx>=319 && idx<=323) ||
+            (idx>=289 && idx<=293) ||
+            (idx>=350 && idx<=356) ||
+            (idx>=299 && idx<=303) ||
+            (idx>=361 && idx<=367) ||
+            (idx>=309 && idx<=313) ||
+            (idx>=372 && idx<=378))
+            return kFALSE;
+
         val = fTH[idx];
         return val>0;
Index: trunk/MagicSoft/Mars/mreport/MReportCC.cc
===================================================================
--- trunk/MagicSoft/Mars/mreport/MReportCC.cc	(revision 8286)
+++ trunk/MagicSoft/Mars/mreport/MReportCC.cc	(revision 8287)
@@ -167,5 +167,5 @@
     while (pos<end)
     {
-        const Char_t hex[2] = { pos[0], pos[1] };
+        const Char_t hex[3] = { pos[0], pos[1], 0 };
         pos += 2;