Changeset 17032 for trunk/Mars/fact/analysis/merpp.C

Timestamp:

08/20/13 13:47:35 (11 years ago)

Author:

tbretz

Message:

Fixed severity in logging stream.

File:

• trunk/Mars/fact/analysis/merpp.C (modified) (9 diffs)

trunk/Mars/fact/analysis/merpp.C

@@ +1 @@
+#include "MLogManip.h"
+
 void merpp(TString &froot, const char *id, const char *faux)
 {
@@ -6 +8 @@
     if (file.IsZombie())
     {
-        gLog << "merpp: Invalid file '" << froot << "'" << endl;
+        gLog << err << "merpp: Invalid file '" << froot << "'" << endl;
         return;
     }
@@ -14 +16 @@
     if (!tree)
     {
-        gLog << "merpp: Tree 'RunHeaders' not found... skipped." << endl;
+        gLog << err << "merpp: Tree 'RunHeaders' not found... skipped." << endl;
         return;
     }
@@ -20 +22 @@
     if (tree->GetEntries()!=1)
     {
-        gLog << "merpp: Number of RunHeaders do not match 1... skipped." << endl;
+        gLog << err << "merpp: Number of RunHeaders do not match 1... skipped." << endl;
         return;
     }
@@ -29 +31 @@
     if (file.Get(id))
     {
-        gLog << "WARNING - Tree '" << id << "' already existing... skipped." << endl;
+        gLog << warn << "WARNING - Tree '" << id << "' already existing... skipped." << endl;
         return;
     }
@@ -43 +45 @@
     TString time   = Form("MTime%s",   id);
 
+    gLog << all;
     gLog << " --- Fits file: " << ffits << endl;
     gLog << " --- Root file: " << froot << endl;
@@ -78 +81 @@
     if (!seq.IsValid())
     {
-        gLog << "ERROR - Sequence invalid!" << endl;
+        gLog << err << "ERROR - Sequence invalid!" << endl;
         return 1;
     }
@@ -85 +88 @@
 
     gLog.Separator("Merpp");
+    gLog << all;
     gLog << "Merge slow control data of sequence ";
     gLog << seq.GetFileName() << endl;
@@ -93 +97 @@
     if (seq.GetRuns(iter, MSequence::kFactImg, path)<=0)
     {
-        gLog << "ERROR - Sequence valid but without files." << endl;
+        gLog << err << "ERROR - Sequence valid but without files." << endl;
         return 2;
     }