Changeset 2958 for trunk/MagicSoft/Mars/mbase

Timestamp:

01/29/04 16:52:22 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MParList.h (modified) (1 diff)
• MTaskList.cc (modified) (10 diffs)

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -36 +36 @@
 
 public:
-    enum { kDoNotReset = BIT(17) };
+    enum { kDoNotReset = BIT(17), kIsProcessing = BIT(18) };
 
     MParList(const char *name=NULL, const char *title=NULL);

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -308 +308 @@
     *fLog << all << "Reinit... " << flush;
 
+    if (!pList)
+        pList = fParList;
+
+    //
+    // Make sure, that the ReadyToSave flag is not reset from a tasklist
+    // running as a task in another tasklist.
+    //
+    const Bool_t noreset = pList->TestBit(MParList::kDoNotReset);
+    if (!noreset)
+        pList->SetBit(MParList::kDoNotReset);
+
     //
     //  create the Iterator over the tasklist
@@ -314 +325 @@
 
     MTask *task=NULL;
+
     //
     // loop over all tasks for reinitialization
@@ -321 +333 @@
         *fLog << all << task->GetName() << "... " << flush;
 
-        if (!task->ReInit(pList?pList:fParList))
+        if (!task->ReInit(pList/*?pList:fParList*/))
         {
             *fLog << err << "ERROR - ReInit of Task '" << task->GetDescriptor() << "' failed." << endl;
@@ -329 +341 @@
 
     *fLog << all << endl;
+
+    //
+    // Reset the ReadyToSave flag.
+    //
+    if (!noreset)
+    {
+        pList->SetReadyToSave(kFALSE);
+        pList->ResetBit(MParList::kDoNotReset);
+    }
 
     return kTRUE;
@@ -366 +387 @@
     fParList = pList;
 
-    fTasksProcess.Clear();
+    //
+    // Make sure, that the ReadyToSave flag is not reset from a tasklist
+    // running as a task in another tasklist.
+    //
+    const Bool_t noreset = fParList->TestBit(MParList::kDoNotReset);
+    if (!noreset)
+        fParList->SetBit(MParList::kDoNotReset);
 
     //
@@ -406 +433 @@
     *fLog << all << endl;
 
+    //
+    // Reset the ReadyToSave flag.
+    //
+    if (!noreset)
+    {
+        fParList->SetReadyToSave(kFALSE);
+        fParList->ResetBit(MParList::kDoNotReset);
+    }
+
+    //
+    // loop over all tasks to fill fTasksProcess
+    //
     Next.Reset();
-
-    //
-    // loop over all tasks for preproccesing
-    //
+    fTasksProcess.Clear();
     while ((task=(MTask*)Next()))
         if (task->OverwritesProcess())
@@ -441 +477 @@
     // running as a task in another tasklist.
     //
-    const Bool_t noreset = fParList->TestBit(MParList::kDoNotReset);
+    const Bool_t noreset = fParList->TestBit(MParList::kIsProcessing);
     if (!noreset)
     {
-        fParList->SetReadyToSave(kFALSE);
+        fParList->SetBit(MParList::kIsProcessing);
         fParList->Reset();
-        fParList->SetBit(MParList::kDoNotReset);
     }
 
@@ -514 +549 @@
 
     if (!noreset)
-        fParList->ResetBit(MParList::kDoNotReset);
+    {
+        fParList->SetReadyToSave(kFALSE);
+        fParList->ResetBit(MParList::kIsProcessing);
+    }
 
     return rc;
@@ -535 +573 @@
 
     //
-    // Reset the ReadyToSave flag.
-    // 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 ReadyToSave flag is not reset from a tasklist
+    // running as a task in another tasklist.
+    //
+    const Bool_t noreset = fParList->TestBit(MParList::kDoNotReset);
+    if (!noreset)
+    {
+        fParList->SetBit(MParList::kDoNotReset);
+        fParList->Reset();
+    }
 
     //
@@ -566 +605 @@
 
     *fLog << all << endl;
+
+    //
+    // Reset the ReadyToSave flag.
+    //
+    if (!noreset)
+    {
+        fParList->SetReadyToSave(kFALSE);
+        fParList->ResetBit(MParList::kDoNotReset);
+    }
 
     return kTRUE;