Changeset 8315 for trunk/MagicSoft/Mars/mfileio

Timestamp:

02/13/07 11:15:29 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MReadRflFile.cc (modified) (7 diffs)
• MReadRflFile.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mfileio/MReadRflFile.cc

@@ -33 +33 @@
 
 #include <errno.h>
-#include <fstream>
 
 #include <TSystem.h>
@@ -39 +38 @@
 #include "structures_rfl.h"
 
+#include "MLog.h"
+#include "MLogManip.h"
+
+#include "MZlib.h"
+
 #include "MParList.h"
+
 #include "MRflEvtData.h"
 #include "MRflEvtHeader.h"
@@ -45 +50 @@
 #include "MRflSinglePhoton.h"
 
-#include "MLog.h"
-#include "MLogManip.h"
 
 ClassImp(MReadRflFile);
@@ -185 +188 @@
                 *fLog << inf << "FIXME: Call ReInit" << endl;
 
+                // FIXME: fRunHeader->Read(fIn);
+                //        fRunHeader->Print();
+
                 fRunHeader->SetRunNumber((int)rrunh.RunNumber);
                 *fLog << underline << "RunHeader:" << endl;
-                *fLog << " Run Number:   " << rrunh.RunNumber << endl;
-                *fLog << " Date:         " << rrunh.date << endl;
-                *fLog << " Corsika Ver.: " << rrunh.Corsika_version << endl;
-
+                *fLog << " Run Number:    " << rrunh.RunNumber << endl;
+                *fLog << " Date:          " << rrunh.date << endl;
+                *fLog << " Corsika Ver.:  " << rrunh.Corsika_version << endl;
+                *fLog << " Energy Range:  " << rrunh.ELowLim << "GeV to " << rrunh.EUppLim << "GeV" << endl;
+                *fLog << " Energy Slope:  " << rrunh.SlopeSpec << endl;
+                *fLog << " Wobble Mode:   " << rrunh.wobble_mode << endl;
+                *fLog << " Atm. Model:    " << rrunh.atmospheric_model << endl;
+                // *fLog << " Theta Range:   " << rrunh.ThetaMin << "deg to " << rrunh.ThetaMax << "deg" << endl;
+                // *fLog << " Phi Range:     " << rrunh.PhiMin << "deg to " << rrunh.PhiMax << "deg" << endl;
+                // *fLog << " View Cone Rad: " << rrunh.ViewconeRadius << "deg" << endl;
                 break;
             }
@@ -196 +208 @@
             *fLog << err << "Error! found end of file... But no EOF flag. Exiting." << endl;
             return kError;
-        }
+        }/*
+        else
+        {
+            *fLog << err << "ERROR - Reflector versions <= 0.5 are not supported!" << endl;
+            return kError;
+        }*/
         return kUndefined;
 
@@ -299 +316 @@
     //
     fFileName = file->GetName();
-    const TString expname = fFileName;
+    TString expname = fFileName;
     gSystem->ExpandPathName(expname);
 
@@ -309 +326 @@
     *fLog << inf << "Open file: '" << fFileName << "'" << endl;
 
-    fIn = new ifstream(expname);
+    fIn = new MZlib(expname);
     if (!*fIn)
     {

trunk/MagicSoft/Mars/mfileio/MReadRflFile.h

@@ -10 +10 @@
 #endif
 
+class MZlib;
 class TList;
 class MRflEvtData;
@@ -28 +29 @@
     };
 
-    ifstream *fIn;              // the inputfile
-    TList    *fFileNames;       // Array which stores the \0-terminated filenames
+    MZlib *fIn;              // the inputfile
+    TList *fFileNames;       // Array which stores the \0-terminated filenames
 
     MRflEvtData   *fEvtData;    //!