Index: branches/Corsika7500Compatibility/mbase/MQuaternion.h
===================================================================
--- branches/Corsika7500Compatibility/mbase/MQuaternion.h	(revision 18454)
+++ branches/Corsika7500Compatibility/mbase/MQuaternion.h	(revision 18455)
@@ -9,7 +9,7 @@
 #ifndef ROOT_TQuaternion
 #include <math.h>
-#define sqrt ::sqrt
+//#define sqrt ::sqrt
 #include <TQuaternion.h>
-#undef sqrt
+//#undef sqrt
 #endif
 
Index: branches/Corsika7500Compatibility/mcorsika/MCorsikaFormat.cc
===================================================================
--- branches/Corsika7500Compatibility/mcorsika/MCorsikaFormat.cc	(revision 18454)
+++ branches/Corsika7500Compatibility/mcorsika/MCorsikaFormat.cc	(revision 18455)
@@ -57,8 +57,8 @@
     }
 
-    char *buffer = new char[5];
-    memset(buffer, 0, 5);
-    fileIn->read(buffer, 4);
-    fileIn->seekg(-4, ios::cur);
+    char *buffer = new char[9];
+    memset(buffer, 0, 9);
+    fileIn->read(buffer, 8);
+    fileIn->seekg(-8, ios::cur);
 
     if (strcmp(buffer, "RUNH") == 0)
@@ -66,4 +66,10 @@
         delete [] buffer;
         return new MCorsikaFormatRaw(fileIn);
+    }
+    else if(strcmp(&buffer[4], "RUNH") == 0)
+    {
+	fileIn->seekg(4, ios::cur);
+	delete[] buffer;
+	return new MCorsikaFormatRaw(fileIn, true);
     }
 
@@ -159,5 +165,8 @@
     for (int i=1; i<22; i++)
     {
-        fIn->seekg(-i*273*4, ios::end);
+	if(fFortranRaw)
+        	fIn->seekg(-i*273*4-4, ios::end);
+	else
+		fIn->seekg(-i*273*4, ios::end);
 
         char runh[5]="\0\0\0\0";
Index: branches/Corsika7500Compatibility/mcorsika/MCorsikaFormat.h
===================================================================
--- branches/Corsika7500Compatibility/mcorsika/MCorsikaFormat.h	(revision 18454)
+++ branches/Corsika7500Compatibility/mcorsika/MCorsikaFormat.h	(revision 18455)
@@ -45,8 +45,11 @@
 {
 private:
-
+   Bool_t fFortranRaw = false;
 public:
    MCorsikaFormatRaw(std::istream * in)
         : MCorsikaFormat(in) {}
+
+   MCorsikaFormatRaw(std::istream* in, Bool_t fortranRaw)
+	: MCorsikaFormat(in), fFortranRaw(fortranRaw) {}
 
    Bool_t NextBlock(Int_t   readState, Int_t & blockType, Int_t & blockVersion,
Index: branches/Corsika7500Compatibility/mcorsika/MCorsikaRead.cc
===================================================================
--- branches/Corsika7500Compatibility/mcorsika/MCorsikaRead.cc	(revision 18454)
+++ branches/Corsika7500Compatibility/mcorsika/MCorsikaRead.cc	(revision 18455)
@@ -402,5 +402,5 @@
       return kTRUE;
 
-   if (fBlockType == 1204 && fReadState != 2)
+   if (fBlockType == 1204 && (fReadState != 2 && fReadState != 15))
       // next is a new set of telescope arrays, we store the previous ones
       // but not if this is the first one (fReadState != 2)
@@ -474,4 +474,7 @@
 Int_t MCorsikaRead::Process()
 {
+   //fEvent->Clear();
+   //fEvent->Reset();
+   fEvent->Resize(0);
    while (1)  // loop for multiple input files
    {
Index: branches/Corsika7500Compatibility/mcorsika/MCorsikaRunHeader.cc
===================================================================
--- branches/Corsika7500Compatibility/mcorsika/MCorsikaRunHeader.cc	(revision 18454)
+++ branches/Corsika7500Compatibility/mcorsika/MCorsikaRunHeader.cc	(revision 18455)
@@ -205,5 +205,5 @@
  */
     fWavelengthMin = g[94];        // Cherenkov bandwidth lower end in nm
-    fWavelengthMax = g[95];        // Cherenkov bandwidth upper end in nm
+    fWavelengthMax = 900;//g[95];        // Cherenkov bandwidth upper end in nm
 
     fViewConeInnerAngle = g[151];  // inner angle of view cone (°)
Index: branches/Corsika7500Compatibility/msim/MPhotonData.h
===================================================================
--- branches/Corsika7500Compatibility/msim/MPhotonData.h	(revision 18454)
+++ branches/Corsika7500Compatibility/msim/MPhotonData.h	(revision 18455)
@@ -16,7 +16,7 @@
 #ifndef ROOT_TQuaternion
 #include <math.h>
-#define sqrt ::sqrt
+//#define sqrt ::sqrt
 #include <TQuaternion.h>
-#undef sqrt
+//#undef sqrt
 #endif
 
Index: branches/Corsika7500Compatibility/msim/MPhotonEvent.cc
===================================================================
--- branches/Corsika7500Compatibility/msim/MPhotonEvent.cc	(revision 18454)
+++ branches/Corsika7500Compatibility/msim/MPhotonEvent.cc	(revision 18455)
@@ -559,4 +559,6 @@
    fInFormat->Read(bunchHeader, 3 * sizeof(Int_t));
 
+   this->resize( bunchHeader[2] );   
+
    Int_t n = 0;
 
@@ -583,4 +585,6 @@
 {
    Int_t n = 0;
+
+   this->resize(numEvents);
 
    for (Int_t event = 0; event < numEvents; event++)
@@ -644,2 +648,8 @@
     }
 }
+
+void MPhotonEvent::Reset()
+{
+	this->Clear();
+	this->Resize(0);
+}
Index: branches/Corsika7500Compatibility/msim/MPhotonEvent.h
===================================================================
--- branches/Corsika7500Compatibility/msim/MPhotonEvent.h	(revision 18454)
+++ branches/Corsika7500Compatibility/msim/MPhotonEvent.h	(revision 18455)
@@ -70,4 +70,6 @@
     //void Clear(Option_t * = NULL);
 
+    void Reset();
+
     ClassDef(MPhotonEvent, 1) //Container to store the raw Event Data
 };