Changeset 8891 for trunk/MagicSoft/Mars/mbase

Timestamp:

05/15/08 19:37:27 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -2157 +2157 @@
     if (n==0)
     {
-        *fLog << warn << "MStatusDisplay::Read: No objects read." << endl;
+        const Bool_t store = TH1::AddDirectoryStatus();
+        TH1::AddDirectory(kFALSE);
+
+        TIter Next(gFile->GetListOfKeys());
+        TObject *key = 0;
+        while ((key=Next()))
+        {
+            TCanvas *c=0;
+            gFile->GetObject(key->GetName(), c);
+            if (!c)
+                break;
+
+            if (list.GetEntries()==0)
+                list.Add(new TNamed(GetName(), GetTitle()));
+
+            list.Add(c);
+        }
+
+        TH1::AddDirectory(store);
+
+        if (list.GetEntries()==0)
+        {
+            *fLog << warn << "MStatusDisplay::Read: No objects read." << endl;
+            return 0;
+        }
+
+        *fLog << inf << "MStatusDisplay: " << list.GetEntries() << " canvases directly read from file." << endl;
+    }
+
+
+    if (!Display(list, tab))
+    {
+        *fLog << err << "MStatusDisplay::Display: No entries found." << endl;
         return 0;
     }
 
-    if (!Display(list, tab))
-    {
-        *fLog << err << "MStatusDisplay::Display: No entry in " << name << "." << endl;
-        return 0;
-    }
+
+    cout << "Display done." << endl;
+
+    if (n==0)
+        return list.GetEntries();
 
     *fLog << inf << "MStatusDisplay: Key " << name << " with " << n << " keys read from file." << endl;
-
     return n;
 }