Changeset 2386 for trunk/MagicSoft/Mars/mraw

Timestamp:

10/15/03 19:15:13 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawEvtHeader.cc (modified) (3 diffs)
• MRawRunHeader.cc (modified) (4 diffs)
• MRawRunHeader.h (modified) (1 diff)
• MRawSocketRead.cc (added)
• MRawSocketRead.h (added)
• Makefile (modified) (1 diff)
• RawLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc

@@ -237 +237 @@
 int MRawEvtHeader::ReadEvt(istream &fin)
 {
-    fin.read((char*)&fDAQEvtNumber, 4);
+    fin.read((char*)&fDAQEvtNumber, 4);  // Total=4
 
     UInt_t fAbsTime[2];
-    fin.read((char*)fAbsTime,       8);
+    fin.read((char*)fAbsTime,       8);  // Total=12
 
     //
@@ -246 +246 @@
     //
     const Double_t mhz = 9.375;                          // [1e6 ticks/s]
-    const Double_t t   = (Double_t)fAbsTime[0]/mhz*1e-3; // [ns]
-    const UShort_t ns  = (UShort_t)fmod(t, 1e9);
-    const Byte_t s     = (Byte_t)fmod(t/1e9, 60);
-    const Byte_t m     = (Byte_t)fmod(t/60e9, 60);
-    const Byte_t h     = (Byte_t)(t/3600e9);
+    const Double_t t   = (Double_t)fAbsTime[0]/mhz;      // [ns]
+    const UShort_t ns  = (UShort_t)fmod(t*1e-3, 1e9);
+    const Byte_t s     = (Byte_t)fmod(t/1e12, 60);
+    const Byte_t m     = (Byte_t)fmod(t/60e12, 60);
+    const Byte_t h     = (Byte_t)(t/3600e12);
 
     fTime->SetTime(h, m, s, ns);
@@ -257 +257 @@
     Byte_t dummy[4];
 
-    fin.read((char*)&fNumTrigLvl1,  4);
-    fin.read((char*)&fNumTrigLvl2,  4);
-    fin.read((char*)fTrigPattern,   8);
-    fin.read((char*)&fTrigType,     2);
-    fin.read((char*)dummy,          2); // was fAllLoGainOn
+    fin.read((char*)&fNumTrigLvl1,  4);  // Total=16
+    fin.read((char*)&fNumTrigLvl2,  4);  // Total=20
+    fin.read((char*)fTrigPattern,   8);  // Total=28
+    fin.read((char*)&fTrigType,     2);  // Total=30
+    fin.read((char*)dummy,          2);  // Total=32, was fAllLoGainOn
     fin.read((char*)fPixLoGainOn->GetArray(), fPixLoGainOn->GetSize());
 

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -94 +94 @@
     // read one RUN HEADER from the input stream
     //
-    fin.read((char*)&fMagicNumber, 2);
+    fMagicNumber = 0;
+
+    fin.read((char*)&fMagicNumber, 2);          // Total=2
 
     //
@@ -101 +103 @@
     if (fMagicNumber != kMagicNumber && fMagicNumber != kMagicNumber+1)
     {
-        *fLog << err << "Error: Wrong Magic Number: Not a Magic File!" << endl;
+        *fLog << err << "Error: Wrong Magic Number (0x" << hex << fMagicNumber << "): Not a Magic File!" << endl;
         return;
     }
 
-    if (fMagicNumber == kMagicNumber && fMagicNumber != kMagicNumber+1)
+    if (fMagicNumber == kMagicNumber+1)
         *fLog << warn << "WARNING - This file maybe broken (0xc0c1) - DAQ didn't close it correctly!" << endl;
 
     Byte_t dummy[16];
 
-    fin.read((char*)&fFormatVersion,    2);
-    fin.read((char*)&fSoftVersion,      2);
-    fin.read((char*)&fRunType,          2);
-    fin.read((char*)&fRunNumber,        4);
-    fin.read((char*)&fProjectName,     22);
-    fin.read((char*)&fSourceName,      12);
+    fin.read((char*)&fFormatVersion,    2);     // Total=4
+    fin.read((char*)&fSoftVersion,      2);     // Total=6
+    fin.read((char*)&fRunType,          2);     // Total=8
+    fin.read((char*)&fRunNumber,        4);     // Total=12
+    fin.read((char*)&fProjectName,     22);     // Total=34
+    fin.read((char*)&fSourceName,      12);     // Total=46
     fin.read((char*)dummy,              4); // was RA  (moved to tracking system)
     fin.read((char*)dummy,              4); // was DEC (moved to tracking system)
-    fin.read((char*)&fSourceEpochChar,  2);
-    fin.read((char*)&fSourceEpochDate,  2);
-    fin.read((char*)&fMJD,              4);
-    fin.read((char*)&fDateYear,         2);
-    fin.read((char*)&fDateMonth,        2);
-    fin.read((char*)&fDateDay,          2);
-    fin.read((char*)&fNumCrates,        2);
-    fin.read((char*)&fNumPixInCrate,    2);
-    fin.read((char*)&fNumSamplesLoGain, 2);
-    fin.read((char*)&fNumSamplesHiGain, 2);
-    fin.read((char*)&fNumEvents,        4);
+    fin.read((char*)&fSourceEpochChar,  2);     // Total=56
+    fin.read((char*)&fSourceEpochDate,  2);     // Total=58
+    fin.read((char*)&fMJD,              4);     // Total=62
+    fin.read((char*)&fDateYear,         2);     // Total=64
+    fin.read((char*)&fDateMonth,        2);     // Total=66
+    fin.read((char*)&fDateDay,          2);     // Total=68
+    fin.read((char*)&fNumCrates,        2);     // Total=70
+    fin.read((char*)&fNumPixInCrate,    2);     // Total=72
+    fin.read((char*)&fNumSamplesLoGain, 2);     // Total=74
+    fin.read((char*)&fNumSamplesHiGain, 2);     // Total=76
+    fin.read((char*)&fNumEvents,        4);     // Total=80
 
 
@@ -148 +150 @@
 {
     *fLog << all << endl;
-    *fLog << "MagicNumber:  0x" << hex << fMagicNumber << " - " << (fMagicNumber==kMagicNumber?"OK":"Wrong!") << endl;
+    *fLog << "MagicNumber:  0x" << hex << fMagicNumber << " - ";
+    switch (fMagicNumber)
+    {
+    case kMagicNumber:   *fLog << "OK";               break;
+    case kMagicNumber+1: *fLog << "File not closed!"; break;
+    default:             *fLog << "Wrong!";           break;
+    }
+    *fLog << endl;
     *fLog << "Version:      " << dec << "Format=" << fFormatVersion << "  ";
     *fLog << "Software=" << fSoftVersion << endl;
@@ -213 +222 @@
     return fPixAssignment->GetSize();
 }
+
+// --------------------------------------------------------------------------
+//
+// Returns absolute size in bytes of the run header as read from a raw file.
+// This must be done _after_ the header is read, because the header doesn't
+// have a fixed size (used in MRawSocketRead)
+//
+Int_t MRawRunHeader::GetNumTotalBytes() const
+{
+    return 80+fNumCrates*fNumPixInCrate*2+16;
+}

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -104 +104 @@
 
     UShort_t GetNumPixel() const;
+    Int_t GetNumTotalBytes() const;
 
     void Print(Option_t *t=NULL) const;

trunk/MagicSoft/Mars/mraw/Makefile

@@ -34 +34 @@
            MRawCrateArray.cc \
            MRawCrateData.cc \
+           MRawFileWrite.cc \
            MRawFileRead.cc \
-           MRawFileWrite.cc
+           MRawSocketRead.cc
 
 SRCS    = $(SRCFILES)

trunk/MagicSoft/Mars/mraw/RawLinkDef.h

@@ -14 +14 @@
 #pragma link C++ class MRawCrateData+;
 
+#pragma link C++ class MRawSocketRead+;
 #pragma link C++ class MRawFileRead+;
 #pragma link C++ class MRawFileWrite+;