Index: trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.cc	(revision 2173)
@@ -67,5 +67,5 @@
 #include "MBlindPixelCalc.h"
 
-#include <fstream.h>
+#include <fstream>
 
 #include "MLog.h"
@@ -83,4 +83,6 @@
 
 ClassImp(MBlindPixelCalc);
+
+using namespace std;
 
 static const TString gsDefName  = "MBlindPixelCalc";
Index: trunk/MagicSoft/Mars/manalysis/MCT1PointingCorrCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCT1PointingCorrCalc.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MCT1PointingCorrCalc.cc	(revision 2173)
@@ -43,4 +43,6 @@
 
 ClassImp(MCT1PointingCorrCalc);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.cc	(revision 2173)
@@ -31,5 +31,5 @@
 
 #include <math.h>
-#include <fstream.h>
+#include <fstream>
 
 #include "MLog.h"
@@ -45,4 +45,6 @@
 
 ClassImp(MCT1SupercutsCalc);
+
+using namespace std;
 
 void MCT1SupercutsCalc::InitParams()
Index: trunk/MagicSoft/Mars/manalysis/MCerPhotAnal.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCerPhotAnal.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MCerPhotAnal.cc	(revision 2173)
@@ -54,4 +54,6 @@
 ClassImp(MCerPhotAnal);
 
+using namespace std;
+
 // --------------------------------------------------------------------------
 //
@@ -178,5 +180,5 @@
 
 	sigmaped /= (fRawEvt->GetNumHiGainSamples()-5);
-	sigmaped = sqrt(sumlocal);
+	sigmaped = sqrt((float)sumlocal);
 
 	const UInt_t pixid = pixel.GetPixelId();
@@ -195,6 +197,6 @@
         fCerPhotEvt->AddPixel(pixid, nphot, sigmaped/2.236);
 	ped.SetPedestal(pedes, sigmaped);
-	ped.SetPedestalRms(sigmaped/sqrt(fRawEvt->GetNumHiGainSamples()-5),
-			   sigmaped/sqrt(2*(fRawEvt->GetNumHiGainSamples()-5)));
+	ped.SetPedestalRms(sigmaped/sqrt(fRawEvt->GetNumHiGainSamples()-5.),
+			   sigmaped/sqrt(2.*(fRawEvt->GetNumHiGainSamples()-5)));
 
         // FIXME! Handling of Lo Gains is missing!
Index: trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc	(revision 2173)
@@ -57,4 +57,6 @@
 ClassImp(MCerPhotCalc);
 
+using namespace std;
+
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc	(revision 2173)
@@ -28,5 +28,5 @@
 #include <math.h>
 #include <limits.h>
-#include <fstream.h>
+#include <fstream>
 
 #include <TCanvas.h>
@@ -37,4 +37,6 @@
 
 ClassImp(MCerPhotEvt);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc	(revision 2173)
@@ -29,4 +29,6 @@
 ClassImp(MCerPhotPix);
 
+using namespace std;
+
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/manalysis/MCompProbCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCompProbCalc.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MCompProbCalc.cc	(revision 2173)
@@ -46,4 +46,6 @@
 
 ClassImp(MCompProbCalc);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/manalysis/MCurrents.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCurrents.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MCurrents.cc	(revision 2173)
@@ -36,4 +36,6 @@
 
 ClassImp(MCurrents);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/manalysis/MCurrents.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCurrents.h	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MCurrents.h	(revision 2173)
@@ -27,5 +27,5 @@
     UInt_t GetCurrent(Int_t i) const { return (*this)[i]; }
     UInt_t &operator[](Int_t i) { return (UInt_t&)fArray[i]; }
-    const UInt_t &operator[](Int_t i) const { return ((TArrayI)fArray)[i]; }
+    const UInt_t &operator[](Int_t i) const { return (*this)[i]; }
 
     UInt_t GetMin() const;
Index: trunk/MagicSoft/Mars/manalysis/MEnergyEst.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MEnergyEst.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MEnergyEst.cc	(revision 2173)
@@ -39,4 +39,6 @@
 ClassImp(MEnergyEst);
 
+using namespace std;
+
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.cc	(revision 2173)
@@ -46,4 +46,6 @@
 ClassImp(MEnergyEstParam);
 
+using namespace std;
+
 // --------------------------------------------------------------------------
 //
@@ -284,5 +286,5 @@
 }
 
-void MEnergyEstParam::Print(Option_t *opt)
+void MEnergyEstParam::Print(Option_t *opt) const
 {
     for (int i=0; i<fA.GetSize(); i++)
Index: trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.h	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.h	(revision 2173)
@@ -61,5 +61,5 @@
     Double_t GetCoeff(Int_t i) { return i<fA.GetSize()? fA[i] : fB[i-fA.GetSize()]; }
 
-    void Print(Option_t *o=NULL);
+    void Print(Option_t *o=NULL) const;
 
     ClassDef(MEnergyEstParam, 0) // Task to estimate the energy
Index: trunk/MagicSoft/Mars/manalysis/MEnergyEstimate.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MEnergyEstimate.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MEnergyEstimate.cc	(revision 2173)
@@ -45,4 +45,7 @@
 ClassImp(MEnergyEstimate);
 
+using namespace std;
+
+
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/manalysis/MFiltercutsCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MFiltercutsCalc.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MFiltercutsCalc.cc	(revision 2173)
@@ -47,4 +47,6 @@
 
 ClassImp(MFiltercutsCalc);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/manalysis/MHadronness.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MHadronness.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MHadronness.cc	(revision 2173)
@@ -39,4 +39,6 @@
 ClassImp(MHadronness);
 
+using namespace std;
+
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc	(revision 2173)
@@ -53,4 +53,6 @@
 
 ClassImp(MMcPedestalCopy);
+
+using namespace std;
 
 MMcPedestalCopy::MMcPedestalCopy(const char *name, const char *title)
@@ -136,8 +138,8 @@
 
         const Float_t pedest = fMcPed->GetPedestal(i);
-        const Float_t pedrms = pedest/sqrt(num);
+        const Float_t pedrms = pedest/sqrt((float)num);
 
         const Float_t sigma  = fMcPed->GetPedestalRms(i);
-        const Float_t sigrms = sigma/sqrt(num*2);
+        const Float_t sigrms = sigma/sqrt(num*2.);
 
 	pix.SetPedestal(pedest, sigma);
Index: trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc	(revision 2173)
@@ -70,4 +70,6 @@
 ClassImp(MMcPedestalNSBAdd);
 
+using namespace std;
+
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2.cc	(revision 2173)
@@ -56,6 +56,7 @@
 #include <TCanvas.h>
 
-
-ClassImp(MMcTriggerLvl2)
+ClassImp(MMcTriggerLvl2);
+
+using namespace std;
 
 // ---------------------------
Index: trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2Calc.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2Calc.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2Calc.cc	(revision 2173)
@@ -49,6 +49,7 @@
 #include "MGeomCam.h"
 
+ClassImp(MMcTriggerLvl2Calc);
 
-ClassImp(MMcTriggerLvl2Calc);
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.cc	(revision 2173)
@@ -45,5 +45,5 @@
 #include "MMultiDimDistCalc.h"
 
-#include <fstream.h>
+#include <fstream>
 
 #include "MHMatrix.h" // must be before MLogManip.h
@@ -59,4 +59,6 @@
 
 ClassImp(MMultiDimDistCalc);
+
+using namespace std;
 
 static const TString gsDefName  = "MMultiDimDistCalc";
@@ -176,6 +178,6 @@
     *fData >> event;
 
-    Double_t numg = fNum;
-    Double_t numh = fNum;
+    Int_t numg = fNum;
+    Int_t numh = fNum;
     if (fNum==0)
     {
Index: trunk/MagicSoft/Mars/manalysis/MPadding.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MPadding.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MPadding.cc	(revision 2173)
@@ -98,4 +98,6 @@
 ClassImp(MPadding);
 
+using namespace std;
+
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/manalysis/MParameters.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MParameters.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MParameters.cc	(revision 2173)
@@ -35,5 +35,5 @@
 #include "MParameters.h"
 
-#include <fstream.h>
+#include <fstream>
 
 #include "MLog.h"
@@ -43,4 +43,6 @@
 ClassImp(MParameterI);
 //ClassImp(MParameter);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc	(revision 2173)
@@ -50,4 +50,6 @@
 
 ClassImp(MPedCalcPedRun);
+
+using namespace std;
 
 MPedCalcPedRun::MPedCalcPedRun(const char *name, const char *title)
@@ -135,5 +137,5 @@
 Float_t MPedCalcPedRun::CalcHiGainMeanErr(Float_t higainrms) const
 {
-    return higainrms/sqrt(fNumHiGainSamples);
+    return higainrms/sqrt((float)fNumHiGainSamples);
 }
 
Index: trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc	(revision 2173)
@@ -40,6 +40,7 @@
 #include "MGeomCam.h"
 
+ClassImp(MPedestalCam);
 
-ClassImp(MPedestalCam);
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/manalysis/MSigmabar.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MSigmabar.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MSigmabar.cc	(revision 2173)
@@ -55,4 +55,6 @@
 ClassImp(MSigmabar);
 
+using namespace std;
+
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/manalysis/MSigmabarCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MSigmabarCalc.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MSigmabarCalc.cc	(revision 2173)
@@ -50,4 +50,6 @@
 
 ClassImp(MSigmabarCalc);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/manalysis/MSigmabarParam.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MSigmabarParam.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MSigmabarParam.cc	(revision 2173)
@@ -46,4 +46,6 @@
 ClassImp(MSigmabarParam);
 
+using namespace std;
+
 MSigmabarParam::MSigmabarParam(const char *name, const char *title) : fSigmabarMin(0), fSigmabarMax(0), fMjdMin(0), fMjdMax(0), fThetaMin(0), fThetaMax(0), fRunNumber(0)
 {
@@ -73,5 +75,5 @@
 }
 
-void MSigmabarParam::Print()
+void MSigmabarParam::Print(Option_t *) const
 {
   *fLog << endl << "Run " << fRunNumber << " | " 
Index: trunk/MagicSoft/Mars/manalysis/MSigmabarParam.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MSigmabarParam.h	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MSigmabarParam.h	(revision 2173)
@@ -33,5 +33,5 @@
   Double_t GetThetaMax() const { return fThetaMax; }
 
-  void Print();
+  void Print(Option_t *o="") const;
       
   ClassDef(MSigmabarParam, 1)  // Storage container for characterizing a distribution of events in the Sigmabar-Theta plane
Index: trunk/MagicSoft/Mars/manalysis/MSrcPosCam.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MSrcPosCam.cc	(revision 2167)
+++ trunk/MagicSoft/Mars/manalysis/MSrcPosCam.cc	(revision 2173)
@@ -34,5 +34,5 @@
 #include "MSrcPosCam.h"
 
-#include <fstream.h>
+#include <fstream>
 
 #include "MLog.h"
@@ -40,4 +40,6 @@
 
 ClassImp(MSrcPosCam);
+
+using namespace std;
 
 static const TString gsDefName  = "MSrcPosCam";