Changeset 852 for trunk/MagicSoft/Mars/mbase

Timestamp:

06/20/01 10:41:23 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• BaseLinkDef.h (modified) (1 diff)
• MEvtLoop.cc (modified) (1 diff)
• MParList.cc (modified) (1 diff)
• MWriteAsciiFile.cc (modified) (3 diffs)
• MWriteAsciiFile.h (modified) (3 diffs)
• MWriteFile.cc (added)
• MWriteFile.h (added)
• MWriteRootFile.cc (added)
• MWriteRootFile.h (added)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

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

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -160 +160 @@
     //
     if (maxcnt<0)
-        while (fTaskList->Process() && ++dummy);
+        // process first and increment if sucessfull
+        while (fTaskList->Process()) dummy++;
     else
-        while (fTaskList->Process() && dummy--);
+        // check for number and break if unsuccessfull
+        while (dummy-- && fTaskList->Process());
 
     //

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -102 +102 @@
 Bool_t MParList::AddToList(MParContainer *obj, MParContainer *where)
 {
+    //
+    //  check if the object (you want to add) exists
+    //
+
+    if (!obj) return kTRUE;
+
+    *fLog << "Adding " << obj->GetName() << " to " << GetName() << "... " << flush;
   //
-  //  check if the object (you want to add) exists
-  //
-
-  if (!obj) return kTRUE;
-
-  *fLog << "Adding " << obj->GetName() << " to " << GetName() << "... " << flush;
-  //
-  //  check if it is in the list yet
-  //
-  if (fContainer.FindObject(obj))
-  {
-      *fLog << dbginf << "Container already added" << endl;
-      return kTRUE;
-  }
-
-  //
-  //  check if you want to add the new parameter container somewhere 
+    //  check if it is in the list yet
+    //
+    if (fContainer.FindObject(obj))
+    {
+        *fLog << dbginf << "Container already added" << endl;
+        return kTRUE;
+    }
+
+    //
+    //  check if you want to add the new parameter container somewhere
   //  special (in that case you specify "where") 
-  //  
-  if (where)
-  {
-      if (!fContainer.FindObject(where))
-      {
-          *fLog << dbginf << "Cannot find parameter container after which the new one should be added!" << endl;
-          return kFALSE;
-      }
-  }
-
-  fContainer.Add(obj);
-  *fLog << "Done." << endl;
-
-  return kTRUE;
+    //
+    if (where)
+    {
+        if (!fContainer.FindObject(where))
+        {
+            *fLog << dbginf << "Cannot find parameter container after which the new one should be added!" << endl;
+            return kFALSE;
+        }
+    }
+
+    fContainer.Add(obj);
+    *fLog << "Done." << endl;
+
+    return kTRUE;
 }
 

trunk/MagicSoft/Mars/mbase/MWriteAsciiFile.cc

@@ -64 +64 @@
     fNameFile      = filename;
     fNameContainer = contname;
+
+    fOut = new ofstream(fNameFile);
 }
 
@@ -80 +82 @@
     fNameFile      = filename;
     fNameContainer = cont->GetName();
+
+    fOut = new ofstream(fNameFile);
 }
 
@@ -89 +93 @@
 MWriteAsciiFile::~MWriteAsciiFile()
 {
-    if (fOut)
-        delete fOut;
+    delete fOut;
 }
 
 // --------------------------------------------------------------------------
 //
-// Tries to open the given output file. And tries to get a pointer to the
-// instance of the container which should be written.
-// If the container has already the HasChanged flag it is immediatly written
-// to the output file.
+// Check if our container is ready for writing. If so write it.
 //
-Bool_t MWriteAsciiFile::PreProcess (MParList *pList)
+void MWriteAsciiFile::CheckAndWrite() const
+{
+    if (fContainer->HasChanged())
+        fContainer->AsciiWrite(*fOut);
+}
+
+// --------------------------------------------------------------------------
+//
+// Return open state of the file
+//
+Bool_t MWriteAsciiFile::IsFileOpen() const
+{
+    return (bool)(*fOut);
+}
+
+// --------------------------------------------------------------------------
+//
+// If the container is yet unknown and the name of it is known only, try
+// to get the container from the parameter list.
+//
+Bool_t MWriteAsciiFile::GetContainer(MParList *pList)
 {
     //
     // Try to find the container which should be stored.
     //
-    if (!fContainer)
-    {
-        fContainer = (MParContainer*)pList->FindObject(fNameContainer);
-        if (!fContainer)
-        {
-            *fLog << dbginf << "Cannot find parameter container '" << fContainer << "'." << endl;
-            return kFALSE;
-        }
-    }
+    if (fContainer)
+        return kTRUE;
 
-    //
-    // Try to open the output file
-    //
-    fOut = new ofstream(fNameFile);
+    fContainer = (MParContainer*)pList->FindObject(fNameContainer);
+    if (fContainer)
+        return kTRUE;
 
-    if (!(*fOut))
-    {
-        *fLog << dbginf << "Cannot open Ascii file '" << fNameFile << "' for writing." << endl;
-        return kFALSE;
-    }
-
-    *fLog << "Ascii file '" << fNameFile << "' opened for writing." << endl;
-
-    //
-    // write the container if it is already in changed state
-    //
-    if (fContainer->HasChanged())
-        fContainer->AsciiWrite(*fOut);
-
-    return kTRUE;
+    *fLog << dbginf << "Cannot find parameter container '" << fContainer << "'." << endl;
+    return kFALSE;
 }
-
-// --------------------------------------------------------------------------
-//
-// Checks if the HasChanged flag of the output container is set. If it is set
-// the container is instructed to write itself to the ascii file.
-// (By calling its memberfunction AsciiWrite. You find the Prototype in
-// MParContainer)
-//
-Bool_t MWriteAsciiFile::Process()
-{
-    if (fContainer->HasChanged())
-        fContainer->AsciiWrite(*fOut);
-
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-// If the output container has the HasChanged flag set, it is written to the
-// output file (eg. this could be some calculated result)
-// If the output file object exists, delete it. (The file is closed
-// automatically in the corresponding destructor)
-//
-Bool_t MWriteAsciiFile::PostProcess()
-{
-    //
-    // check if the container changed state is set
-    //
-    if (fContainer->HasChanged())
-        fContainer->AsciiWrite(*fOut);
-
-    //
-    // delete (close) file
-    //
-    delete fOut;
-    fOut = NULL;
-
-    return kTRUE;
-}
-

trunk/MagicSoft/Mars/mbase/MWriteAsciiFile.h

@@ -2 +2 @@
 #define MWRITEASCIIFILE_H
 
-#ifndef MTASK_H
-#include "MTask.h"
+#ifndef MWRITEFILE_H
+#include "MWriteFile.h"
 #endif
 
-class MWriteAsciiFile : public MTask
+class MWriteAsciiFile : public MWriteFile //MTask
 {
 private:
@@ -16 +16 @@
     MParContainer *fContainer;
 
+    virtual void   CheckAndWrite() const;
+    virtual Bool_t IsFileOpen() const;
+    virtual Bool_t GetContainer(MParList *pList);
+    virtual const char *GetFileName() const { return fNameFile; }
+
+
 public:
     MWriteAsciiFile(const char *filename, const char *contname,
@@ -23 +29 @@
     ~MWriteAsciiFile();
 
-    Bool_t PreProcess(MParList *pList);
-    Bool_t Process();
-    Bool_t PostProcess();
-
     ClassDef(MWriteAsciiFile, 0)        // Class to write one container to an ascii file
 };

trunk/MagicSoft/Mars/mbase/Makefile

@@ -38 +38 @@
            MEvtLoop.cc \
            MReadTree.cc \
+           MWriteFile.cc \
            MWriteAsciiFile.cc \
+           MWriteRootFile.cc \
            MArray.cc \
            MArrayB.cc \