Changeset 776 for trunk/MagicSoft

Timestamp:

04/27/01 14:34:12 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/merpp.C (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2001/04/27: Thomas Bretz
+
+   * macros/merpp.C:
+     - made the merpp-macro Mars 0.3 compatible
+
+
 
  2001/04/19: Thomas Bretz

trunk/MagicSoft/Mars/macros/merpp.C

@@ -19 +19 @@
     // and an (empty) list of tasks which should be executed
     //
-    MParList *plist  = new MParList;
-    MTaskList *tasks = new MTaskList;
+    MTaskList tasks;
+    MParList plist;
+
+    plist.AddToList(&tasks);
 
     //
@@ -32 +34 @@
     //         (Using root 2.25/03, with Cint 5.14.50 on OSF1)
     //
-    MRawFileWrite *writer = new MRawFileWrite("rawtest.root", "RECREATE");
-    MRawFileRead  *reader = new MRawFileRead("rawtest.bin");
-    tasks->AddToList(reader);
-    tasks->AddToList(writer);
+
+    MRawFileRead  reader("/home/tbretz/data/20010219-00020-d-octobertest-e");
+    MRawFileWrite writer("otest.root", "RECREATE");
+    tasks.AddToList(&reader);
+    tasks.AddToList(&writer);
 
     //
@@ -43 +46 @@
     MEvtLoop magic;
 
-    magic.SetParList(plist);
-    magic.SetTaskList(tasks);
+    magic.SetParList(&plist);
 
     //