Changeset 690 for trunk/MagicSoft

Timestamp:

03/07/01 11:23:54 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MAGIC.h (modified) (1 diff)
• mraw/MRawFileRead.cc (modified) (4 diffs)
• mraw/MRawFileRead.h (modified) (2 diffs)
• mraw/MRawRunHeader.cc (modified) (1 diff)
• mraw/MRawRunHeader.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MAGIC.h

@@ -10 +10 @@
 
 #include <TROOT.h>
-
-//
-// Magic number to detect the magic file type
-//
-// const UShort_t kMagicNumber = 0xc0c0;
 
 //

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -25 +25 @@
 
 
-//  ----------- please don't delete ------------
+/*/  ----------- please don't delete ------------
 #define kBUFSZ 1024
 
@@ -53 +53 @@
     }
 };
-
+*/
 
 MRawFileRead::MRawFileRead(const char *fname, const char *name, const char *title)
@@ -63 +63 @@
     // open the input stream
     //
-    fIn = new bifstream(fname);
+    fIn = new ifstream(fname);
 
     if (!(*fIn))
@@ -109 +109 @@
     fRawRunHeader->ReadEvt(*fIn);
     fRawRunHeader->Print();
+
+    if (fRawRunHeader->GetMagicNumber()!=kMagicNumber)
+        return kFALSE;
 
     //

trunk/MagicSoft/Mars/mraw/MRawFileRead.h

@@ -6 +6 @@
 #endif
 
-class bifstream;
+class ifstream;
 
 class MTime;
@@ -24 +24 @@
     MTime          *fRawEvtTime;    // raw evt time information container to fill from file
 
-    bifstream      *fIn;            //! buffered input stream (file to read from)
+    ifstream       *fIn;            //! buffered input stream (file to read from)
 
 public:

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -88 +88 @@
     //
     *fLog << endl;
-    *fLog << "MagicNumber:  0x" << hex << fMagicNumber << " - " << (fMagicNumber==0xc0c0?"OK":"Wrong!") << endl;
+    *fLog << "MagicNumber:  0x" << hex << fMagicNumber << " - " << (fMagicNumber==kMagicNumber?"OK":"Wrong!") << endl;
     *fLog << "Version:      " << dec << "Format=" << fFormatVersion << "  ";
     *fLog << "Software=" << fSoftVersion << endl;

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -15 +15 @@
 class MArrayS;
 
+//
+// Magic number to detect the magic file type
+//
 const UShort_t kMagicNumber = 0xc0c0;