Changeset 843 for trunk/MagicSoft

Timestamp:

06/12/01 13:08:58 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• BaseLinkDef.h (modified) (1 diff)
• MEvtLoop.cc (modified) (3 diffs)
• MParContainer.cc (modified) (3 diffs)
• MParContainer.h (modified) (2 diffs)
• MParList.cc (modified) (1 diff)
• MParList.h (modified) (1 diff)
• MTaskList.cc (modified) (4 diffs)
• MTaskList.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -29 +29 @@
 
 #pragma link C++ class MReadTree;
+#pragma link C++ class MWriteAsciiFile;
 
 #pragma link C++ class MArray;

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -54 +54 @@
 
 #include "MLog.h"
+#include "MLogManip.h"
+
 #include "MParList.h"
 #include "MTaskList.h"
@@ -87 +89 @@
     if (!fParList)
     {
-        *fLog << "MEvtLoop::Eventloop - Error: Parlist not initialized." << endl;
+        *fLog << dbginf << "Parlist not initialized." << endl;
         return kFALSE;
     }
@@ -98 +100 @@
     if (!fTaskList)
     {
-        *fLog << "MEvtLoop::Eventloop - Error: Cannot find tasklist '" << tlist << "' in parameter list." << endl;
+        *fLog << dbginf << "Cannot find tasklist '" << tlist << "' in parameter list." << endl;
         return kFALSE;
     }

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -53 +53 @@
     *fName = *(named.fName);
     *fTitle = *(named.fTitle);
+
+    fLog = named.fLog;
+
+    fHasChanged = named.fHasChanged;
 }
 
@@ -65 +69 @@
         *fName  = *(rhs.fName);
         *fTitle = *(rhs.fTitle);
+        fLog    = rhs.fLog;
+        fHasChanged = rhs.fHasChanged;
     }
     return *this;
@@ -89 +95 @@
     *(((MParContainer&)obj).fName)  = *fName;
     *(((MParContainer&)obj).fTitle) = *fTitle;
+    ((MParContainer&)obj).fLog   = fLog;
+    ((MParContainer&)obj).fHasChanged = fHasChanged;
 }
 

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -35 +35 @@
 
 protected:
-    MLog    *fLog;    //! The general log facility for this object, initialized with the global object
+    MLog    *fLog;        //! The general log facility for this object, initialized with the global object
 
-    TString *fName;   //! parameter container identifier (name)
-    TString *fTitle;  //! parameter container title
+    TString *fName;       //! parameter container identifier (name)
+    TString *fTitle;      //! parameter container title
+
+    Bool_t   fHasChanged; //! should be set to true if the contents of the container is changed somehow
 
 public:
-    MParContainer(const char *name="", const char *title="") : fLog(&gLog) { Init(name, title); }
-    MParContainer(const TString &name, const TString &title) : fLog(&gLog) { Init(name, title); }
+    MParContainer(const char *name="", const char *title="") : fLog(&gLog), fHasChanged(kFALSE) { Init(name, title); }
+    MParContainer(const TString &name, const TString &title) : fLog(&gLog), fHasChanged(kFALSE) { Init(name, title); }
     MParContainer(const MParContainer &named);
     MParContainer& operator=(const MParContainer& rhs);
@@ -65 +67 @@
     virtual Int_t    Sizeof() const;
 
+    virtual void     Reset() {};
+
+    virtual Bool_t HasChanged() { return fHasChanged; }
+    virtual void   SetHasChanged(Bool_t flag=kTRUE) { fHasChanged=flag; }
+
     virtual void AsciiRead(ifstream &fin) {};
     virtual void AsciiWrite(ofstream &fout) const {};

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -251 +251 @@
 void MParList::Print(Option_t *t)
 {
-  *fLog << dbginf << "ParList: " << this->GetName() << " <" << this->GetTitle() << ">" << endl;
-  *fLog << endl;
-  
-}
-
+    *fLog << dbginf << "ParList: " << this->GetName() << " <" << this->GetTitle() << ">" << endl;
+    *fLog << endl;
+}
+
+// --------------------------------------------------------------------------
+//
+//   Sets the flags off all containers in the list (and the list
+//   itself) to unchanged
+//
+void MParList::SetHasChanged(Bool_t flag)
+{
+    TIter Next(&fContainer);
+
+    MParContainer *cont=NULL;
+
+    //
+    // loop over all tasks for preproccesing
+    //
+    while ( (cont=(MParContainer*)Next()) )
+        cont->SetHasChanged(flag);
+
+    MParContainer::SetHasChanged(flag);
+}
+
+void MParList::Reset()
+{
+    return;
+    TIter Next(&fContainer);
+
+    MParContainer *cont=NULL;
+
+    //
+    // loop over all tasks for preproccesing
+    //
+    while ( (cont=(MParContainer*)Next()) )
+        cont->Reset();
+}

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -44 +44 @@
     MParContainer *FindCreateObj(const char *classname, const char *objname=NULL);
 
+    void Reset();
+    void SetHasChanged(Bool_t flag=kTRUE);
+
     void Print(Option_t *t = NULL);
 

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -135 +135 @@
     *fLog << "Preprocessing... " << flush;
 
+    fParList = pList;
+
     //
     //  create the Iterator over the tasklist
@@ -149 +151 @@
         *fLog << task->GetName() << "... " << flush;
 
-        if (!task->PreProcess( pList ))
+        if (!task->PreProcess(fParList))
             return kFALSE;
     }
@@ -164 +166 @@
 Bool_t MTaskList::Process()
 {
+    //
+    // Reset the HasChanged flag.
+    // Reset all containers.
+    //
+    fParList->SetHasChanged(kFALSE);
+    fParList->Reset();
+
     //
     //  create the Iterator for the TaskList
@@ -218 +227 @@
     *fLog << "Postprocessing... " << flush;
 
+    // FIXME: At the moment all containers are post processed independ of
+    // whether it was preprocessed or not.
+
     //
     //  create the Iterator for the TaskList

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -25 +25 @@
 private:
     TOrdCollection fTasks;      // Container for the ordered list of different tasks
+    MParList      *fParList;
 
 public: