Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcConfigRunHeader.cc
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcConfigRunHeader.cc	(revision 1983)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcConfigRunHeader.cc	(revision 2173)
@@ -37,6 +37,6 @@
 #include "MMcConfigRunHeader.h"
 
-#include <fstream.h>
-#include <iomanip.h>
+#include <fstream>
+#include <iomanip>
 
 #include <TArrayF.h>
@@ -46,4 +46,6 @@
 
 ClassImp(MMcConfigRunHeader);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcCorsikaRunHeader.cc
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcCorsikaRunHeader.cc	(revision 1983)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcCorsikaRunHeader.cc	(revision 2173)
@@ -36,4 +36,6 @@
 
 ClassImp(MMcCorsikaRunHeader);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx	(revision 1983)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx	(revision 2173)
@@ -23,4 +23,5 @@
 ClassImp(MMcEvt);
 
+using namespace std;
 
 
Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.cxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.cxx	(revision 1983)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.cxx	(revision 2173)
@@ -1,5 +1,5 @@
 #include "MMcFadcHeader.hxx"
 
-#include <iostream.h>
+#include <iostream>
 
 //==========
@@ -15,4 +15,5 @@
 ClassImp(MMcFadcHeader);
 
+using namespace std;
 
 
Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcRunHeader.cxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcRunHeader.cxx	(revision 1983)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcRunHeader.cxx	(revision 2173)
@@ -69,10 +69,12 @@
 #include "MMcRunHeader.hxx"
 
-#include <fstream.h>
-#include <iomanip.h>
+#include <fstream>
+#include <iomanip>
 
 #include "MLog.h"
 
 ClassImp(MMcRunHeader);
+
+using namespace std;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.cxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.cxx	(revision 1983)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.cxx	(revision 2173)
@@ -1,5 +1,5 @@
 #include "MMcTrig.hxx"
 
-#include <iostream.h>
+#include <iostream>
 
 
@@ -24,4 +24,5 @@
 ClassImp(MMcTrig);
 
+using namespace std;
 
 
@@ -123,13 +124,7 @@
   //
 
-  Byte_t ret=0;
-  Byte_t reminder;
-  Int_t body;
+  const Int_t  body=npix/8;
+  const Byte_t reminder= 1>>(npix%8);
 
-  body=npix/8;
-  reminder=(Byte_t)(pow(2,npix%8));
-
-  ret=reminder&fPixelsFirst[body][nfirstlevel];
-  return(ret);
-
+  return reminder&fPixelsFirst[body][nfirstlevel];
 }
Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcTrigHeader.cxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcTrigHeader.cxx	(revision 1983)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcTrigHeader.cxx	(revision 2173)
@@ -1,5 +1,5 @@
 #include "MMcTrigHeader.hxx"
 
-#include <iostream.h>
+#include <iostream>
 
 
@@ -28,4 +28,5 @@
 ClassImp(MMcTrigHeader);
 
+using namespace std;