Changeset 7430 for trunk/MagicSoft/Mars/mfileio

Timestamp:

11/25/05 14:47:57 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MReadRflFile.cc (modified) (3 diffs)
• MReadRflFile.h (modified) (1 diff)

trunk/MagicSoft/Mars/mfileio/MReadRflFile.cc

@@ -76 +76 @@
         fIn->read((char*)&revth, sizeof(RflEventHeader_old));
         fEvtHeader->SetEvtNumber((int)revth.EvtNumber);
-//        *fLog << "Event Number: " << revth.EvtNumber;
-//        *fLog << "  Primary ID: " << revth.PrimaryID;
-//        *fLog << "  Run Number: " << revth.RunNumber << endl;
-        return (bool)*fIn;
     }
     else
@@ -86 +82 @@
         fIn->read((char*)&revth, sizeof(RflEventHeader));
         fEvtHeader->SetEvtNumber((int)revth.EvtNumber);
-//        *fLog << "Event Number: " << revth.EvtNumber;
-//        *fLog << "  Primary ID: " << revth.PrimaryID;
-//        *fLog << "  Run Number: " << revth.RunNumber << endl;
-        return (bool)*fIn;
-    }
-}
-
-enum {
-    kError,
-    kEndOfFile,
-    kStartOfRun,
-    kEndOfRun,
-    kStartOfEvtData,
-    kEndOfEvtData,
-    kUndefined
-};
-
+        fEvtHeader->SetEnergy((int)revth.Etotal);
+        fEvtHeader->SetMomentum(revth.p[0], revth.p[1], revth.p[2]);
+        fEvtHeader->SetCorePosition(revth.CorePos[0][0], revth.CorePos[1][0]);
+        
+        fEvtHeader->SetHeightFirstInt((Float_t)revth.zFirstInt);
+
+        fEvtHeader->SetPhi((Float_t)revth.telescopePhi);
+        fEvtHeader->SetTheta((Float_t)revth.telescopeTheta);
+
+        fEvtHeader->SetNmax((Float_t)revth.longi_Nmax);
+        fEvtHeader->SetT0((Float_t)revth.longi_t0);
+        fEvtHeader->SetTmax((Float_t)revth.longi_tmax);
+        fEvtHeader->SetChi2((Float_t)revth.longi_chi2);
+
+        fEvtHeader->SetEFraction((Float_t)revth.elec_cph_fraction);
+        fEvtHeader->SetMFraction((Float_t)revth.muon_cph_fraction);
+        fEvtHeader->SetOFraction((Float_t)revth.other_cph_fraction);
+    }
+
+    return (bool)*fIn;
+}
 
 int MReadRflFile::ReadFlag()
@@ -111 +111 @@
     if (!fIn)
         return kError;
-
-    //*fLog << "<" << TString(&flag[1], 11)  << ">" <<endl;
 
     if (FlagIsA(flag, FLAG_END_OF_FILE))

trunk/MagicSoft/Mars/mfileio/MReadRflFile.h

@@ -18 +18 @@
 {
 private:
-    ifstream *fIn;          // the inputfile
-    TList    *fFileNames;   // Array which stores the \0-terminated filenames
+    enum {
+        kError,
+        kEndOfFile,
+        kStartOfRun,
+        kEndOfRun,
+        kStartOfEvtData,
+        kEndOfEvtData,
+        kUndefined
+    };
 
-    MRflEvtData *fEvtData;        //!
-    MRflEvtHeader *fEvtHeader;
-    MRflRunHeader *fRunHeader;
+    ifstream *fIn;              // the inputfile
+    TList    *fFileNames;       // Array which stores the \0-terminated filenames
 
-    UInt_t fNumFile;
-    UInt_t fEntries; // TO BE IMPLEMENTED
+    MRflEvtData   *fEvtData;    //!
+    MRflEvtHeader *fEvtHeader;  //!
+    MRflRunHeader *fRunHeader;  //!
+
+    UInt_t  fNumFile;
+    UInt_t  fEntries;           // TO BE IMPLEMENTED
     TString fFileName;
 
-    Float_t fCurrentVersion; //! Version of currently open rfl file
+    Float_t fCurrentVersion;    //! Version of currently open rfl file
 
     float  ReadVersion();