Changeset 17032 for trunk/Mars/fact

Timestamp:

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

Author:

tbretz

Message:

Fixed severity in logging stream.

Location:

trunk/Mars/fact/analysis

Files:

• callisto.C (modified) (13 diffs)
• merpp.C (modified) (9 diffs)
• star.C (modified) (4 diffs)

trunk/Mars/fact/analysis/callisto.C

@@ +1 @@
+#include "MLogManip.h"
+
 int callisto(const char *seqfile="seq/2012/01/23/20120123_023.seq", const char *outpath = "output", bool use_delays=true)
 {
@@ -65 +67 @@
     if (map && gSystem->AccessPathName(map, kFileExists))
     {
-        gLog << "ERROR - Cannot access mapping file '" << map << "'" << endl;
+        gLog << err << "ERROR - Cannot access mapping file '" << map << "'" << endl;
         return 1;
     }
@@ -73 +75 @@
     if (!seq.IsValid())
     {
-        gLog << "ERROR - Sequence '" << seqfile << "' invalid!" << endl;
+        gLog << err << "ERROR - Sequence '" << seqfile << "' invalid!" << endl;
         return 2;
     }
@@ -80 +82 @@
 
     gLog.Separator("Callisto");
-    gLog << "Calibrate data of sequence '" << seq.GetFileName() << "'" << endl;
+    gLog << all << "Calibrate data of sequence '" << seq.GetFileName() << "'" << endl;
     gLog << endl;
 
@@ -93 +95 @@
     if (!drs.IsValid())
     {
-        gLog << "ERROR - DRS sequence invalid!" << endl;
+        gLog << err << "ERROR - DRS sequence invalid!" << endl;
         return 3;
     }
 
-    gLog << "DRS sequence file: " << drsname.str() << '\n' << endl;
+    gLog << all << "DRS sequence file: " << drsname.str() << '\n' << endl;
 
     TString drsfile = seq.GetFileName(0, MSequence::kRawDrs);
     if (drsfile.IsNull())
     {
-        cout << "No DRS file available in sequence." << endl;
+        gLog << err << "No DRS file available in sequence." << endl;
         return 4;
     }
@@ -111 +113 @@
     TString calfile = seq.GetFileName(0, MSequence::kFitsCal);
 
+    gLog << all;
     gLog << "DRS calib     300: " << drsfile << '\n';
     gLog << "DRS calib    1024: " << drs1024 << "\n\n";
@@ -122 +125 @@
         return 6;
 
+    gLog << all;
     gLog << "Time calibration : " << timfile << '\n';
     gLog << "Pedestal     file: " << pedfile << '\n';
@@ -131 +135 @@
     if (seq.GetRuns(iter, MSequence::kFitsDat)<=0)
     {
-        gLog << "ERROR - Sequence valid but without files." << endl;
+        gLog << err << "ERROR - Sequence valid but without files." << endl;
         return 7;
     }
@@ -143 +147 @@
     if (arrt.Read()<=0)
     {
-        cout << "ERROR - Reading LP template from " << lp_template << endl;
+        gLog << err << "ERROR - Reading LP template from " << lp_template << endl;
         return 100;
     }
@@ -150 +154 @@
     if (!lpref)
     {
-        cout << "ERROR - LP Template not found in " << lp_template << endl;
+        gLog << err << "ERROR - LP Template not found in " << lp_template << endl;
         return 101;
     }
@@ -158 +162 @@
     if (!gain)
     {
-        cout << "ERROR - Gain not found in " << lp_template << endl;
+        gLog << err << "ERROR - Gain not found in " << lp_template << endl;
         return 101;
     }
@@ -166 +170 @@
     if (arrp.Read()<=0)
     {
-        cout << "ERROR - Reading Pulse template from " << pulse_template << endl;
+        gLog << err << "ERROR - Reading Pulse template from " << pulse_template << endl;
         return 102;
     }
@@ -173 +177 @@
     if (!hpulse)
     {
-        cout << "ERROR - Pulse Template not found in " << pulse_template << endl;
+        gLog << err << "ERROR - Pulse Template not found in " << pulse_template << endl;
         return 103;
     }

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;
     }

trunk/Mars/fact/analysis/star.C

@@ +1 @@
+#include "MLogManip.h"
+
 int star(const char *seqfile="sequences/20111205_013.seq", Double_t lvl1=7.8, Double_t lvl2=3.9, const char *inpath = "output", const char *outpath = "output")
 {
@@ -9 +11 @@
     if (!seq.IsValid())
     {
-        gLog << "ERROR - Sequence invalid!" << endl;
+        gLog << err << "ERROR - Sequence invalid!" << endl;
         return 1;
     }
@@ -16 +18 @@
 
     gLog.Separator("Star");
-    gLog << "Calculate image parameters of sequence ";
+    gLog << all << "Calculate image parameters of sequence ";
     gLog << seq.GetFileName() << endl;
     gLog << endl;
@@ -32 +34 @@
     if (seq.GetRuns(iter, MSequence::kFactCal, inpath)<=0)
     {
-        gLog << "ERROR - Sequence valid but without files." << endl;
+        gLog << err << "ERROR - Sequence valid but without files." << endl;
         return 2;
     }