Changeset 9616 for trunk/MagicSoft/Mars/mcorsika

Timestamp:

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

Author:

rohlfs

Message:

can read also EventIO files

Location:

trunk/MagicSoft/Mars/mcorsika

Files:

• MCorsikaEvtHeader.cc (modified) (6 diffs)
• MCorsikaEvtHeader.h (modified) (2 diffs)
• MCorsikaFormat.cc (added)
• MCorsikaFormat.h (added)
• MCorsikaRead.cc (modified) (14 diffs)
• MCorsikaRead.h (modified) (3 diffs)
• MCorsikaRunHeader.cc (modified) (5 diffs)
• MCorsikaRunHeader.h (modified) (2 diffs)
• Makefile (modified) (1 diff)

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

trunk/MagicSoft/Mars/mcorsika/MCorsikaEvtHeader.h

@@ -13 +13 @@
 //class ifstream;
 #include <iosfwd>
+
+class MCorsikaFormat;
 
 class MCorsikaEvtHeader : public MParContainer
@@ -60 +62 @@
     Double_t GetImpact() const;
 
-    Int_t  ReadEvt(istream& fin);    // read in event header block
-    Bool_t ReadEvtEnd(istream& fin); // read in event end block
+    Int_t  ReadEvt(MCorsikaFormat * fInFormat);    // read in event header block
+    Bool_t ReadEvtEnd(MCorsikaFormat * fInFormat); // read in event end block
 
     ClassDef(MCorsikaEvtHeader, 1) // Parameter Conatiner for raw EVENT HEADER

trunk/MagicSoft/Mars/mcorsika/MCorsikaRead.cc

@@ -49 +49 @@
 #include "MStatusDisplay.h"
 
+#include "MCorsikaFormat.h"
 #include "MCorsikaRunHeader.h"
 #include "MCorsikaEvtHeader.h"
@@ -97 +98 @@
     : fRunHeader(0), fEvtHeader(0), fEvent(0), /*fEvtData(0),*/ fForceMode(kFALSE),
     fFileNames(0), fNumFile(0), fNumEvents(0), fNumTotalEvents(0),
-    fIn(0), fParList(0)
+    fIn(0),  fInFormat(0), fParList(0)
 {
     fName  = name  ? name  : "MRead";
@@ -118 +119 @@
     if (fIn)
         delete fIn;
+    if (fInFormat)
+        delete fInFormat;
 }
 
@@ -161 +164 @@
 Bool_t MCorsikaRead::ReadEvtEnd()
 {
-    if (!fRunHeader->SeekEvtEnd(*fIn))
+    if (!fInFormat->SeekEvtEnd())
     {
         *fLog << (fForceMode?warn:err) << "Error: RUNE section not found in file." << endl;
@@ -168 +171 @@
     }
 
-    if (!fRunHeader->ReadEvtEnd(*fIn))
+    if (!fRunHeader->ReadEvtEnd(fInFormat))
     {
         *fLog << (fForceMode?warn:err) << "Error: Reading RUNE section failed." << endl;
@@ -184 +187 @@
 Int_t MCorsikaRead::OpenNextFile(Bool_t print)
 {
+
     //
     // open the input stream and check if it is really open (file exists?)
@@ -191 +195 @@
     fIn = NULL;
 
+    if (fInFormat)
+       delete fInFormat;
+    fInFormat = NULL;
+
     //
     // Check for the existance of a next file to read
@@ -204 +212 @@
 
     const char *expname = gSystem->ExpandPathName(name);
-    fIn = new ifstream(expname);
-
-    const Bool_t noexist = !(*fIn);
-    if (noexist)
-    {
-        *fLog << err << "Cannot open file " << expname << ": ";
-        *fLog << (errno!=0?strerror(errno):"Insufficient memory for decompression") << endl;
-    }
-    else
-    {
-        *fLog << inf << "Open file: '" << name << "'" << endl;
-
-        if (fDisplay)
-        {
-            // Show the number of the last event after
-            // which we now open a new file
-            TString txt = GetFileName();
-            txt += " @ ";
-            txt += GetNumExecutions()-1;
-            fDisplay->SetStatusLine2(txt);
-        }
-    }
-
+    fInFormat = CorsikaFormatFactory(fLog, expname);
     delete [] expname;
 
-    if (noexist)
+    if (fInFormat == NULL)
         return kERROR;
 
+    *fLog << inf << "Open file: '" << name << "'" << endl;
+
+    if (fDisplay)
+    {
+       // Show the number of the last event after
+       // which we now open a new file
+       TString txt = GetFileName();
+       txt += " @ ";
+       txt += GetNumExecutions()-1;
+       fDisplay->SetStatusLine2(txt);
+    }
+
     fNumFile++;
 
@@ -237 +235 @@
     // Read RUN HEADER (see specification) from input stream
     //
-    if (!fRunHeader->ReadEvt(*fIn))
+    if (!fRunHeader->ReadEvt(fInFormat))
         return kERROR;
 //    if (!fEvtHeader->ReadRunHeader(*fIn, *fRunHeader))
 //        return kERROR;
 
-    const streampos pos = fIn->tellg();
+    fInFormat->StorePos();
     if (!ReadEvtEnd())
         return kERROR;
-    fIn->seekg(pos, ios::beg);
+    fInFormat->ResetPos();
 
 
@@ -395 +393 @@
 // Read a single event from the stream
 //
-Bool_t MCorsikaRead::ReadEvent(istream &fin)
+Bool_t MCorsikaRead::ReadEvent()
 {
     //
@@ -401 +399 @@
     // if there is no next event anymore stop eventloop
     //
-    Int_t rc = fEvtHeader->ReadEvt(fin); //read event header block
+    Int_t rc = fEvtHeader->ReadEvt(fInFormat); //read event header block
     if (!rc)
         return kFALSE;
 
-    rc = fEvent->ReadCorsikaEvt(fin);
+    rc = fEvent->ReadCorsikaEvt(fInFormat);
 
     /*
@@ -418 +416 @@
     */
 
-    return rc==kTRUE ? fEvtHeader->ReadEvtEnd(fin) : rc;
+    return rc==kTRUE ? fEvtHeader->ReadEvtEnd(fInFormat) : rc;
 }
 
@@ -433 +431 @@
     while (1)
     {
-        if (fIn)
+        if (fInFormat)
         {
             // Read a single event from file
-            const Bool_t rc = ReadEvent(*fIn);
+            const Bool_t rc = ReadEvent();
 
             // kFALSE means: end of file (try next one)
@@ -442 +440 @@
                 return rc;
 
-            if (!fRunHeader->ReadEvtEnd(*fIn))
+
+            fInFormat->UnreadLastHeader();
+            if (!fRunHeader->ReadEvtEnd(fInFormat))
                 if (!fForceMode)
                     return kERROR;

trunk/MagicSoft/Mars/mcorsika/MCorsikaRead.h

@@ -13 +13 @@
 class MCorsikaEvtHeader;
 class MPhotonEvent;
+class MCorsikaFormat;
 
 class MCorsikaRead : public MRead
@@ -29 +30 @@
 
     ifstream *fIn;             //! input stream (file to read from)
+         MCorsikaFormat * fInFormat; //! access to input corsika data
 
     MParList *fParList;        //! tasklist to call ReInit from
@@ -40 +42 @@
     Int_t  OpenNextFile(Bool_t print=kTRUE);
     Bool_t CalcNumTotalEvents();
-    Bool_t ReadEvent(istream &fin);
+    Bool_t ReadEvent();
 
     Int_t PreProcess(MParList *pList);

trunk/MagicSoft/Mars/mcorsika/MCorsikaRunHeader.cc

@@ -46 +46 @@
 
 #include "MCorsikaRunHeader.h"
+#include "MCorsikaFormat.h"
 
 #include <fstream>
@@ -78 +79 @@
 // Read in one run header from the binary file
 //
-Bool_t MCorsikaRunHeader::ReadEvt(istream& fin)
-{
-    char runh[4];
-    fin.read(runh, 4);
-    if (memcmp(runh, "RUNH", 4))
-    {
-        *fLog << err << "ERROR - Wrong identifier: RUNH expected." << endl;
-        return kFALSE;
-    }
-
-    Float_t f[272*4];
-    fin.read((char*)f, 272*4);
+Bool_t MCorsikaRunHeader::ReadEvt(MCorsikaFormat * fInFormat)
+{
+    if (!fInFormat->SeekNextBlock("RUNH", 1200))
+        return kFALSE;
+
+    Float_t f[272];
+    if (!fInFormat->ReadData(272, f))
+        return kFALSE;
 
     fRunNumber = TMath::Nint(f[0]);
@@ -157 +154 @@
     // f[145] Muon multiple scattering flag
 
-    char evth[4];
-    fin.read(evth, 4);
-    if (memcmp(evth, "EVTH", 4))
-    {
-        *fLog << err << "ERROR - Wrong identifier: EVTH expected." << endl;
-        return kFALSE;
-    }
+    if (!fInFormat->SeekNextBlock("EVTH", 1202))
+        return kFALSE;
 
     Float_t g[273];
-    fin.read((char*)&g, 273*4);
-    if (fin.eof())
-        return kFALSE;
-
-    fin.seekg(-274*4, ios::cur);
+    if (!fInFormat->ReadData(272, g))
+        return kFALSE;
+
+    fInFormat->UnreadLastData();
+    fInFormat->UnreadLastHeader();
 
     const Int_t n = TMath::Nint(g[96]);  // Number i of uses of each cherenkov event
     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;
     }
 
@@ -223 +215 @@
 }
 
-Bool_t MCorsikaRunHeader::ReadEvtEnd(istream& fin)
-{
-    char runh[4];
-    fin.read(runh, 4);
-    if (memcmp(runh, "RUNE", 4))
-    {
-        *fLog << err << "ERROR - Wrong identifier: RUNE expected." << endl;
-        return kFALSE;
-    }
+Bool_t MCorsikaRunHeader::ReadEvtEnd(MCorsikaFormat * fInFormat)
+{
+
+    if (!fInFormat->SeekNextBlock("RUNE", 1210))
+        return kFALSE;
 
     Float_t f[2];
-    fin.read((char*)f, 2*4);
+    if (!fInFormat->ReadData(2, f))
+        return kFALSE;
 
     const UInt_t runnum = TMath::Nint(f[0]);
@@ -245 +234 @@
 
     fNumEvents = TMath::Nint(f[1]);
-
-    fin.seekg(270*4, ios::cur);     // skip the remaining data of this block
 
     return kTRUE;

trunk/MagicSoft/Mars/mcorsika/MCorsikaRunHeader.h

@@ -10 +10 @@
 #include "MTime.h"
 #endif
+
+class MCorsikaFormat;
 
 class MCorsikaRunHeader : public MParContainer
@@ -119 +121 @@
 
     // I/O
-    Bool_t ReadEvt(istream& fin);
-    Bool_t ReadEvtEnd(istream& fin);
+    Bool_t ReadEvt(MCorsikaFormat * fInFormat);
+    Bool_t ReadEvtEnd(MCorsikaFormat * fInFormat);
     Bool_t SeekEvtEnd(istream &fin);
 

trunk/MagicSoft/Mars/mcorsika/Makefile

@@ -22 +22 @@
 
 SRCFILES = MCorsikaRunHeader.cc \
+           MCorsikaFormat.cc \
            MCorsikaEvtHeader.cc \
            MCorsikaRead.cc