Changeset 654 for trunk/MagicSoft/Mars/merpp.cc

Timestamp:

03/01/01 15:56:58 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/merpp.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/merpp.cc

@@ -43 +43 @@
     // check for the right usage of the program
     //
-    if (argc!=3)
+    if (argc<3 || argc>4)
     {
         gLog << "Sorry the usage is:" << endl;
-        gLog << "   merpp inputfile outputfile" << endl << endl;
+        gLog << "   merpp inputfile outputfile [compression level]" << endl << endl;
         return -1;
     }
+
+    //
+    // This is to make argv[i] more readable insidethe code
+    //
+    const char *kNamein   = argv[1];
+    const char *kNameout  = argv[2];
+    const int   kComprlvl = argc==4 ? atoi(argv[3]) : 9;
 
     //
@@ -58 +65 @@
     // check whether the given files are OK.
     //
-    if (gSystem->AccessPathName(argv[1], kFileExists))
+    if (gSystem->AccessPathName(kNamein, kFileExists))
     {
-        gLog << "Sorry, the file '" << argv[1] << "' doesn't exist." << endl;
+        gLog << "Sorry, the file '" << kNamein << "' doesn't exist." << endl;
         return -1;
     }
 
-    if (!gSystem->AccessPathName(argv[2], kFileExists))
-        gLog << "Warning: The file '" << argv[2] << "' exists." << endl;
+    if (!gSystem->AccessPathName(kNameout, kFileExists))
+        gLog << "Warning: The file '" << kNameout << "' exists." << endl;
     else
-        if (!gSystem->AccessPathName(argv[2], kWritePermission))
+        if (!gSystem->AccessPathName(kNameout, kWritePermission))
         {
-            gLog << "Sorry, you don't have write permission for '" << argv[2] << "'." << endl;
+            gLog << "Sorry, you don't have write permission for '" << kNameout << "'." << endl;
             return -1;
         }
@@ -77 +84 @@
     // and an (empty) list of tasks which should be executed
     //
-    MParList *plist  = new MParList;
+    MParList plist;
 
-    MTaskList *tasks = new MTaskList;
-    plist->AddToList(tasks);
+    MTaskList tasks;
+    plist.AddToList(&tasks);
 
-    MRawRunHeader *runheader = new MRawRunHeader;
-    plist->AddToList(runheader);
+    MRawRunHeader runheader;
+    plist.AddToList(&runheader);
 
-    MRawEvtHeader *evtheader = new MRawEvtHeader;
-    plist->AddToList(evtheader);
+    MRawEvtHeader evtheader;
+    plist.AddToList(&evtheader);
 
-    MRawEvtData *evtdata = new MRawEvtData;
-    plist->AddToList(evtdata);
+    MRawEvtData evtdata;
+    plist.AddToList(&evtdata);
 
-    MRawCrateArray *cratearray = new MRawCrateArray;
-    plist->AddToList(cratearray);
+    MRawCrateArray cratearray;
+    plist.AddToList(&cratearray);
 
-    MTime *evttime = new MTime("MRawEvtTime");
-    plist->AddToList(evttime);
+    MTime evttime("MRawEvtTime");
+    plist.AddToList(&evttime);
 
     //
@@ -102 +109 @@
     // be created by MRawFileRead::PreProcess
     //
-    MRawFileRead  *reader = new MRawFileRead(argv[1]);
-    MRawFileWrite *writer = new MRawFileWrite(argv[2], "RECREATE");
-    tasks->AddToList(reader);
-    tasks->AddToList(writer);
+    MRawFileRead  reader(kNamein);
+    MRawFileWrite writer(kNameout, "RECREATE", "Title", kComprlvl);
+    tasks.AddToList(&reader);
+    tasks.AddToList(&writer);
 
     //
@@ -114 +121 @@
     MEvtLoop magic;
 
-    magic.SetParList(plist);
+    magic.SetParList(&plist);
 
     //