Changeset 855 for trunk/MagicSoft/Mars/mbase

Timestamp:

07/05/01 13:23:12 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MParContainer.cc (modified) (3 diffs)
• MParContainer.h (modified) (2 diffs)
• MParList.cc (modified) (2 diffs)
• MParList.h (modified) (1 diff)
• MReadTree.cc (modified) (4 diffs)
• MTaskList.cc (modified) (3 diffs)
• MWriteAsciiFile.cc (modified) (2 diffs)
• MWriteRootFile.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -51 +51 @@
 MParContainer::MParContainer(const MParContainer &named)
 {
-    *fName = *(named.fName);
+    *fName  = *(named.fName);
     *fTitle = *(named.fTitle);
 
     fLog = named.fLog;
 
-    fHasChanged = named.fHasChanged;
+    fReadyToSave = named.fReadyToSave;
 }
 
@@ -73 +73 @@
     *fTitle = *(rhs.fTitle);
 
-    fLog        = rhs.fLog;
-    fHasChanged = rhs.fHasChanged;
+    fLog         = rhs.fLog;
+    fReadyToSave = rhs.fReadyToSave;
 
     return *this;
@@ -103 +103 @@
     *cont.fTitle = *fTitle;
 
-    cont.fLog        = fLog;
-    cont.fHasChanged = fHasChanged;
+    cont.fLog         = fLog;
+    cont.fReadyToSave = fReadyToSave;
 }
 

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
+    Bool_t   fReadyToSave; //! should be set to true if the contents of the container is changed somehow
 
 public:
-    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 char *name="", const char *title="") : fLog(&gLog), fReadyToSave(kFALSE) { Init(name, title); }
+    MParContainer(const TString &name, const TString &title) : fLog(&gLog), fReadyToSave(kFALSE) { Init(name, title); }
     MParContainer(const MParContainer &named);
     MParContainer& operator=(const MParContainer& rhs);
@@ -69 +69 @@
     virtual void     Reset() {};
 
-    virtual Bool_t HasChanged() { return fHasChanged; }
-    virtual void   SetHasChanged(Bool_t flag=kTRUE) { fHasChanged=flag; }
+    virtual Bool_t IsReadyToSave() { return fReadyToSave; }
+    virtual void   SetReadyToSave(Bool_t flag=kTRUE) { fReadyToSave=flag; }
 
     virtual void AsciiRead(ifstream &fin);

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -265 +265 @@
 //   itself) to unchanged
 //
-void MParList::SetHasChanged(Bool_t flag)
+void MParList::SetReadyToSave(Bool_t flag)
 {
     TIter Next(&fContainer);
@@ -275 +275 @@
     //
     while ( (cont=(MParContainer*)Next()) )
-        cont->SetHasChanged(flag);
-
-    MParContainer::SetHasChanged(flag);
+        cont->SetReadyToSave(flag);
+
+    MParContainer::SetReadyToSave(flag);
 }
 

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -45 +45 @@
 
     void Reset();
-    void SetHasChanged(Bool_t flag=kTRUE);
+    void SetReadyToSave(Bool_t flag=kTRUE);
 
     void Print(Option_t *t = NULL);

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -35 +35 @@
 // outside. It makes also possible to go back by decreasing the number.    //
 //                                                                         //
+// If you don't want to start reading the first event you have to call     //
+// MReadTree::SetEventNum after instantiating your MReadTree-object.       //
+//                                                                         //
 /////////////////////////////////////////////////////////////////////////////
 
@@ -178 +181 @@
         // the actual branch should be stored - enable branch.
         //
+        // FIXME: is it correct, that the pointer is deleted immediatly afterwards?
         branch->SetAddress(&pcont);
     }
@@ -190 +194 @@
 //  (Remark: The position can also be set by some member functions
 //  If the end of the file is reached the Eventloop is stopped.
+//
 Bool_t MReadTree::Process()
 {
@@ -267 +272 @@
 // this function makes Process() read event number nr next
 //
-// Remark: You can use this function to set the event number from which
-//         you want to start reading.
+// Remark: You can use this function after instatiating you MReadTree-object
+//         to set the event number from which you want to start reading.
 //
 Bool_t MReadTree::SetEventNum(UInt_t nr)

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -59 +59 @@
 MTaskList::MTaskList(MTaskList &ts)
 {
-  fTasks.AddAll(&ts.fTasks);
-}
-
-// --------------------------------------------------------------------------
-//
-//  create the Iterator over the tasklist
+    fTasks.AddAll(&ts.fTasks);
+}
+
+// --------------------------------------------------------------------------
+//
+//  Set the logging stream for the all tasks in the list and the tasklist
+//  itself.
 //
 void MTaskList::SetLogStream(MLog *log)
 {
+    //
+    // create the Iterator over the tasklist
+    //
     TIter Next(&fTasks);
 
@@ -167 +171 @@
 {
     //
-    // Reset the HasChanged flag.
+    // Reset the ReadyToSave flag.
     // Reset all containers.
     //
-    fParList->SetHasChanged(kFALSE);
+    // 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();
 
@@ -231 +238 @@
 
     //
-    // Reset the HasChanged flag.
+    // Reset the ReadyToSave flag.
     // Reset all containers.
     //
-    fParList->SetHasChanged(kFALSE);
+    // 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();
 

trunk/MagicSoft/Mars/mbase/MWriteAsciiFile.cc

@@ -32 +32 @@
 // This can be the name of the class or a given name, which identifies     //
 // the container in a parameter container list (MParList).                 //
-// The container is writte to the ascii file if its HasChanged flag is     //
+// The container is writte to the ascii file if its ReadyToSave flag is     //
 // set (MParContainer)                                                     //
 //                                                                         //
@@ -102 +102 @@
 void MWriteAsciiFile::CheckAndWrite() const
 {
-    if (fContainer->HasChanged())
+    if (fContainer->IsReadyToSave())
         fContainer->AsciiWrite(*fOut);
 }

trunk/MagicSoft/Mars/mbase/MWriteRootFile.cc

@@ -322 +322 @@
         // Check for the Write flag
         //
-        if (!entry->GetContainer()->HasChanged())
+        if (!entry->GetContainer()->IsReadyToSave())
             continue;