Changeset 6503 for trunk/MagicSoft

Timestamp:

02/15/05 19:06:08 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfileio/MReadMarsFile.cc (modified) (2 diffs)
• mfileio/MReadTree.cc (modified) (2 diffs)
• mraw/MRawFileRead.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -115 +115 @@
    * mbase/MTask.cc:
      - don't preprocess a task if it has been preprocessed already
+
+   * mraw/MRawFileWrite.cc:
+     - if display is set write output to status line
+
+   * mfileio/MReadTree.cc, mfileio/MReadMarsFile.cc:
+     - moved code to display filename in status display from
+       MReadMarsFile::Notify to MReadTree::Notify
 
 

trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc

@@ -47 +47 @@
 
 #include "MRawRunHeader.h"
-#include "MStatusDisplay.h"
 
 #include "MMcRunHeader.hxx"
@@ -195 +194 @@
         *fLog << warn << "Warning - You are mixing files with different run types (";
         *fLog << runtype << ", " << rawheader->GetRunType() << ")" << endl;
-    }
-
-    if (fDisplay)
-    {
-        TString txt = GetFileName();
-        txt += " @ ";
-        txt += GetNumEntry()-1;
-        fDisplay->SetStatusLine2(txt);
     }
 

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -67 +67 @@
 #include "MParList.h"
 #include "MTaskList.h"
+#include "MStatusDisplay.h"
 
 #include "MLog.h"
@@ -279 +280 @@
     *fLog << " '" << GetFileName() << "' (before event #";
     *fLog << GetNumEntry()-1 << ")" << endl;
+
+    if (fDisplay)
+    {
+        TString txt = GetFileName();
+        txt += " @ ";
+        txt += GetNumEntry()-1;
+        fDisplay->SetStatusLine2(txt);
+    }
 
     //

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -53 +53 @@
 #include "MTime.h"
 #include "MParList.h"
+#include "MStatusDisplay.h"
 
 #include "MRawRunHeader.h"
@@ -196 +197 @@
     }
     else
+    {
         *fLog << inf << "Open file: '" << name << "'" << endl;
+
+        if (fDisplay)
+        {
+            TString txt = GetFileName();
+            txt += " @ ";
+            txt += GetNumExecutions()-1;
+            fDisplay->SetStatusLine2(txt);
+        }
+    }
 
     delete [] expname;