Changeset 7801 for trunk

Timestamp:

07/26/06 10:36:25 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/fillsinope.C (modified) (1 diff)
• mbase/MContinue.h (modified) (1 diff)
• merpp.cc (modified) (2 diffs)
• star.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- 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
  

trunk/MagicSoft/Mars/datacenter/macros/fillsinope.C

@@ -108 +108 @@
     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())

trunk/MagicSoft/Mars/mbase/MContinue.h

@@ -26 +26 @@
 
     // 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

trunk/MagicSoft/Mars/merpp.cc

@@ -64 +64 @@
     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 +213 @@
     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())

trunk/MagicSoft/Mars/star.cc

@@ -30 +30 @@
     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;