Changeset 1487 for trunk/MagicSoft/Mars/mbase

Timestamp:

08/07/02 14:32:26 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MEvtLoop.cc (modified) (6 diffs)
• MEvtLoop.h (modified) (1 diff)
• MFilterList.cc (deleted)
• MFilterList.h (deleted)
• MParContainer.cc (modified) (2 diffs)
• MParList.cc (modified) (1 diff)
• MTaskList.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -92 +92 @@
 //! Also we can derive MEvtLoop from MTaskList to have a static tasklist, too
 //!
+
+TList *gListOfPrimitives; // forard declaration in MParContainer.h
 
 // --------------------------------------------------------------------------
@@ -346 +348 @@
 
     fout << "}" << endl;
+
+    *fLog << inf << "Macro '" << name << "' written." << endl;
 }
 
@@ -365 +369 @@
         out << endl;
     }
+
+    gListOfPrimitives = new TList;
 
     if (fParList)
@@ -376 +382 @@
     out << "   if (!evtloop.Eventloop())" << endl;
     out << "      return;" << endl;
+
+    gListOfPrimitives->ForEach(TObject, ResetBit)(BIT(15));
+    delete gListOfPrimitives;
+    gListOfPrimitives = 0;
+
+    // remove all objects with BIT(15) set from gObjectTable
 }
 
@@ -477 +489 @@
     HasDuplicateNames(list, "MEvtLoop::Read");
 
+    *fLog << inf << "Eventloop '" << name << "' read from file." << endl;
+
     return n;
+}
+
+// --------------------------------------------------------------------------
+//
+// If available print the contents of the parameter list.
+//
+void MEvtLoop::Print(Option_t *opt="") const
+{
+    if (fParList)
+        fParList->Print();
+    else
+        *fLog << all << "MEvtloop: No Parameter List available." << endl;
 }
 
@@ -530 +556 @@
     HasDuplicateNames(list, "MEvtLoop::Write");
 
+    *fLog << inf << "Eventloop written to file as " << name << "." << endl;
+
     return n;
 }

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -53 +53 @@
     void SavePrimitive(ofstream &out, Option_t *o="");
 
-    Int_t Read(const char *name);
-    Int_t Write(const char *name=0, Int_t option=0, Int_t bufsize=0);
+    Int_t Read(const char *name="Evtloop");
+    Int_t Write(const char *name="Evtloop", Int_t option=0, Int_t bufsize=0);
+
+    void Print(Option_t *opt="") const;
 
     ClassDef(MEvtLoop, 1) // Class to execute the tasks in a tasklist
 };
 
+R__EXTERN TList *gListOfPrimitives; // instantiation in MEvtLoop
+
 #endif

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -51 +51 @@
 #include "MLogManip.h"
 
+#include "MEvtLoop.h"    // gListOfPrimitives
+
 ClassImp(MParContainer);
 
@@ -383 +385 @@
         return;
 
-    SetUniqueID(uid++/*gRandom->Uniform(kMaxInt)*/);
+    SetUniqueID(uid++);
+    SetBit(kIsSavedAsPrimitive);
+
+    if (gListOfPrimitives && !gListOfPrimitives->FindObject(this))
+        gListOfPrimitives->Add(this);
+
     StreamPrimitive(out);
-    SetBit(kIsSavedAsPrimitive);
 }
 

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -672 +672 @@
 {
     out << "   MParList " << GetUniqueName();
-    if (fName!=gsDefName)
+    if (fName!=gsDefName || fTitle!=gsDefTitle)
     {
         out << "(\"" << fName << "\"";

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -525 +525 @@
 {
     out << "   MTaskList " << GetUniqueName();
-    if (fName!=gsDefName)
+    if (fName!=gsDefName || fTitle!=gsDefTitle)
     {
         out << "(\"" << fName << "\"";