Changeset 6949 for trunk/MagicSoft/Mars/mbase

Timestamp:

04/18/05 10:35:54 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MContinue.cc (modified) (1 diff)
• MContinue.h (modified) (2 diffs)
• MParContainer.cc (modified) (3 diffs)
• MParContainer.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MContinue.cc

@@ -227 +227 @@
 }
 
+void MContinue::Print(Option_t *o) const
+{
+    *fLog << all << GetDescriptor() << ":";
+    if (GetFilter())
+        *fLog << " <" << GetFilter()->GetDescriptor() << ">";
+    *fLog << endl;
+    if (GetFilter())
+        Getfilter()->Print();
+}
+
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mbase/MContinue.h

@@ -42 +42 @@
     Bool_t IsAllowEmpty() const { return TestBit(kAllowEmpty); }
 
-
     void SetInverted(Bool_t i=kTRUE);
     Bool_t IsInverted() const;
@@ -51 +50 @@
     Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
 
+    // TObject
+    void Print(Option_t *o="") const; //*MENU*
+
     ClassDef(MContinue, 1) //Task returning kCONTINUE
 };

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -321 +321 @@
 }
 
+Int_t MParContainer::Read(const char *name)
+{
+    const Int_t rc = TObject::Read(name?name:(const char*)fName);
+    if (name)
+        SetName(name);
+    return rc;
+}
+
 // --------------------------------------------------------------------------
 //
@@ -640 +648 @@
 
     *fLog << "Trying to find MethodCall '" << ClassName();
-    *fLog << "::Get" << part1 << "' instead..." << flush;
-    call = new TMethodCall(IsA(), (TString)"Get"+part1, "");
+    *fLog << "::" << part1 << "' instead..." << flush;
+    call = new TMethodCall(IsA(), part1, "");
     if (call->GetMethod())
     {
@@ -653 +661 @@
 
     *fLog << "Trying to find MethodCall '" << ClassName();
-    *fLog << "::" << part1 << "' instead..." << flush;
-    call = new TMethodCall(IsA(), part1, "");
+    *fLog << "::Get" << part1 << "' instead..." << flush;
+    call = new TMethodCall(IsA(), (TString)"Get"+part1, "");
     if (call->GetMethod())
     {

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -122 +122 @@
     virtual Bool_t AsciiWrite(ostream &out) const;
 
-    Int_t Read(const char *name=NULL) { return TObject::Read(name?name:(const char*)fName); }
+    Int_t Read(const char *name=NULL);
 
     virtual void GetNames(TObjArray &arr) const;