Changeset 2728 for trunk/MagicSoft/Mars/mraw

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawEvtHeader.cc (modified) (2 diffs)
• MRawEvtHeader.h (modified) (1 diff)
• MRawFileRead.cc (modified) (1 diff)
• MRawRead.cc (modified) (2 diffs)
• MRawRead.h (modified) (1 diff)
• MRawRunHeader.cc (modified) (2 diffs)
• MRawSocketRead.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc

@@ -236 +236 @@
 }
 
+Bool_t MRawEvtHeader::DecodeTime(UInt_t abstime[2]) const
+{
+    // BADC|1032 --> DCBA|3210 (Byte swap - exchange MSB and LSB)
+    abstime[0] = (abstime[0]<<16) | (abstime[0]>>16);
+    abstime[1] = (abstime[1]<<16) | (abstime[1]>>16);
+
+    const Byte_t h = (abstime[0]>>18 & 0x30)*10 + (abstime[0]>>14 & 0x0f);
+    const Byte_t m = (abstime[0]>>11 & 0x70)*10 + (abstime[0]>> 7 & 0x0f);
+    const Byte_t s = (abstime[0]>> 4 & 0x70)*10 + (abstime[0]>> 0 & 0x0f);
+    const Int_t ms =
+        ((abstime[1]>>16)&0xf)*1000 +
+        ((abstime[1]>> 8)&0xf)* 100 +
+        ((abstime[1]>> 4)&0xf)*  10 +
+        ((abstime[1]>> 0)&0xf)*   1;
+
+    // hms   =3210 -->  h=2:4 m=3:4 s=3:4
+    // subsec=DCBA --> subsec?
+    *fLog << dbg << dec;
+    *fLog << (int)(abstime[0]>>18 & 0x30); // h
+    *fLog << (int)(abstime[0]>>14 & 0x0f); // h
+    *fLog << ":";
+    *fLog << (int)(abstime[0]>>11 & 0x70); // m
+    *fLog << (int)(abstime[0]>> 7 & 0x0f); // m
+    *fLog << ":";
+    *fLog << (int)(abstime[0]>> 4 & 0x70); // s
+    *fLog << (int)(abstime[0]>> 0 & 0x0f); // s
+    *fLog << " ";
+    *fLog << (int)(abstime[1]>>16 & 0xf) << ".";
+    *fLog << (int)(abstime[1]>> 8 & 0xf) << ".";
+    *fLog << (int)(abstime[1]>> 4 & 0xf) << ".";
+    *fLog << (int)(abstime[1]>> 0 & 0xf);
+    *fLog << endl;
+
+    // Update the time stamp with the current event time.
+    // Make sure, that the time stamp was initialized correctly
+    // with the start-date/time of the run (after reading the run header)
+    //
+    // Here the nanosec precision is ignored... (FIXME!)
+    return fTime->UpdMagicTime(h, m, s, ms);
+}
+
 // --------------------------------------------------------------------------
 //
@@ -241 +282 @@
 // return FALSE if there is now header anymore, else TRUE
 //
+// Updates the time stamp with the current event time.
+// Make sure, that the time stamp was initialized correctly
+// with the start-date/time of the run (after reading the run header)
+//
+// Remark: This 'feature' disallows single runs of more than 11h!
+//
 int MRawEvtHeader::ReadEvt(istream &fin)
 {
     fin.read((char*)&fDAQEvtNumber, 4);  // Total=4
 
-    UInt_t abstime[2];
+    UInt_t abstime[2];                   // BADC|1032
     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)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);
-     */
+    if (!DecodeTime(abstime))
+    {
+        *fLog << err << "ERROR - Event time in event header invalid... abort." << endl;
+        return kFALSE;
+    }
 
     Byte_t dummy[4];

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.h

@@ -44 +44 @@
     MArrayB *fPixLoGainOn;     //! Array which tell you which pixels have lo gain on
 
+    Bool_t DecodeTime(UInt_t abstime[2]) const;
+
 public:
-
     MRawEvtHeader(const char *name=NULL, const char *title=NULL);
     ~MRawEvtHeader();

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -151 +151 @@
     fRawRunHeader->Print();
 
-    return fRawRunHeader->GetMagicNumber()==kMagicNumber;
+    if (fRawRunHeader->GetMagicNumber()!=kMagicNumber)
+        return kFALSE;
+
+    *fRawEvtTime = fRawRunHeader->GetRunStart();
+
+    return kTRUE;
 }
 

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;
 }

trunk/MagicSoft/Mars/mraw/MRawRead.h

@@ -22 +22 @@
     MTime          *fRawEvtTime;    // raw evt time information container to fill from file
 
+    void CreateFakeTime() const;
+
     Bool_t ReadEvent(istream &fin);
     Int_t  PreProcess(MParList *pList);

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -29 +29 @@
 // Root storage container for the RUN HEADER information
 //
-//
-//
-//  Version 2:
-//  ----------
+//  Format Version 2:
+//  -----------------
+//   - removed mjd from data
+//   - added start time
+//   - added stop  time
+//
+//  Class Version 2:
+//  ----------------
 //   - removed fMJD, fYear, fMonth, fDay
 //   - added fRunStart
 //   - added fRunStop
 // 
-//  Version 1:
-//  ----------
+//  Class Version 1:
+//  ----------------
 //   - first implementation
 //
@@ -212 +216 @@
     for (int i=0; i<GetNumPixel(); i++)
         *fLog << setfill('0') << setw(3) << (*fPixAssignment)[i] << " ";
-    *fLog << hex << endl;
 
     *fLog << endl;

trunk/MagicSoft/Mars/mraw/MRawSocketRead.cc

@@ -252 +252 @@
     }
 
+    *fRawEvtTime = fRawRunHeader->GetRunStart();
+
     if (!ReadEvent(*fIn))
         return kFALSE;