Changeset 9039 for trunk/MagicSoft/Mars/mbase

Timestamp:

07/23/08 14:15:14 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MStatusArray.cc (modified) (2 diffs)
• MStatusDisplay.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MStatusArray.cc

@@ -44 +44 @@
 #include "MStatusArray.h"
 
-#include <TH1.h>       // TH1::AddDirectoryStatus();
+#include <TH1.h>              // TH1::AddDirectoryStatus();
+#include <TFile.h>            // gFile
 #include <TClass.h>
 #include <TCanvas.h>
@@ -344 +345 @@
     Delete();
 
+    const TString keyname = name?name:"MStatusDisplay";
+
+    // Check if key exists (to suppress an error on the console
+    if (!gDirectory->GetListOfKeys()->FindObject(keyname))
+    {
+        gLog << inf << keyname << " [MStatusArray] not found." << endl;
+        return 0;
+    }
+
     // Make sure newly read histograms are not added to the current directory
     const Bool_t store = TH1::AddDirectoryStatus();
     TH1::AddDirectory(kFALSE);
-    const Int_t rc = TObjArray::Read(name?name:"MStatusDisplay");
+    const Int_t rc = TObjArray::Read(keyname);
     TH1::AddDirectory(store);
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -2239 +2239 @@
                 list.Add(new TNamed(GetName(), GetTitle()));
 
+            c->SetTitle(gFile->GetName());
             list.Add(c);
         }
@@ -2246 +2247 @@
         if (list.GetEntries()==0)
         {
-            *fLog << warn << "MStatusDisplay::Read: No objects read." << endl;
+            *fLog << warn << "MStatusDisplay::Read: No objects read from " << gFile->GetName() << endl;
             return 0;
         }