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

Timestamp:

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

Author:

tbretz

Message:

Fixed severity in logging stream.

File:

• trunk/Mars/fact/analysis/callisto.C (modified) (13 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;
     }