Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 7800)
+++ trunk/MagicSoft/Mars/Changelog	(revision 7801)
@@ -18,4 +18,13 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2006/07/26 Thomas Bretz
+
+   * merpp.cc:
+     - files with the extension .raw.gz were not found. fixed. This
+       is necessary because raw-files must be merpped before they can
+       be displayed with the mars-gui.
+
+
+
  2006/07/23 Thomas Bretz
  
Index: trunk/MagicSoft/Mars/datacenter/macros/fillsinope.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/fillsinope.C	(revision 7800)
+++ trunk/MagicSoft/Mars/datacenter/macros/fillsinope.C	(revision 7801)
@@ -108,6 +108,4 @@
     for (Int_t i=0 ; i<9 ; i++)
     {
-//        cout << "value: " << values[i] << endl;
-//        cout << "str: " << str << endl;
         str = env.GetValue(values[i], "");
         if (str.IsNull())
Index: trunk/MagicSoft/Mars/mbase/MContinue.h
===================================================================
--- trunk/MagicSoft/Mars/mbase/MContinue.h	(revision 7800)
+++ trunk/MagicSoft/Mars/mbase/MContinue.h	(revision 7801)
@@ -26,7 +26,7 @@
 
     // MTask
-    Int_t PreProcess(MParList *list);
-    Int_t Process() { return kCONTINUE; }
-    Int_t PostProcess();
+    Int_t  PreProcess(MParList *list);
+    Int_t  Process() { return kCONTINUE; }
+    Int_t  PostProcess();
 
     // MContinue
Index: trunk/MagicSoft/Mars/merpp.cc
===================================================================
--- trunk/MagicSoft/Mars/merpp.cc	(revision 7800)
+++ trunk/MagicSoft/Mars/merpp.cc	(revision 7801)
@@ -64,7 +64,7 @@
     gLog << all << endl;
     gLog << "Sorry the usage is:" << endl;
-    gLog << " merpp [options] inputfile[.rep,[.raw],[.txt]] [outputfile[.root]]" << endl << endl;
+    gLog << " merpp [options] inputfile[.rep,[.raw.gz],[.txt]] [outputfile[.root]]" << endl << endl;
     gLog << " Arguments:" << endl;
-    gLog << "   inputfile.raw             Magic DAQ binary file." << endl;
+    gLog << "   inputfile.raw[.gz]        Magic DAQ binary file." << endl;
     gLog << "   inputfile.rep             Magic Central Control report file." << endl;
     gLog << "   inputfile.txt             Magic DC currents file." << endl;
@@ -213,6 +213,6 @@
     const Bool_t israw    = !isreport && !isdc;
 
-    if (!kNamein.EndsWith(".raw") && israw)
-        kNamein += ".raw";
+    if (!kNamein.EndsWith(".raw") && !kNamein.EndsWith(".raw.gz") && israw)
+        kNamein += ".raw.gz";
 
     if (kNameout.IsNull())
Index: trunk/MagicSoft/Mars/star.cc
===================================================================
--- trunk/MagicSoft/Mars/star.cc	(revision 7800)
+++ trunk/MagicSoft/Mars/star.cc	(revision 7801)
@@ -30,5 +30,5 @@
     gLog << "                   Star - MARS V" << MARSVER              << endl;
     gLog << "      MARS -- STandard Analysis and Reconstruction"       << endl;
-    gLog << "   Compiled with ROOT v" << ROOTVER << " on <" << __DATE__ << ">" << endl;
+    gLog << "     Compiled with ROOT v" << ROOTVER << " on <" << __DATE__ << ">" << endl;
     gLog << "========================================================" << endl;
     gLog << endl;