Index: trunk/MagicSoft/Mars/mhist/MBinning.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MBinning.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MBinning.cc	(revision 2173)
@@ -31,5 +31,5 @@
 
 #include <ctype.h>      // tolower
-#include <fstream.h>
+#include <fstream>
 
 #include <TH1.h>        // InheritsFrom
@@ -41,4 +41,6 @@
 
 ClassImp(MBinning);
+
+using namespace std;
 
 static const TString gsDefName  = "MBinning";
@@ -75,5 +77,5 @@
 }
 
-void MBinning::SetEdges(const TH1 &h, const Char_t axis='x')
+void MBinning::SetEdges(const TH1 &h, const Char_t axis)
 {
     TH1 &hist = (TH1&)h; // get rid of const qualifier
Index: trunk/MagicSoft/Mars/mhist/MFillH.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MFillH.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MFillH.cc	(revision 2173)
@@ -74,5 +74,5 @@
 #include "MFillH.h"
 
-#include <fstream.h>
+#include <fstream>
 
 #include <TClass.h>
@@ -93,4 +93,6 @@
 
 ClassImp(MFillH);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mhist/MH.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MH.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MH.cc	(revision 2173)
@@ -75,4 +75,6 @@
 ClassImp(MH);
 
+using namespace std;
+
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/mhist/MH3.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MH3.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MH3.cc	(revision 2173)
@@ -61,5 +61,5 @@
 
 #include <ctype.h>   // tolower
-#include <fstream.h>
+#include <fstream>
 
 #include <TPad.h>
@@ -80,4 +80,6 @@
 
 ClassImp(MH3);
+
+using namespace std;
 
 static const TString gsDefName  = "MH3";
@@ -638,5 +640,5 @@
 }
 
-TString MH3::GetRule(const Char_t axis='x') const
+TString MH3::GetRule(const Char_t axis) const
 {
     switch (tolower(axis))
Index: trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTheta.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTheta.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTheta.cc	(revision 2173)
@@ -49,4 +49,6 @@
 
 ClassImp(MHAlphaEnergyTheta);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTime.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTime.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTime.cc	(revision 2173)
@@ -50,4 +50,5 @@
 ClassImp(MHAlphaEnergyTime);
 
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mhist/MHArray.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHArray.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHArray.cc	(revision 2173)
@@ -80,4 +80,6 @@
 ClassImp(MHArray);
 
+using namespace std;
+
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -551,5 +553,5 @@
         MH::MakeDefCanvas(this);
 
-    const Stat_t sstyle = gStyle->GetOptStat();
+    const Int_t sstyle = gStyle->GetOptStat();
     gStyle->SetOptStat(0);
 
@@ -672,5 +674,5 @@
         o.Remove(scalemax, 9);
 
-    const Stat_t sstyle = gStyle->GetOptStat();
+    const Int_t sstyle = gStyle->GetOptStat();
     gStyle->SetOptStat(0);
 
Index: trunk/MagicSoft/Mars/mhist/MHBlindPixels.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHBlindPixels.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHBlindPixels.cc	(revision 2173)
@@ -43,4 +43,6 @@
 
 ClassImp(MHBlindPixels);
+
+using namespace std;
 
 // -------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mhist/MHCerPhotEvt.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCerPhotEvt.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHCerPhotEvt.cc	(revision 2173)
@@ -44,9 +44,11 @@
 ClassImp(MHCerPhotEvt);
 
+using namespace std;
+
 // --------------------------------------------------------------------------
 //
 // Reset all pixels to 0 and reset fEntries to 0.
 //
-void MHCerPhotEvt::Clear()
+void MHCerPhotEvt::Clear(const Option_t *)
 {
     fSum.Reset();
Index: trunk/MagicSoft/Mars/mhist/MHCerPhotEvt.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCerPhotEvt.h	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHCerPhotEvt.h	(revision 2173)
@@ -26,5 +26,5 @@
     ~MHCerPhotEvt();
 
-    void Clear();
+    void Clear(const Option_t *o="");
 
     Bool_t SetupFill(const MParList *pList);
Index: trunk/MagicSoft/Mars/mhist/MHCompProb.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCompProb.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHCompProb.cc	(revision 2173)
@@ -53,4 +53,6 @@
 ClassImp(MHCompProb);
 
+using namespace std;
+
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/mhist/MHCurrents.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCurrents.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHCurrents.cc	(revision 2173)
@@ -44,9 +44,11 @@
 ClassImp(MHCurrents);
 
+using namespace std;
+
 // --------------------------------------------------------------------------
 //
 // Reset all pixels to 0 and reset fEntries to 0.
 //
-void MHCurrents::Clear()
+void MHCurrents::Clear(const Option_t *)
 {
     // FIXME: Implement a clear function with setmem
Index: trunk/MagicSoft/Mars/mhist/MHCurrents.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCurrents.h	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHCurrents.h	(revision 2173)
@@ -27,5 +27,5 @@
     ~MHCurrents();
 
-    void Clear();
+    void Clear(const Option_t *o="");
 
     Bool_t SetupFill(const MParList *pList);
Index: trunk/MagicSoft/Mars/mhist/MHEffOnTime.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHEffOnTime.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHEffOnTime.cc	(revision 2173)
@@ -58,4 +58,5 @@
 ClassImp(MHEffOnTime);
 
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mhist/MHEnergyTheta.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHEnergyTheta.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHEnergyTheta.cc	(revision 2173)
@@ -44,4 +44,6 @@
 
 ClassImp(MHEnergyTheta);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mhist/MHEnergyTime.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHEnergyTime.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHEnergyTime.cc	(revision 2173)
@@ -45,4 +45,6 @@
 
 ClassImp(MHEnergyTime);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mhist/MHFadcCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHFadcCam.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHFadcCam.cc	(revision 2173)
@@ -41,4 +41,6 @@
 
 ClassImp(MHFadcCam);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
@@ -130,8 +132,8 @@
 {
     for (Int_t i=0; i<577; i++)
-        Reset(i);
+        ResetEntry(i);
 }
 
-void MHFadcCam::Reset(Int_t i)
+void MHFadcCam::ResetEntry(Int_t i)
 {
     GetHistHi(i)->Reset();
Index: trunk/MagicSoft/Mars/mhist/MHFadcCam.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHFadcCam.h	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHFadcCam.h	(revision 2173)
@@ -49,5 +49,5 @@
 
     void ResetHistograms();
-    void Reset(Int_t i);
+    void ResetEntry(Int_t i);
 
     //
Index: trunk/MagicSoft/Mars/mhist/MHFlux.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHFlux.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHFlux.cc	(revision 2173)
@@ -58,4 +58,6 @@
 ClassImp(MHFlux);
 
+using namespace std;
+
 MHFlux::MHFlux(const MHGamma &hist, const TString varname, const TString unit)
     : fHOrig(), fHUnfold(), fHFlux()
Index: trunk/MagicSoft/Mars/mhist/MHGamma.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHGamma.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHGamma.cc	(revision 2173)
@@ -48,4 +48,5 @@
 ClassImp(MHGamma);
 
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mhist/MHHadronness.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHHadronness.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHHadronness.cc	(revision 2173)
@@ -75,4 +75,6 @@
 
 ClassImp(MHHadronness);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mhist/MHMatrix.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHMatrix.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHMatrix.cc	(revision 2173)
@@ -47,5 +47,5 @@
 #include "MHMatrix.h"
 
-#include <fstream.h>
+#include <fstream>
 
 #include <TList.h>
@@ -70,6 +70,7 @@
 #include "MFilter.h"
 
-
 ClassImp(MHMatrix);
+
+using namespace std;
 
 const TString MHMatrix::gsDefName  = "MHMatrix";
Index: trunk/MagicSoft/Mars/mhist/MHSigmaPixel.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHSigmaPixel.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHSigmaPixel.cc	(revision 2173)
@@ -48,4 +48,6 @@
 
 ClassImp(MHSigmaPixel);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mhist/MHSigmaTheta.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHSigmaTheta.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHSigmaTheta.cc	(revision 2173)
@@ -56,7 +56,7 @@
 #include "MLogManip.h"
 
-
 ClassImp(MHSigmaTheta);
 
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mhist/MHSigmabarTheta.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHSigmabarTheta.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHSigmabarTheta.cc	(revision 2173)
@@ -46,4 +46,6 @@
 
 ClassImp(MHSigmabarTheta);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mhist/MHStarMap.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHStarMap.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHStarMap.cc	(revision 2173)
@@ -50,4 +50,6 @@
 ClassImp(MHStarMap);
 
+using namespace std;
+
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/mhist/MHThetabarTheta.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHThetabarTheta.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHThetabarTheta.cc	(revision 2173)
@@ -44,4 +44,6 @@
 
 ClassImp(MHThetabarTheta);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mhist/MHThetabarTime.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHThetabarTime.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHThetabarTime.cc	(revision 2173)
@@ -46,4 +46,5 @@
 ClassImp(MHThetabarTime);
 
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mhist/MHTimeDiffTheta.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHTimeDiffTheta.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHTimeDiffTheta.cc	(revision 2173)
@@ -47,4 +47,5 @@
 ClassImp(MHTimeDiffTheta);
 
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mhist/MHTimeDiffTime.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHTimeDiffTime.cc	(revision 2172)
+++ trunk/MagicSoft/Mars/mhist/MHTimeDiffTime.cc	(revision 2173)
@@ -47,4 +47,5 @@
 ClassImp(MHTimeDiffTime);
 
+using namespace std;
 
 // --------------------------------------------------------------------------