Changeset 18526

Timestamp:

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

Author:

dbaack

Message:

Bugfixes and gcc-5 compability changes

Location:

branches/Corsika7500Compatibility

Files:

• Makefile (modified) (1 diff)
• Makefile.conf.linux (modified) (2 diffs)
• Makefile.conf.linux-gnu (modified) (1 diff)
• mbase/MTime.cc (modified) (1 diff)
• mcorsika/MCorsikaFormat.cc (modified) (3 diffs)
• mcorsika/MCorsikaFormat.h (modified) (2 diffs)
• mcorsika/MCorsikaRead.cc (modified) (1 diff)
• mfileio/MReadFiles.cc (modified) (1 diff)
• msim/MPhotonEvent.cc (modified) (2 diffs)
• msim/MPhotonEvent.h (modified) (1 diff)

branches/Corsika7500Compatibility/Makefile

@@ -116 +116 @@
 RNDMNAME:=$(shell mktemp)
 
-all: $(SOLIB) $(PROGRAMS)
+all: gcc  $(SOLIB) $(PROGRAMS)
         @echo " Done. "
         @echo " "
+
+gcc:
+        @echo "gcc -v"
+        $(CC) -v
 
 static: LIBS=$(SUBDIRS:=/*.o) $(OBJS)

branches/Corsika7500Compatibility/Makefile.conf.linux

@@ -10 +10 @@
 
 ifeq ($(shell which colorgcc), )
-CC       := gcc
-CXX      := g++
+CC       := gcc-4.8
+CXX      := g++-4.8
 else
 CC       := colorgcc
@@ -17 +17 @@
 endif
 
-LINKER   := g++
+LINKER   := g++-4.8
 F77      := f77
 AR       := ar -rc

branches/Corsika7500Compatibility/Makefile.conf.linux-gnu

@@ -12 +12 @@
 # compilers
 
-CC       = gcc
-CXX      = g++
+CC       = gcc-4.8
+CXX      = g++-4.8
 F77      = f77
 AR       = ar -rc

branches/Corsika7500Compatibility/mbase/MTime.cc

@@ -1152 +1152 @@
 {
     out << *this;
-    return out;
+    return out.good();
 }
 

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);

branches/Corsika7500Compatibility/mfileio/MReadFiles.cc

@@ -157 +157 @@
 
     // return stream status
-    return *fIn;
+    return fIn->good();
 }
 

branches/Corsika7500Compatibility/msim/MPhotonEvent.cc

@@ -559 +559 @@
    fInFormat->Read(bunchHeader, 3 * sizeof(Int_t));
 
-   this->resize( bunchHeader[2] );   
+   this->Resize( bunchHeader[2] );   
 
    Int_t n = 0;
@@ -582 +582 @@
 }
 
+Int_t MPhotonEvent::ReadEventIoEvtCompact(MCorsikaFormat *fInFormat)
+{
+        //Int_t bunchHeader[3];
+        //fInFormat->Read(bunchHeader, 3*sizeof(Int_t));
+        short array;
+        short tel;
+        float photon;
+        fInFormat->Read(&array, sizeof(array));
+        fInFormat->Read(&tel, sizeof(tel));
+        fInFormat->Read(&photon, sizeof(photon));
+
+        std::cout << "ReadEventIO Evt Compact  (Header) :  " << array << "  -  " << tel << "  -  " << photon << std::endl;
+
+        this->Resize( (int)photon );
+
+        int nbunches;
+        fInFormat->Read(&nbunches, sizeof(int));
+        std::cout << "ReadEventIO Evt Compact  (nbunches) :  " << nbunches << std::endl;
+
+        Int_t  n = 0;
+
+        for(int bunch = 0; bunch < (int)nbunches; bunch++)
+        {
+                short buffer[8];
+                float floatBuffer[8];
+                fInFormat->Read(buffer, 8 * sizeof(short));
+                
+
+                std::cout << "\nBunch: " << bunch << "  with: ";
+                for(int i=0; i<8; i++)
+                {
+                        std::cout << ",  " <<buffer[i];
+                        floatBuffer[i] = static_cast<float>(buffer[i]);
+                }
+
+                if(Add(n).FillEventIO(floatBuffer))
+                        n++;
+        }
+        Resize(n);
+        fData.UnSort();
+        
+        SetReadyToSave();
+
+        return kTRUE;
+}
+
 Int_t MPhotonEvent::ReadCorsikaEvt(Float_t * data, Int_t numEvents, Int_t arrayIdx)
 {
    Int_t n = 0;
 
-   this->resize(numEvents);
+   this->Resize(numEvents);
 
    for (Int_t event = 0; event < numEvents; event++)

branches/Corsika7500Compatibility/msim/MPhotonEvent.h

@@ -63 +63 @@
     // I/O
     Int_t ReadEventIoEvt(MCorsikaFormat *fInFormat);
+    Int_t ReadEventIoEvtCompact(MCorsikaFormat *fInFormat);
     Int_t ReadCorsikaEvt(Float_t * data, Int_t numEvents, Int_t arrayIdx);