Changeset 2728 for trunk/MagicSoft/Mars/mraw/MRawRead.cc

Timestamp:

12/20/03 13:46:17 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mraw/MRawRead.cc

@@ -125 +125 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// This is a workaround for the oldest runs (run-number<3490)
+// for which no time stamp was available.
+// For this runs a fake time stamp is created
+//
+// Be carefull: This is NOT thread safe!
+//
+void MRawRead::CreateFakeTime() const
+{
+    static Double_t tm = 0; // Range of roughly 8min
+    const UInt_t ct = (*fRawCrateArray)[0]->GetFADCClockTick();
+
+    tm = ct<tm ? fmod(tm, (UInt_t)(-1))+(UInt_t)(-1)+ct : ct;
+
+    const Double_t mhz = 9.375;                        // [1e6 ticks/s]
+    const Double_t t   = tm/mhz;                       // [us]
+    const UInt_t ns    = (UInt_t)fmod(t*1e3, 1e6);
+    const UShort_t ms  = (UShort_t)fmod(t/1e3, 1e3);
+    const Byte_t s     = (Byte_t)fmod(t/1e6, 60);
+
+    // Create an artificial time stamp!
+    UInt_t m = (Byte_t)fmod(t/60e6, 60);
+    //const Byte_t h     = (Byte_t)(t/3600e6);
+    m += fRawRunHeader->GetRunNumber()*10;
+    m %= 360; // 6h
+
+    fRawEvtTime->Set(fRawRunHeader->GetRunStart().Year(),
+                     fRawRunHeader->GetRunStart().Month(),
+                     fRawRunHeader->GetRunStart().Day(),
+                     m/60, m%60, s, ms, ns);
+}
+
+// --------------------------------------------------------------------------
+//
+// Read a single event from the stream
+//
 Bool_t MRawRead::ReadEvent(istream &fin)
 {
@@ -169 +206 @@
     }
 
-    {
-        // FIXME This is a stupid workaround for the missing time stamp!
-        //       Might be used depending on the run number in the future
-        static Double_t tm = 0; // Range of roughly 8min
-        const UInt_t ct = (*fRawCrateArray)[0]->GetFADCClockTick();
-
-        tm = ct<tm ? fmod(tm, (UInt_t)(-1))+(UInt_t)(-1)+ct : ct;
-
-        const Double_t mhz = 9.375;                        // [1e6 ticks/s]
-        const Double_t t   = tm/mhz;                       // [us]
-        const UInt_t ns    = (UInt_t)fmod(t*1e3, 1e6);
-        const UShort_t ms  = (UShort_t)fmod(t/1e3, 1e3);
-        const Byte_t s     = (Byte_t)fmod(t/1e6, 60);
-
-        // Create an artificial time stamp!
-        UInt_t m = (Byte_t)fmod(t/60e6, 60);
-        //const Byte_t h     = (Byte_t)(t/3600e6);
-        m += fRawRunHeader->GetRunNumber()*10;
-        m %= 360; // 6h
-
-        fRawEvtTime->Set(fRawRunHeader->GetRunStart().Year(),
-                         fRawRunHeader->GetRunStart().Month(),
-                         fRawRunHeader->GetRunStart().Day(),
-                         m/60, m%60, s, ms, ns);
-    }
+    // This is a workaround for the oldest runs (run-number<3490)
+    // for which no time stamp was available.
+    // For this runs a fake time stamp is created
+    if (fRawRunHeader->GetRunNumber()<3490)
+        CreateFakeTime();
+
+    // FIXME: For all other runs we should enhance the precision
+    //        of the time-stamp by using the FADCClockTick
+
     return kTRUE;
 }