Changeset 1076 for trunk/MagicSoft/Mars/mbase

Timestamp:

11/14/01 10:03:20 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• BaseLinkDef.h (modified) (1 diff)
• MGGroupFrame.cc (added)
• MGGroupFrame.h (added)
• MGList.cc (added)
• MGList.h (added)
• MGTask.cc (added)
• MGTask.h (added)
• MInputStreamID.cc (modified) (1 diff)
• MParContainer.cc (modified) (4 diffs)
• MParContainer.h (modified) (2 diffs)
• MParList.cc (modified) (1 diff)
• MParList.h (modified) (1 diff)
• MTask.cc (modified) (4 diffs)
• MTask.h (modified) (1 diff)
• MTaskList.cc (modified) (3 diffs)
• MTaskList.h (modified) (1 diff)
• MTime.cc (modified) (1 diff)
• MWriteRootFile.cc (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -31 +31 @@
 #pragma link C++ class MInputStreamID+;
 
+#pragma link C++ class MGTask+;
+#pragma link C++ class MGList+;
+#pragma link C++ class MGGroupFrame+;
+
 #pragma link C++ class MClone+;
 #pragma link C++ class MPrint+;

trunk/MagicSoft/Mars/mbase/MInputStreamID.cc

@@ -47 +47 @@
     fTitle = title;
 
-    fStreamId = "All"; //new char[4];
-    //strcpy(fStreamId, "All");
+    fStreamId = "All";
 }
 

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -137 +137 @@
 {
     TROOT::IndentLevel();
-    *fLog <<"OBJ: " << IsA()->GetName() << "\t" << GetName() << "\t" << GetTitle() << " : "
+    *fLog <<"OBJ: " << GetDescriptor() << ": " << GetTitle() << ", "
         << Int_t(TestBit(kCanDelete)) << endl;
 }
@@ -147 +147 @@
 void MParContainer::Print(Option_t *) const
 {
-    *fLog <<"OBJ: " << IsA()->GetName() << "\t" << GetName() << "\t" << GetTitle() << endl;
+    *fLog <<"OBJ: " << GetDescriptor() << ": " << GetTitle() << endl;
 }
 
@@ -199 +199 @@
 {
     *fLog << "To use the the ascii input of " << GetName();
-    *fLog << " you have to overload " << GetName() << "::AsciiRead." << endl;
+    *fLog << " you have to overload " << ClassName() << "::AsciiRead." << endl;
 }
 
@@ -205 +205 @@
 {
     *fLog << "To use the the ascii output of " << GetName();
-    *fLog << " you have to overload " << GetName() << "::AsciiWrite." << endl;
-}
+    *fLog << " you have to overload " << ClassName() << "::AsciiWrite." << endl;
+}

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -100 +100 @@
     virtual ~MParContainer() {}
 
+    virtual const char *GetDescriptor() const { return Form("%s [%s]", GetName(), ClassName()); }
+
     virtual TObject    *Clone(const char *newname="") const;
     virtual Int_t       Compare(const TObject *obj) const;
@@ -107 +109 @@
     virtual const char *GetName() const    { return fName.Data(); }
     virtual const char *GetTitle() const   { return fTitle.Data(); }
-    virtual ULong_t     Hash()             { return fName.Hash(); }
+    virtual ULong_t     Hash() const       { return fName.Hash(); }
     virtual Bool_t      IsSortable() const { return kTRUE; }
 

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -227 +227 @@
 //  check if the object is in the list or not
 //
-TObject *MParList::FindObject(TObject *obj) const
+TObject *MParList::FindObject(const TObject *obj) const
 {
     return fContainer->FindObject(obj);

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -44 +44 @@
 
     TObject       *FindObject(const char *name) const;
-    TObject       *FindObject(TObject *obj) const;
+    TObject       *FindObject(const TObject *obj) const;
     MParContainer *FindCreateObj(const char *classname, const char *objname=NULL);
 

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -67 +67 @@
 #include "MTask.h"
 
+#include <TMethod.h>
 #include <TOrdCollection.h>
 
@@ -73 +74 @@
 
 #include "MFilter.h"
+#include "MGGroupFrame.h"
 
 ClassImp(MTask);
@@ -176 +178 @@
 
     fIsPreprocessed = kFALSE;
+
     return PostProcess();
 }
@@ -224 +227 @@
 void MTask::PrintStatistics(const Int_t lvl) const
 {
-    *fLog << setw(lvl) << " " << GetName() << " [";
-    *fLog << ClassName() << "] \t" << fNumExecutions;
-    *fLog << endl;
-}
+    *fLog << setw(lvl) << " " << GetDescriptor() << "\t";
+    *fLog << dec << fNumExecutions << endl;
+}
+

trunk/MagicSoft/Mars/mbase/MTask.h

@@ -73 +73 @@
     UInt_t GetNumExecutions() { return fNumExecutions; }
 
-    Bool_t CallPreProcess(MParList *plist);
-    Bool_t CallProcess();
-    Bool_t CallPostProcess();
+    virtual Bool_t CallPreProcess(MParList *plist);
+    virtual Bool_t CallProcess();
+    virtual Bool_t CallPostProcess();
 
     const TOrdCollection *GetListOfBranches() const { return fListOfBranches; }
 
-    ClassDef(MTask, 0)          //Abstract base class for a task
+    ClassDef(MTask, 0) //Abstract base class for a task
 };
 

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -197 +197 @@
 //  check if the object is in the list or not
 //
-TObject *MTaskList::FindObject(TObject *obj) const
+TObject *MTaskList::FindObject(const TObject *obj) const
 {
     return fTasks->FindObject(obj);
@@ -360 +360 @@
         *fLog << "Execution Statistics: " << endl;
         *fLog << "---------------------" << endl;
-        *fLog << GetName() << " [" << ClassName() << "]" << endl;
+        *fLog << GetDescriptor() << endl;
     }
     else
     {
-        *fLog << setw(lvl) << " " << GetName() << " [";
-        *fLog << ClassName() << "]" << endl;
+        *fLog << setw(lvl) << " " << GetDescriptor() << endl;
     }
 
@@ -380 +379 @@
 void MTaskList::Print(Option_t *t) const
 {
-    *fLog << "TaskList: " << GetName() << " <" << GetTitle() << ">" << endl;
+    *fLog << GetDescriptor() << " <" << GetTitle() << ">" << endl;
 
     fTasks->Print();

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -40 +40 @@
 
     TObject *FindObject(const char *name) const;
-    TObject *FindObject(TObject *obj) const;
+    TObject *FindObject(const TObject *obj) const;
 
     Bool_t PreProcess(MParList *pList);

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -43 +43 @@
     fLog->setf(ios::showbase);
     *fLog << "MTime Information:  " << hex 
-        << " " <<setfill('0') << setw(2) << fTimeStamp[0]
-        << " " <<setfill('0') << setw(2) << fTimeStamp[1] << endl << endl;
+        << " " << setfill('0') << setw(2) << fTimeStamp[0]
+        << " " << setfill('0') << setw(2) << fTimeStamp[1] << endl << endl;
 } 
 

trunk/MagicSoft/Mars/mbase/MWriteRootFile.cc

@@ -116 +116 @@
 void MWriteRootFile::Print(Option_t *) const
 {
-    cout << "File: " << GetFileName() << endl;
+    cout << "File: " << GetFileName() << dec << endl;
     cout << "--------------------------------------------------" << endl;
 

trunk/MagicSoft/Mars/mbase/Makefile

@@ -44 +44 @@
            MWriteAsciiFile.cc \
            MWriteRootFile.cc \
+           MGList.cc \
+           MGTask.cc \
+           MGGroupFrame.cc \
            MArray.cc \
            MArrayB.cc \