Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8940)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8941)
@@ -50,4 +50,43 @@
    * msignal/MSignalCalc.cc:
      - scale the pedestal correctly with the scale
+
+   * mjobs/MJStar.cc:
+     - allow filling of pyrometer information to be skipped
+
+   * mhist/MHWeather.cc:
+     - show also colored labels
+
+   * Makefile:
+     - it seems the libmars.so looses read permissions for group
+       and others when it is  moved. Now they are set manually
+
+   * datacenter/fillsignal.C, datacenter/macros/fillstar.C:
+     - added filling of calibration pulse position
+     - use more often NULL in case of no entries. This is less
+       biasing in case of averaging of values
+
+    * macros/tutorials/readrfl.C:
+      - print run header
+      - print event header
+      - skip empty events
+
+   * mhist/MHEvent.cc:
+     - removed the pointing from the histogram names. It's 
+       simply obsolete
+
+   * mjobs/MJSpectrum.[h,cc]: 
+     - removed the kolmogorov test from output
+     - added a new tab showing the energy resolution
+     - therefore added a new BinningImpact to the list of binnings
+     - store the ganymed file's file name in the output
+
+   * mmain/MEventDisplay.cc:
+     - skip events without data in the loop not in the code.
+       This ensures that no task can crash due to this
+       when processing MCs
+
+   * mraw/MRawRunHeader.cc:
+     - the number of events in format version V9 seems to be
+       to high by one. We correct for this.
 
 
Index: trunk/MagicSoft/Mars/NEWS
===================================================================
--- trunk/MagicSoft/Mars/NEWS	(revision 8940)
+++ trunk/MagicSoft/Mars/NEWS	(revision 8941)
@@ -64,4 +64,6 @@
      (Eest-Emc)/Est and the distributions (Eest-Emc)/Eest vs. Eest
      and (Eest-Emc)/Emc vs Emc.
+
+   * fixed mars (event display) for merpped raw-data and MC data
 
  ;merpp
Index: trunk/MagicSoft/Mars/mmain/MEventDisplay.cc
===================================================================
--- trunk/MagicSoft/Mars/mmain/MEventDisplay.cc	(revision 8940)
+++ trunk/MagicSoft/Mars/mmain/MEventDisplay.cc	(revision 8941)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.62 2007-07-03 14:18:03 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.63 2008-06-12 14:40:21 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -235,4 +235,8 @@
     tlist->AddToList(read);
 
+    MContinue *mcevts = new MContinue("MRawEvtData.GetNumPixels==0", "ContEmpty");
+    if (type==2)
+        tlist->AddToList(mcevts);
+
     MFEvtNumber *evtnum = new MFEvtNumber;
     tlist->AddToList(evtnum);
@@ -607,5 +611,5 @@
     MTaskList   *tlist = (MTaskList*)  fEvtLoop->GetTaskList();
     MGeomCam    *geom  = (MGeomCam*)   plist->FindObject("MGeomCam");
-    MRawEvtData *raw   = (MRawEvtData*)plist->FindObject("MRawEvtData");
+    //MRawEvtData *raw   = (MRawEvtData*)plist->FindObject("MRawEvtData");
 
     //
@@ -637,6 +641,6 @@
 
         // Define other continue conditions
-        if (raw && raw->GetNumPixels()<1)
-            rc = kCONTINUE;
+        //if (raw && raw->GetNumPixels()<1)
+        //    rc = kCONTINUE;
 
     } while (rc==kCONTINUE && dir!=0);
Index: trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc
===================================================================
--- trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc	(revision 8940)
+++ trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc	(revision 8941)
@@ -484,5 +484,10 @@
 
     if (fFormatVersion>8)
+    {
         fin.read((char*)&fNumEventsRead, 4);     // Total=70
+        fNumEvents--;
+        fNumEventsRead--;
+        *fLog << inf << "Format V9: Stored number of events decreased by 1." << endl;
+    }
 
     // New in general features: (should they be included in new MAGIC1 formats, too?)