Changeset 18526 for branches/Corsika7500Compatibility/mcorsika

Timestamp:

06/28/16 14:29:15 (8 years ago)

Author:

dbaack

Message:

Bugfixes and gcc-5 compability changes

Location:

branches/Corsika7500Compatibility/mcorsika

Files:

• MCorsikaFormat.cc (modified) (3 diffs)
• MCorsikaFormat.h (modified) (2 diffs)
• MCorsikaRead.cc (modified) (1 diff)

branches/Corsika7500Compatibility/mcorsika/MCorsikaFormat.cc

@@ -69 +69 @@
     else if(strcmp(&buffer[4], "RUNH") == 0)
     {
-        fileIn->seekg(4, ios::cur);
-        delete[] buffer;
-        return new MCorsikaFormatRaw(fileIn, true);
+        //std::cout << "\n||||\tIgnore first 4 bytes" << std::endl;
+        fileIn->seekg(4, ios::cur);
+        delete[] buffer;
+        return new MCorsikaFormatRaw(fileIn, true);
     }
 
@@ -129 +130 @@
     blockIdentifier = 0;
     blockLength     = 272 * 4;
-
+    //std::cout << "||||||||||||||| Raw Blockheader: " << blockHeader << std::endl;
     switch(blockHeader)
       {
@@ -166 +167 @@
     {
         if(fFortranRaw)
-                fIn->seekg(-i*273*4-4, ios::end);
+        {
+            fIn->seekg(-i*273*4-4, ios::end);
+        }
         else
+        {
                 fIn->seekg(-i*273*4, ios::end);
+        }
 
         char runh[5]="\0\0\0\0";

branches/Corsika7500Compatibility/mcorsika/MCorsikaFormat.h

@@ -1 +1 @@
 #ifndef MARS_MDataFormat
 #define MARS_MDataFormat
+
+#include <iostream>
 
 #ifndef MARS_MAGIC
@@ -47 +49 @@
    Bool_t fFortranRaw = false;
 public:
-   MCorsikaFormatRaw(std::istream * in)
-        : MCorsikaFormat(in) {}
+   //MCorsikaFormatRaw(std::istream * in)
+   //    : MCorsikaFormat(in) {}
 
-   MCorsikaFormatRaw(std::istream* in, Bool_t fortranRaw)
-        : MCorsikaFormat(in), fFortranRaw(fortranRaw) {}
+   MCorsikaFormatRaw(std::istream* in, Bool_t fortranRaw = false)
+        : MCorsikaFormat(in), fFortranRaw(fortranRaw) {}//std::cout << "\n\n||||||||||||||||||||||||||||" << fortranRaw << std::endl;}
 
    Bool_t NextBlock(Int_t   readState, Int_t & blockType, Int_t & blockVersion,

branches/Corsika7500Compatibility/mcorsika/MCorsikaRead.cc

@@ -561 +561 @@
                                           fRunHeader->GetWavelengthMax());
                   }
-               else
+                else if (fBlockVersion == 1000 &&  (fTelescopeIdx < 0 || fTelescopeIdx ==  telIdx)     )
+                {
+                  status = fEvent->ReadEventIoEvtCompact(fInFormat);
+
+                  Int_t arrayIdx = fBlockIdentifier / 1000;
+                  Float_t xArrOff, yArrOff;
+                  fEvtHeader->GetArrayOffset(arrayIdx, xArrOff, yArrOff);
+                  fEvtHeader->SetTelescopeOffset(arrayIdx,
+                                                   xArrOff + fTelescopeY[telIdx],
+                                                   yArrOff - fTelescopeX[telIdx] );
+                  fEvent->AddXY(xArrOff + fTelescopeY[telIdx],
+                                 yArrOff - fTelescopeX[telIdx]);
+                  fEvent->SimWavelength(fRunHeader->GetWavelengthMin(),
+                                          fRunHeader->GetWavelengthMax());
+                }               
+               else
                   // skip this telescope
                   fInFormat->Seek(fBlockLength);