Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcCorsikaRunHeader.cc
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcCorsikaRunHeader.cc	(revision 1628)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcCorsikaRunHeader.cc	(revision 1629)
@@ -47,30 +47,33 @@
     fTitle = title ? title : "Translation of the CORSIKA header";
 
-    fRunNumber = 0.0;
-    fDate = 0.0;
-    fCorsika_version = 0.0;
-    fNumObsLev = 0.0;
-    for(int i=0;i<10;i++)
-        fHeightLev[i]=0.0;
-    fSlopeSpec = 0.0;
-    fELowLim = 0.0;
-    fEUppLim = 0.0;
-    fEGS4_flag = 0.0;
-    fNKG_flag = 0.0;
-    fEcutoffh = 0.0;
-    fEcutoffm = 0.0;
-    fEcutoffe = 0.0;
-    fEcutoffg = 0.0;
+    fRunNumber = 0;
+    fDate = 0;
+    fCorsikaVersion = 0;
+    fNumObsLev = 0;
 
-    for(int i=0;i<50;i++)  fC[i] = 0.0;
-    for(int i=0;i<40;i++)  fCKA[i] = 0.0;
-    for(int i=0;i<5 ;i++)  fCETA[i] = 0.0;
-    for(int i=0;i<11;i++)  fCSTRBA[i] = 0.0;
-    for(int i=0;i<5;i++){
-        fAATM[i] = 0.0;
-        fBATM[i] = 0.0;
-        fCATM[i] = 0.0;
+    for (int i=0; i<10; i++)
+        fHeightLev[i]=0;
+
+    fSlopeSpec = 0;
+    fELowLim = 0;
+    fEUppLim = 0;
+    fEGS4flag = 0;
+    fNKGflag = 0;
+    fEcutoffh = 0;
+    fEcutoffm = 0;
+    fEcutoffe = 0;
+    fEcutoffg = 0;
+
+    for(int i=0; i<50; i++)  fC[i] = 0;
+    for(int i=0; i<40; i++)  fCKA[i] = 0;
+    for(int i=0; i<5; i++)  fCETA[i] = 0;
+    for(int i=0; i<11; i++)  fCSTRBA[i] = 0;
+    for(int i=0; i<5; i++)
+    {
+        fAATM[i] = 0;
+        fBATM[i] = 0;
+        fCATM[i] = 0;
     }
-    for(int i=0;i<4;i++)  fNFL[i] = 0.0;
+    for (int i=0;i<4; i++)  fNFL[i] = 0;
 
 }
@@ -105,13 +108,15 @@
     fRunNumber = runnumber;
     fDate = date;
-    fCorsika_version = vers;
+    fCorsikaVersion = vers;
     fNumObsLev = numobslev;
-    for(int i=0;i<10;i++)
+
+    for (int i=0; i<10; i++)
         fHeightLev[i]=height[i];
+
     fSlopeSpec = slope;
     fELowLim = elow;
     fEUppLim = eupp;
-    fEGS4_flag = egs4;
-    fNKG_flag = nkg;
+    fEGS4flag = egs4;
+    fNKGflag = nkg;
     fEcutoffh = eh;
     fEcutoffm = em;
@@ -119,14 +124,15 @@
     fEcutoffg = eg;
 
-    for(int i=0;i<50;i++)  fC[i] = c[i];
-    for(int i=0;i<40;i++)  fCKA[i] = cka[i];
-    for(int i=0;i<5 ;i++)  fCETA[i] = ceta[i];
-    for(int i=0;i<11;i++)  fCSTRBA[i] = cstrba[i];
-    for(int i=0;i<5;i++){
+    for (int i=0; i<50; i++)  fC[i] = c[i];
+    for (int i=0; i<40; i++)  fCKA[i] = cka[i];
+    for (int i=0; i<5 ; i++)  fCETA[i] = ceta[i];
+    for (int i=0; i<11; i++)  fCSTRBA[i] = cstrba[i];
+    for (int i=0; i<5; i++)
+    {
         fAATM[i] = aatm[i];
         fBATM[i] = batm[i];
         fCATM[i] = catm[i];
-       }
-    for(int i=0;i<4;i++)  fNFL[i] = nfl[i];
+    }
+    for (int i=0; i<4; i++)  fNFL[i] = nfl[i];
 }
 
Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcCorsikaRunHeader.h
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcCorsikaRunHeader.h	(revision 1628)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcCorsikaRunHeader.h	(revision 1629)
@@ -20,5 +20,5 @@
     Float_t fRunNumber;
     Float_t fDate;
-    Float_t fCorsika_version;
+    Float_t fCorsikaVersion;
     Float_t fNumObsLev;
     Float_t fHeightLev[10];
@@ -26,6 +26,6 @@
     Float_t fELowLim;
     Float_t fEUppLim;    // Limits of energy range for generation
-    Float_t fEGS4_flag;
-    Float_t fNKG_flag;
+    Float_t fEGS4flag;
+    Float_t fNKGflag;
     Float_t fEcutoffh;
     Float_t fEcutoffm;
@@ -45,5 +45,4 @@
 public:
     MMcCorsikaRunHeader(const char *name=NULL, const char *title=NULL);
-    ~MMcCorsikaRunHeader();
 
     void Fill(const Float_t  runnumber,