Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8242)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8243)
@@ -18,4 +18,13 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2007/01/11 Thomas Bretz
+
+   * mbase/MLogManip.cc:
+     - removed the obsolete include of MLog.h
+
+   * mbase/MLogManip.h:
+     - encapsulated an include in ifdefs
+
+
 
  2007/01/11 Daniela Dorner
Index: trunk/MagicSoft/Mars/mbase/MLogManip.h
===================================================================
--- trunk/MagicSoft/Mars/mbase/MLogManip.h	(revision 8242)
+++ trunk/MagicSoft/Mars/mbase/MLogManip.h	(revision 8243)
@@ -4,5 +4,7 @@
 #include <iomanip>
 
+#ifndef MARS_MLog
 #include "MLog.h"
+#endif
 
 // --------------------- simple manipulators -----------------------
@@ -19,5 +21,4 @@
     return lout;
 }
-
 
 // ----------------------------- debug -----------------------------
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc	(revision 8242)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc	(revision 8243)
@@ -1259,15 +1259,15 @@
   if (hist.IsEmpty())
   {
-      *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram empty." << endl;
+      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram empty." << endl;
       return;
   }
   if (hist.IsOnlyOverflow())
   {
-      *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only overflows." << endl;
+      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only overflows." << endl;
       return;
   }
   if (hist.IsOnlyUnderflow())
   {
-      *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only underflows." << endl;
+      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only underflows." << endl;
       return;
   }
@@ -1366,10 +1366,10 @@
   if (hist.IsOnlyOverflow())
   {
-      *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only overflows." << endl;
+      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only overflows." << endl;
       return;
   }
   if (hist.IsOnlyUnderflow())
   {
-      *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only underflows." << endl;
+      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only underflows." << endl;
       return;
   }
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc	(revision 8242)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc	(revision 8243)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.47 2006-11-02 19:50:53 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.48 2007-01-11 14:14:37 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -960,5 +960,5 @@
         if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries())
           {
-              *fLog << warn << "Pixel   " << setw(4) << i << ": More than " << Form("%.1f%%", fNumLoGainSaturationLimit*100) << " lo-gains saturated." << endl;
+              *fLog << warn << "Pixel  " << setw(4) << i << ": More than " << Form("%.1f%%", fNumLoGainSaturationLimit*100) << " lo-gains saturated." << endl;
             bad.SetUncalibrated( MBadPixelsPix::kLoGainSaturation ); 
             if (IsOscillations())
@@ -1020,5 +1020,5 @@
         if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries())
           {
-              *fLog << warn << "Area    " << setw(4) << j << ": More than " << Form("%.1f%%", fNumLoGainSaturationLimit*100) << " lo-gains saturated." << endl;
+              *fLog << warn << "Area   " << setw(4) << j << ": More than " << Form("%.1f%%", fNumLoGainSaturationLimit*100) << " lo-gains saturated." << endl;
             if (IsOscillations())
                 histlo.CreateFourierSpectrum();
@@ -1063,5 +1063,5 @@
         if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries())
           {
-              *fLog << warn << "Sector  " << setw(4) << j << ": More than " << Form("%.1f%%", fNumLoGainSaturationLimit*100) << " lo-gains saturated." << endl;
+              *fLog << warn << "Sector " << setw(4) << j << ": More than " << Form("%.1f%%", fNumLoGainSaturationLimit*100) << " lo-gains saturated." << endl;
             bad.SetUncalibrated( MBadPixelsPix::kLoGainSaturation ); 
             if (IsOscillations())
Index: trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc	(revision 8242)
+++ trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc	(revision 8243)
@@ -435,5 +435,5 @@
     h = (TH1D*)fHEnergy.Project3D("ey");
     h->SetBit(TH1::kNoStats);
-    h->SetTitle("Energy disribution: Monte Carlo E_{mc} (black), Estimated E_{est} (green)");
+    h->SetTitle("Energy disribution: Monte Carlo E_{mc} (black), Estimated E_{est} (blue)");
     h->SetXTitle("E [GeV]"); // E_mc
     h->SetYTitle("Counts");
@@ -450,6 +450,6 @@
     h->SetDirectory(NULL);
     h->SetMarkerStyle(kFullDotMedium);
-    h->SetLineColor(kGreen);
-    h->SetMarkerColor(kGreen);
+    h->SetLineColor(kBlue);
+    h->SetMarkerColor(kBlue);
     h->Draw("same");