Changeset 5557 for trunk/MagicSoft/Mars/mbase

Timestamp:

12/03/04 20:11:31 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MParContainer.cc (modified) (2 diffs)
• MParContainer.h (modified) (1 diff)
• MStatusDisplay.cc (modified) (1 diff)
• MTaskEnv.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -194 +194 @@
 const char *MParContainer::GetDescriptor() const
 {
+    return GetDescriptor(*this);
+}
+
+// --------------------------------------------------------------------------
+//
+// Returns the name of the object. If the name of the object is not the
+// class name it returns the object name and in []-brackets the class name.
+//
+const char *MParContainer::GetDescriptor(const TObject &o)
+{
     //
     // Because it returns a (const char*) we cannot return a casted
@@ -200 +210 @@
     //
     MString desc;
-    desc.Print("%s [%s]", fName.Data(), ClassName());
-    return fName==ClassName() ? ClassName() : desc.Data();
+    desc.Print("%s [%s]", o.GetName(), o.ClassName());
+    return (TString)o.GetName()==o.ClassName() ? o.ClassName() : desc.Data();
 }
 

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -73 +73 @@
         ;
     virtual void        FillBuffer(char *&buffer);
+
+    static const char *GetDescriptor(const TObject &o);
 
     virtual const char   *GetDescriptor() const;

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -1733 +1733 @@
     const Int_t n = list.Write(name, kSingleKey);
 
-    *fLog << inf << "MStatusDisplay: " << n << " keys written to file as key " << name << "." << endl;
+    //*fLog << inf << "MStatusDisplay: " << n << " keys written to file as key " << name << "." << endl;
 
     return n;

trunk/MagicSoft/Mars/mbase/MTaskEnv.h

@@ -24 +24 @@
     Int_t  PostProcess();
 
-    Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
     Bool_t WriteEnv(TEnv &env, TString prefix, Bool_t print=kFALSE) const;
 
@@ -38 +37 @@
     MTask *GetTask() { return fTask; }
 
+    Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
+
     ClassDef(MTaskEnv, 0) // Task which can be setup from an environment file
 };