Changeset 9616 for trunk/MagicSoft/Mars/mcorsika/MCorsikaEvtHeader.cc

Timestamp:

07/23/10 10:48:12 (14 years ago)

Author:

rohlfs

Message:

can read also EventIO files

File:

• trunk/MagicSoft/Mars/mcorsika/MCorsikaEvtHeader.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mcorsika/MCorsikaEvtHeader.cc

@@ -34 +34 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MCorsikaEvtHeader.h"
+#include "MCorsikaFormat.h"
 
 #include <iomanip>
@@ -121 +122 @@
 // return FALSE if there is no  header anymore, else TRUE
 //
-Int_t MCorsikaEvtHeader::ReadEvt(std::istream &fin)
+Int_t MCorsikaEvtHeader::ReadEvt(MCorsikaFormat * fInFormat)
 {
-    char evth[4];
-    fin.read(evth, 4);
-    if (memcmp(evth, "EVTH", 4))
-    {
-        fin.seekg(-4, ios::cur);
+
+    if (!fInFormat->SeekNextBlock("EVTH", 1202))
         return kFALSE;
-    }
 
     Float_t f[273];
-    fin.read((char*)&f, 273*4);
+    if (!fInFormat->ReadData(272, f))
+        return kFALSE;
 
     fEvtNumber  = TMath::Nint(f[0]);
@@ -160 +158 @@
     if (n!=1)
     {
-        *fLog << err << "ERROR - Currently only one impact parameter per event is supported." << endl;
-        return kFALSE;
+        *fLog << err  << "ERROR   - Currently only one impact parameter per event is supported." << endl;
+        *fLog << warn << "WARNING - This error is replaced by a warning." << endl;
     }
 
@@ -167 +165 @@
     fY = -f[97];    //fY = f[117];
 
-    fin.seekg(1088-273*4, ios::cur);
-
-    return !fin.eof();
+    return !fInFormat->Eof();
 }
 
@@ -175 +171 @@
 // this member function is for reading the event end block
 
-Bool_t MCorsikaEvtHeader::ReadEvtEnd(std::istream &fin)
+Bool_t MCorsikaEvtHeader::ReadEvtEnd(MCorsikaFormat * fInFormat)
 {
+
+    if (!fInFormat->SeekNextBlock("EVTE", 1209))
+        return kFALSE;
+
     //fin.seekg(-1088,ios::cur);
 
     Float_t f[2];
-    fin.read((char*)&f, 2*4);
+
+    if (!fInFormat->ReadData(2, f))
+        return kFALSE;
 
     const UInt_t evtnum = TMath::Nint(f[0]);
@@ -192 +194 @@
     fWeightedNumPhotons = f[1];
 
-    fin.seekg(1080,ios::cur);
-
-    return !fin.eof();
+    return !fInFormat->Eof();
 }