Changeset 2461 for trunk/MagicSoft/Mars/mraw

Timestamp:

11/03/03 18:08:26 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc

@@ -125 +125 @@
     Clear();
 }
-
 
 // --------------------------------------------------------------------------
@@ -216 +215 @@
         }
     }
-    *fLog << endl;
+    if (fPixLoGainOn->GetSize())
+        *fLog << endl;
 }
 
@@ -226 +226 @@
 {
     fDAQEvtNumber = uiN;
-    fTrigPattern[0] = (UInt_t) (ulTP/4294967296.0) ;
-    fTrigPattern[1] = (UInt_t) (ulTP-fTrigPattern[0]*4294967296.0);
+    fTrigPattern[0] = (UInt_t)(ulTP/4294967296.0) ;
+    fTrigPattern[1] = (UInt_t)(ulTP-fTrigPattern[0]*4294967296.0);
 }
 
@@ -239 +239 @@
     fin.read((char*)&fDAQEvtNumber, 4);  // Total=4
 
-    UInt_t fAbsTime[2];
-    fin.read((char*)fAbsTime,       8);  // Total=12
+    UInt_t abstime[2];
+    fin.read((char*)abstime,        8);  // Total=12
 
     //
     // store the time of the event in the corresponding container
     //
-    const Double_t mhz = 9.375;                          // [1e6 ticks/s]
-    const Double_t t   = (Double_t)fAbsTime[0]/mhz;      // [ns]
+    const Double_t mhz = 9.375;                        // [1e6 ticks/s]
+    const Double_t t   = (Double_t)abstime[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);
-    fTime->SetTime(fAbsTime[0], fAbsTime[1]);
 
     Byte_t dummy[4];
-
     fin.read((char*)&fNumTrigLvl1,  4);  // Total=16
     fin.read((char*)&fNumTrigLvl2,  4);  // Total=20