Changeset 8704 for trunk/MagicSoft/Mars/mraw

Timestamp:

08/24/07 09:37:31 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawEvtData.cc (modified) (1 diff)
• MRawRunHeader.cc (modified) (3 diffs)
• MRawRunHeader.h (modified) (1 diff)

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -108 +108 @@
 //
 MRawEvtData::MRawEvtData(const char *name, const char *title)
-    : fRunHeader(0)
+    : fRunHeader(0), fNumBytesPerSample(1)
 {
     fName  = name  ? name  : "MRawEvtData";

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -157 +157 @@
     fTelescopeNumber=1;
     fCameraVersion=1;
-    fFadcType=0;
+    fFadcType=1;
     fRunType=kRTNone;  // use 0xffff for invalidation, 0 means: Data run
     fRunNumber=0;
@@ -415 +415 @@
 
 
-    fFadcType = 0;
+    fFadcType = 1;
     if (fFormatVersion>7)
         fin.read((char*)&fFadcType, 2);
@@ -573 +573 @@
         *fLog << "Telescope:    " << fTelescopeNumber << endl;
     if (fFormatVersion>7)
-        *fLog << "FadcType:     " << fFadcType << endl;
+        *fLog << "FadcType:     " << fFadcType << " (";
+    switch (fFadcType)
+    {
+    case 1: *fLog << "Siegen"; break;
+    case 2: *fLog << "MUX"; break;
+    default: *fLog << "unknown";
+    }
+    *fLog << ")" << endl;
     *fLog << "RunNumber:    " << fRunNumber << " (Type=" << GetRunTypeStr() << ")" << endl;
     *fLog << "ProjectName: '" << fProjectName << "'" << endl;

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -41 +41 @@
     UShort_t  fFormatVersion;        // File format version
     UShort_t  fSoftVersion;          // DAQ software version
-    UShort_t  fFadcType;             // FADC type (0=Siegen, 1=MUX)
+    UShort_t  fFadcType;             // FADC type (1=Siegen, 2=MUX)
     UShort_t  fCameraVersion;        // Camera Version (1=MAGIC I)
     UShort_t  fTelescopeNumber;      // Telescope number (1=Magic I)