Changeset 1524 for trunk/MagicSoft/Mars/mbase

Timestamp:

09/16/02 10:10:17 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MFilter.cc (modified) (1 diff)
• MLog.cc (modified) (5 diffs)
• MLog.h (modified) (2 diffs)
• MParList.cc (modified) (7 diffs)
• MParList.h (modified) (4 diffs)
• MTaskList.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MFilter.cc

@@ -101 +101 @@
 TString MFilter::GetRule() const
 {
-    return "<GetRule not available for " + fName + ">";
+    return "<GetRule n/a for " + fName + ">";
 }

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -75 +75 @@
 // which is used for the output (i)
 //
-MLog::MLog(int i) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(i), fGuiLineId(0), fout(NULL), fOutAllocated(kFALSE), fgui(NULL)
+MLog::MLog(int i) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(i), fIsNull(kFALSE), fGuiLineId(0), fout(NULL), fOutAllocated(kFALSE), fgui(NULL)
 {
     Init();
@@ -85 +85 @@
 // ofstream as the default output device
 //
-MLog::MLog(ofstream &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fGuiLineId(0),  fout(&out), fOutAllocated(kFALSE), fgui(NULL)
+MLog::MLog(ofstream &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fGuiLineId(0),  fout(&out), fOutAllocated(kFALSE), fgui(NULL)
 {
     Init();
@@ -106 +106 @@
 // or not.
 //
-MLog::MLog(const char *fname, int flag) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fGuiLineId(0),  fgui(NULL)
+MLog::MLog(const char *fname, int flag) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fGuiLineId(0),  fgui(NULL)
 {
     Init();
@@ -132 +132 @@
 void MLog::WriteBuffer()
 {
+    //
+    // restart writing to the buffer at its first char
+    //
     const int len = fPPtr - fBase;
+
+    fPPtr = fBase;
+
+    if (fIsNull)
+        return;
 
     if (fDevice&eStdout)
@@ -153 +161 @@
         delete dummy;
     }
-
-    //
-    // restart writing to the buffer at its first char
-    //
-    fPPtr = fBase;
 }
 

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -31 +31 @@
     UInt_t fDebugLevel;      //! Present global debug level
     UInt_t fDevice;          //! Flag to indicate the present streams
+
+    Bool_t fIsNull;          //! Switch output completely off
 
     Int_t fGuiLineId;
@@ -122 +124 @@
     }
 
+    void SetNullOutput(Bool_t n=kTRUE) { fIsNull = n; }
+
     ClassDef(MLog, 0) // This is what we call 'The logging system'
 };

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -50 +50 @@
 #include "MLogManip.h"
 
+#include "MIter.h"
+
 ClassImp(MParList);
 
@@ -105 +107 @@
     //     automatically deleted.
     //
-    TestBit(kIsOwner) ? fContainer->SetOwner() : fAutodelete->SetOwner();
+    IsOwner() ? fContainer->SetOwner() : fAutodelete->SetOwner();
+
+    // FIXME? If fContainer is owner do we have to remove the object
+    //   from fAutodelete due to the acces when checking for a
+    //   garbage collection?
 
     delete fContainer;
@@ -236 +242 @@
     {
         *fLog << warn << "No object with the same name '";
-        *fLog << cont->GetName() << "' in list... ignored." << endl;
-        return kFALSE;
+        *fLog << cont->GetName() << "' in list... adding." << endl;
+        return AddToList(cont);
     }
 
     fContainer->Remove(obj);
 
-    if (TestBit(kIsOwner) && !fAutodelete->FindObject(obj))
+    if (IsOwner() && !fAutodelete->FindObject(obj))
         delete obj;
 
-    *fLog << inf << "MParContainer '" << obj->GetName() << "' found and replaced..." << endl;
+    *fLog << inf << "MParContainer '" << cont->GetName() << "' found and replaced..." << endl;
 
     return AddToList(cont);
+}
+
+// --------------------------------------------------------------------------
+//
+//  Find an object with the same name in the list and remove it.
+//  If the kIsOwner flag is set and the object was not created
+//  automatically, the object is deleted.
+//
+void MParList::Remove(MParContainer *cont)
+{
+    //
+    //  check if the object (you want to add) exists
+    //
+    if (!cont)
+        return;
+
+    TObject *obj = fContainer->Remove(cont);
+    if (!obj)
+    {
+        *fLog << warn << "Object not found in list..." << endl;
+        return;
+    }
+
+    *fLog << inf << "MParContainer '" << cont->GetName() << "' removed..." << endl;
+
+    if (IsOwner() && !fAutodelete->FindObject(obj))
+        delete obj;
 }
 
@@ -470 +503 @@
     TIter Next(fContainer);
     while ((obj=(MParContainer*)Next()))
-        *fLog << " " << obj->GetDescriptor() << endl;
+    {
+        *fLog << " " << obj->GetDescriptor();
+        if (fAutodelete->FindObject(obj))
+            *fLog << " <autodel>";
+        *fLog << endl;
+    }
     *fLog << endl;
 }
@@ -492 +530 @@
 {
     fContainer->ForEach(MParContainer, Reset)();
-}
+ }
 
 // --------------------------------------------------------------------------
@@ -663 +701 @@
 }
 
+void MParList::SavePrimitive(ofstream &out, Option_t *o)
+{
+    Bool_t saved = IsSavedAsPrimitive();
+
+    MParContainer::SavePrimitive(out);
+
+    MIter Next(fContainer);
+
+    MParContainer *cont = NULL;
+    while ((cont=Next()))
+    {
+        //
+        // Because it was automatically created don't store its primitive
+        // I guess it will be automatically created again
+        //
+        if (fAutodelete->FindObject(cont) || cont->IsSavedAsPrimitive())
+            continue;
+
+        cont->SavePrimitive(out, "");
+
+        out << "   " << GetUniqueName() << ".";
+        out << (cont->InheritsFrom("MTaskList") && saved ? "Replace" : "AddToList");
+        out << "(&" << cont->GetUniqueName() << ");" << endl << endl;
+    }
+}
+
 // --------------------------------------------------------------------------
 //
@@ -680 +744 @@
     }
     out << ";" << endl << endl;
-
-    TIter Next(fContainer);
-
-    MParContainer *cont = NULL;
-    while ((cont=(MParContainer*)Next()))
-    {
-        cont->SavePrimitive(out, "");
-
-        out << "   " << GetUniqueName() << ".AddToList(&";
-        out << cont->GetUniqueName() << ");" << endl << endl;
-    }
 }
 

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -36 +36 @@
 
 public:
+    enum { kDoNotReset = BIT(15) };
+
     MParList(const char *name=NULL, const char *title=NULL);
     MParList(MParList &ts);
@@ -45 +47 @@
 
     Bool_t Replace(MParContainer *obj);
+    void   Remove(MParContainer *obj);
 
     void SetLogStream(MLog *log);
@@ -78 +81 @@
 
     void SetOwner(Bool_t enable=kTRUE);
+    Bool_t IsOwner() const { return TestBit(kIsOwner); }
 
     void Print(Option_t *t = NULL) const;
@@ -84 +88 @@
     void SetNames(TObjArray &arr);
 
+    void SavePrimitive(ofstream &out, Option_t *o="");
+
     ClassDef(MParList, 1) // list of parameter containers (MParContainer)
 };

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -372 +372 @@
     // Reset all containers.
     //
-    // FIXME: To run a tasklist as a single task in another tasklist we
-    //        have to make sure, that the Parameter list isn't reset.
-    //
-    fParList->SetReadyToSave(kFALSE);
-    fParList->Reset();
+    // Make sure, that the parameter list is not reset from a tasklist
+    // running as a task in another tasklist.
+    //
+    const Bool_t noreset = fParList->TestBit(MParList::kDoNotReset);
+    if (!noreset)
+    {
+        fParList->SetReadyToSave();
+        fParList->Reset();
+        fParList->SetBit(MParList::kDoNotReset);
+    }
 
     //
@@ -428 +433 @@
     }
 
+    if (!noreset)
+        fParList->ResetBit(MParList::kDoNotReset);
+
     return kTRUE;
 }