Changeset 8344 for trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc

Timestamp:

03/01/07 21:31:23 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc

@@ -202 +202 @@
     *fLog << "NumLvl2=" << fNumTrigLvl2 << " ";
     *fLog << "Pattern=" << hex << setfill('0');
-    *fLog << setw(2) << fTrigPattern[0];
-    *fLog << setw(2) << fTrigPattern[1] << " " << dec;
+    *fLog << setw(8) << fTrigPattern[0];
+    *fLog << setw(8) << fTrigPattern[1] << " " << dec;
 
     *fLog << "Type=";
@@ -358 +358 @@
     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());
-
-    fNumLoGainOn = 0;
-    for (unsigned int i=0; i<fPixLoGainOn->GetSize(); i++)
-        for (int j=0; j<8; j++)
-            if ((*fPixLoGainOn)[i] & (1<<j))
-                fNumLoGainOn++;
-
-    fin.read((char*)&dummy, 4);
+    if (ver<=6)
+    {
+        fin.read((char*)dummy,          2);  // Total=32, was fAllLoGainOn
+        fin.read((char*)fPixLoGainOn->GetArray(), fPixLoGainOn->GetSize());
+
+        fNumLoGainOn = 0;
+        for (unsigned int i=0; i<fPixLoGainOn->GetSize(); i++)
+            for (int j=0; j<8; j++)
+                if ((*fPixLoGainOn)[i] & (1<<j))
+                    fNumLoGainOn++;
+
+        fin.read((char*)&dummy, 4);
+    }
+    else
+    {
+        // No LoGains for version 7 data
+        fPixLoGainOn->Reset();
+        fNumLoGainOn = 0;
+    }
 
     return fin.eof() ? kFALSE : rc;