Changeset 18455 for branches

Timestamp:

03/09/16 15:40:33 (9 years ago)

Author:

dbaack

Message:

Commit old changes from 7.4 Branch to this branch

Location:

branches/Corsika7500Compatibility

Files:

• mbase/MQuaternion.h (modified) (1 diff)
• mcorsika/MCorsikaFormat.cc (modified) (3 diffs)
• mcorsika/MCorsikaFormat.h (modified) (1 diff)
• mcorsika/MCorsikaRead.cc (modified) (2 diffs)
• mcorsika/MCorsikaRunHeader.cc (modified) (1 diff)
• msim/MPhotonData.h (modified) (1 diff)
• msim/MPhotonEvent.cc (modified) (3 diffs)
• msim/MPhotonEvent.h (modified) (1 diff)

branches/Corsika7500Compatibility/mbase/MQuaternion.h

@@ -9 +9 @@
 #ifndef ROOT_TQuaternion
 #include <math.h>
-#define sqrt ::sqrt
+//#define sqrt ::sqrt
 #include <TQuaternion.h>
-#undef sqrt
+//#undef sqrt
 #endif
 

branches/Corsika7500Compatibility/mcorsika/MCorsikaFormat.cc

@@ -57 +57 @@
     }
 
-    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 +66 @@
         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 +165 @@
     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";

branches/Corsika7500Compatibility/mcorsika/MCorsikaFormat.h

@@ -45 +45 @@
 {
 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,

branches/Corsika7500Compatibility/mcorsika/MCorsikaRead.cc

@@ -402 +402 @@
       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 +474 @@
 Int_t MCorsikaRead::Process()
 {
+   //fEvent->Clear();
+   //fEvent->Reset();
+   fEvent->Resize(0);
    while (1)  // loop for multiple input files
    {

branches/Corsika7500Compatibility/mcorsika/MCorsikaRunHeader.cc

@@ -205 +205 @@
  */
     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 (°)

branches/Corsika7500Compatibility/msim/MPhotonData.h

@@ -16 +16 @@
 #ifndef ROOT_TQuaternion
 #include <math.h>
-#define sqrt ::sqrt
+//#define sqrt ::sqrt
 #include <TQuaternion.h>
-#undef sqrt
+//#undef sqrt
 #endif
 

branches/Corsika7500Compatibility/msim/MPhotonEvent.cc

@@ -559 +559 @@
    fInFormat->Read(bunchHeader, 3 * sizeof(Int_t));
 
+   this->resize( bunchHeader[2] );   
+
    Int_t n = 0;
 
@@ -583 +585 @@
 {
    Int_t n = 0;
+
+   this->resize(numEvents);
 
    for (Int_t event = 0; event < numEvents; event++)
@@ -644 +648 @@
     }
 }
+
+void MPhotonEvent::Reset()
+{
+        this->Clear();
+        this->Resize(0);
+}

branches/Corsika7500Compatibility/msim/MPhotonEvent.h

@@ -70 +70 @@
     //void Clear(Option_t * = NULL);
 
+    void Reset();
+
     ClassDef(MPhotonEvent, 1) //Container to store the raw Event Data
 };