Index: trunk/MagicSoft/Mars/mimage/MCameraSmooth.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MCameraSmooth.cc	(revision 2161)
+++ trunk/MagicSoft/Mars/mimage/MCameraSmooth.cc	(revision 2173)
@@ -46,4 +46,6 @@
 
 ClassImp(MCameraSmooth);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mimage/MHHillas.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHHillas.cc	(revision 2161)
+++ trunk/MagicSoft/Mars/mimage/MHHillas.cc	(revision 2173)
@@ -53,4 +53,6 @@
 ClassImp(MHHillas);
 
+using namespace std;
+
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/mimage/MHHillasExt.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHHillasExt.cc	(revision 2161)
+++ trunk/MagicSoft/Mars/mimage/MHHillasExt.cc	(revision 2173)
@@ -52,4 +52,6 @@
 ClassImp(MHHillasExt);
 
+using namespace std;
+
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc	(revision 2161)
+++ trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc	(revision 2173)
@@ -50,4 +50,6 @@
 ClassImp(MHHillasSrc);
 
+using namespace std;
+
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/mimage/MHNewImagePar.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHNewImagePar.cc	(revision 2161)
+++ trunk/MagicSoft/Mars/mimage/MHNewImagePar.cc	(revision 2173)
@@ -48,4 +48,6 @@
 
 ClassImp(MHNewImagePar);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mimage/MHillas.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHillas.cc	(revision 2161)
+++ trunk/MagicSoft/Mars/mimage/MHillas.cc	(revision 2173)
@@ -60,5 +60,5 @@
 #include "MHillas.h"
 
-#include <fstream.h>
+#include <fstream>
 
 #include <TArrayF.h>
@@ -75,4 +75,6 @@
 
 ClassImp(MHillas);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
@@ -111,6 +113,6 @@
 
     fSize   = -1;
-    fMeanX  = -1;
-    fMeanY  = -1;
+    fMeanX  =  0;
+    fMeanY  =  0;
 
     Clear();
Index: trunk/MagicSoft/Mars/mimage/MHillasCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHillasCalc.cc	(revision 2161)
+++ trunk/MagicSoft/Mars/mimage/MHillasCalc.cc	(revision 2173)
@@ -68,4 +68,6 @@
 
 ClassImp(MHillasCalc);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mimage/MHillasExt.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHillasExt.cc	(revision 2161)
+++ trunk/MagicSoft/Mars/mimage/MHillasExt.cc	(revision 2173)
@@ -59,5 +59,5 @@
 #include "MHillasExt.h"
 
-#include <fstream.h>
+#include <fstream>
 #include <TArrayF.h>
 
@@ -74,4 +74,6 @@
 
 ClassImp(MHillasExt);
+
+using namespace std;
 
 // -------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mimage/MHillasSrc.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHillasSrc.cc	(revision 2161)
+++ trunk/MagicSoft/Mars/mimage/MHillasSrc.cc	(revision 2173)
@@ -63,5 +63,5 @@
 #include "MHillasSrc.h"
 
-#include <fstream.h>
+#include <fstream>
 #include <TArrayF.h>
 
@@ -72,4 +72,6 @@
 
 ClassImp(MHillasSrc);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
@@ -98,12 +100,12 @@
 Bool_t MHillasSrc::Calc(const MHillas *hillas)
 {
-    const Double_t mx   = hillas->GetMeanX();       // [mm]
-    const Double_t my   = hillas->GetMeanY();       // [mm]
+    const Double_t mx = hillas->GetMeanX();     // [mm]
+    const Double_t my = hillas->GetMeanY();     // [mm]
 
-    const Double_t sx   = mx - fSrcPos->GetX();     // [mm]
-    const Double_t sy   = my - fSrcPos->GetY();     // [mm]
+    const Double_t sx = mx - fSrcPos->GetX();   // [mm]
+    const Double_t sy = my - fSrcPos->GetY();   // [mm]
 
-    const Double_t sd   = hillas->GetSinDelta();    // [1]
-    const Double_t cd   = hillas->GetCosDelta();    // [1]
+    const Double_t sd = hillas->GetSinDelta();  // [1]
+    const Double_t cd = hillas->GetCosDelta();  // [1]
 
     //
@@ -112,5 +114,5 @@
     // The calculation has failed and returnes kFALSE.
     //
-    const Double_t dist = sqrt(sx*sx + sy*sy);      // [mm]
+    const Double_t dist = sqrt(sx*sx + sy*sy);  // [mm]
     if (dist==0)
         return kFALSE;
@@ -124,10 +126,10 @@
     // *OLD* fAlpha = asin(arg)*kRad2Deg;
 
-    const Double_t arg1 = cd*sy-sd*sx;              // [mm]
-    const Double_t arg2 = cd*sx+sd*sy;              // [mm]
+    const Double_t arg1 = cd*sy-sd*sx;          // [mm]
+    const Double_t arg2 = cd*sx+sd*sy;          // [mm]
 
-    fAlpha         = asin(arg1/dist)*kRad2Deg;      // [deg]
-    fCosDeltaAlpha = arg2/dist;                     // [1]
-    fDist          = dist;                          // [mm]
+    fAlpha         = asin(arg1/dist)*kRad2Deg;  // [deg]
+    fCosDeltaAlpha = arg2/dist;                 // [1]
+    fDist          = dist;                      // [mm]
 
     SetReadyToSave();
Index: trunk/MagicSoft/Mars/mimage/MHillasSrcCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHillasSrcCalc.cc	(revision 2161)
+++ trunk/MagicSoft/Mars/mimage/MHillasSrcCalc.cc	(revision 2173)
@@ -33,5 +33,5 @@
 #include "MHillasSrcCalc.h"
 
-#include <fstream.h>
+#include <fstream>
 
 #include "MParList.h"
@@ -44,4 +44,6 @@
 
 ClassImp(MHillasSrcCalc);
+
+using namespace std;
 
 static const TString gsDefName  = "MHillasSrcCalc";
Index: trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc	(revision 2161)
+++ trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc	(revision 2173)
@@ -253,5 +253,5 @@
 
 #include <stdlib.h>       // atof					  
-#include <fstream.h>      // ofstream, SavePrimitive
+#include <fstream>        // ofstream, SavePrimitive
 
 #include <TGFrame.h>      // TGFrame
@@ -272,4 +272,6 @@
 
 ClassImp(MImgCleanStd);
+
+using namespace std;
 
 enum {
Index: trunk/MagicSoft/Mars/mimage/MNewImagePar.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MNewImagePar.cc	(revision 2161)
+++ trunk/MagicSoft/Mars/mimage/MNewImagePar.cc	(revision 2173)
@@ -35,5 +35,5 @@
 #include "MNewImagePar.h"
 
-#include <fstream.h>
+#include <fstream>
 
 #include "MLog.h"
@@ -49,4 +49,6 @@
 
 ClassImp(MNewImagePar);
+
+using namespace std;
 
 // --------------------------------------------------------------------------