Changeset 966 for trunk

Timestamp:

10/16/01 16:00:18 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mars.cc (modified) (1 diff)
• merpp.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/mars.cc

@@ -18 +18 @@
     // initialise ROOT
     //
-    TROOT simple("Mars", "MARS - MAGIC analysis and reconstruction software");
+    TROOT simple("mars", "MARS - Magic Analysis and Reconstruction Software");
 
     TApplication app("MarsApp", &argc, argv);

trunk/MagicSoft/Mars/merpp.cc

@@ -48 +48 @@
         gLog << "Sorry the usage is:" << endl;
         gLog << "   merpp inputfile outputfile [compression level]" << endl << endl;
+        gLog << "     input file:   Magic DAQ binary file." << endl;
+        gLog << "     ouput file:   Merpped root file." << endl;
+        gLog << "     compr. level: 1..9 [9]" << endl << ednl;
         return -1;
     }
@@ -61 +64 @@
     //     initialize ROOT  (this is obligatory here)
     //
-    TROOT simple("Merpp","Mars - Merging and Preprocessing Program");
+    TROOT simple("merpp", "Mars - Merging and Preprocessing Program");
 
     //
@@ -68 +71 @@
     if (gSystem->AccessPathName(kNamein, kFileExists))
     {
-        gLog << "Sorry, the file '" << kNamein << "' doesn't exist." << endl;
+        gLog << "Sorry, the input file '" << kNamein << "' doesn't exist." << endl;
         return -1;
     }
 
     if (!gSystem->AccessPathName(kNameout, kFileExists))
-        gLog << "Warning: The file '" << kNameout << "' exists." << endl;
+        gLog << "Warning: A file '" << kNameout << "' exists." << endl;
     else
         if (!gSystem->AccessPathName(kNameout, kWritePermission))
@@ -89 +92 @@
     MTaskList tasks;
     plist.AddToList(&tasks);
-
+/*
     MRawRunHeader runheader;
     plist.AddToList(&runheader);
@@ -104 +107 @@
     MTime evttime("MRawEvtTime");
     plist.AddToList(&evttime);
-
+*/
     //
     // create the tasks which should be executed and add them to the list
@@ -111 +114 @@
     //
     MRawFileRead  reader(kNamein);
-    MRawFileWrite writer(kNameout, "RECREATE", "Title", kComprlvl);
+    MRawFileWrite writer(kNameout, "RECREATE", "Magic root-file", kComprlvl);
     tasks.AddToList(&reader);
     tasks.AddToList(&writer);
@@ -119 +122 @@
     // and the tasks to execute
     //
-
     MEvtLoop magic;
-
     magic.SetParList(&plist);
 
@@ -131 +132 @@
     // (I'm think of a task like MRawDataCheck)
     //
-    magic.Eventloop();
+    if (!magic.Eventloop())
+    {
+        gLog << "ERROR: Merging and preprocessing failed!" << endl;
+        return -1;
+    }
 
+    gLog << "Merpp finished successfull!" << endl;
     return 0;
 }