Changeset 3183 for trunk/MagicSoft/Mars/mraw

Timestamp:

02/16/04 11:18:25 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawCrateArray.cc (modified) (1 diff)
• MRawCrateData.cc (modified) (1 diff)
• MRawEvtData.cc (modified) (1 diff)
• MRawEvtHeader.cc (modified) (1 diff)
• MRawEvtPixelIter.cc (modified) (1 diff)
• MRawFileRead.cc (modified) (3 diffs)
• MRawFileWrite.cc (modified) (1 diff)
• MRawRead.cc (modified) (1 diff)
• MRawRunHeader.cc (modified) (5 diffs)
• MRawRunHeader.h (modified) (2 diffs)
• MRawSocketRead.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mraw/MRawCrateArray.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Thomas Bretz 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2001
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !

trunk/MagicSoft/Mars/mraw/MRawCrateData.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Thomas Bretz 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2001
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz, 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2003
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2001
+!   Author(s): Thomas Bretz 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
+!
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

@@ -19 +19 @@
 !   Author(s): Markus Gaus 10/2002 <mailto:markus@ifae.es>
 !
-!   Copyright: MAGIC Software Development, 2000-2002
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2001
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
+!
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !
@@ -148 +148 @@
     // Read RUN HEADER (see specification) from input stream
     //
-    fRawRunHeader->ReadEvt(*fIn);
+    if (!fRawRunHeader->ReadEvt(*fIn))
+        return kFALSE;
+
     if (!(*fIn))
     {
@@ -154 +156 @@
         return kFALSE;
     }
-    if (fRawRunHeader->GetMagicNumber()!=kMagicNumber)
-        return kFALSE;
+    //if (fRawRunHeader->GetMagicNumber()!=kMagicNumber)
+    //    return kFALSE;
 
     fRawRunHeader->Print();

trunk/MagicSoft/Mars/mraw/MRawFileWrite.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2001
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
+!
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !

trunk/MagicSoft/Mars/mraw/MRawRead.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2001
+!   Author(s): Thomas Bretz 10/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
+!
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2001
+!   Author(s): Thomas Bretz 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
+!
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !
@@ -101 +101 @@
 // Read in one run header from the binary file
 //
-void MRawRunHeader::ReadEvt(istream& fin)
+Bool_t MRawRunHeader::ReadEvt(istream& fin)
 {
     //
@@ -116 +116 @@
     {
         *fLog << err << "Error: Wrong Magic Number (0x" << hex << fMagicNumber << "): Not a Magic File!" << endl;
-        return;
+        return kFALSE;
     }
 
@@ -125 +125 @@
 
     fin.read((char*)&fFormatVersion,    2);     // Total=4
-    if (fFormatVersion>2)
-        *fLog << warn << "WARNING - Format version V" << fFormatVersion << " unknown!" << endl;
+    if (fFormatVersion>kMaxFormatVersion)
+    {
+        *fLog << err << "WARNING - File vormat V" << fFormatVersion << " not implemented!" << endl;
+        return kFALSE;
+    }
 
     fin.read((char*)&fSoftVersion,      2);     // Total=6
@@ -165 +168 @@
     fin.read((char*)fPixAssignment->GetArray(), nPixel*2);
     fin.read((char*)&dummy, 16);
+
+    return kTRUE;
 }
 

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -17 +17 @@
 // Magic number to detect the magic file type
 //
-const UShort_t kMagicNumber = 0xc0c0;
+const UShort_t kMagicNumber      = 0xc0c0;
+const Byte_t   kMaxFormatVersion =      3;
 
 //
@@ -106 +107 @@
     void Print(Option_t *t=NULL) const;
 
-    void ReadEvt(istream& fin);
+    Bool_t ReadEvt(istream& fin);
 
     ClassDef(MRawRunHeader, 2)  // storage container for general info

trunk/MagicSoft/Mars/mraw/MRawSocketRead.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz, 10/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2003
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !
@@ -220 +220 @@
     //
     fLog->SetNullOutput();
-    fRawRunHeader->ReadEvt(*fIn);
+    const Bool_t rc = fRawRunHeader->ReadEvt(*fIn);
     fLog->SetNullOutput(kFALSE);
 
-    if (fRawRunHeader->GetMagicNumber()!=kMagicNumber && fRawRunHeader->GetMagicNumber()!=kMagicNumber+1)
-    {
-        *fLog << err << "Error: Wrong Magic Number (0x" << hex << fRawRunHeader->GetMagicNumber() << "): Not a Magic File!" << endl;
-        return kFALSE;
-    }
+    if (!rc)
+        return kFALSE;
 
     if (fRunNumber!=fRawRunHeader->GetRunNumber())