Changeset 5567 for trunk/MagicSoft/Mars

Timestamp:

12/08/04 10:24:10 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mraw/MRawEvtHeader.cc (modified) (3 diffs)
• mraw/MRawEvtHeader.h (modified) (1 diff)
• mraw/MRawRunHeader.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2004/12/08: Thomas Bretz
+
+  * mraw/MRawRunHeader.cc:
+    - changed maximum allowed format version from 4 to 5
+
+  * mraw/MRawEvtHeader.[h,cc]:
+    - added correct decoding of the 200ns information as proposed by
+      Florian to DecodeTime
+
+
+
  2004/12/06: Abelardo Moralejo
 
@@ -29 +40 @@
   * mtemp/mpadova/macros/resize.C
     - Added containers MConcentration and MPointingPos to output.
+
 
 

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc

@@ -270 +270 @@
 // source code.
 //
-Bool_t MRawEvtHeader::DecodeTime(UInt_t abstime[2]) const
+Bool_t MRawEvtHeader::DecodeTime(UInt_t abstime[2], UShort_t ver) const
 {
     //
@@ -292 +292 @@
     // ----------
     //
+    // The last 8 bits must be flipped.
+    //
+    abstime[1] ^= 0x000000ff;
+
+    //
     // Due to a problem with one Digital Module, three of the less significant
     // eight bits of the subsecond are corrupted. So, until new DM's arrive to
     // La Palma, we won't use the eight first bits of the subsecond. 
-    // This reduces the precision from 200 ns to of 51.2 us.
-    //
-    abstime[1] &= 0xffffff00;
+    // This reduces the precision from 200 ns to of 51.2 us. (ver<5)
+    //
+    if (ver<5)
+        abstime[1] &= 0xffffff00;
 
     //
@@ -346 +352 @@
 
     if (ver>2)
-        if (!DecodeTime(abstime))
+        if (!DecodeTime(abstime, ver))
             rc = kCONTINUE;
 

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.h

@@ -53 +53 @@
     MArrayB *fPixLoGainOn;     //! Array which tell you which pixels have lo gain on
 
-    Bool_t DecodeTime(UInt_t abstime[2]) const;
+    Bool_t DecodeTime(UInt_t abstime[2], UShort_t ver) const;
 
     Int_t GetNumBytes() const;

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -29 +29 @@
 // Root storage container for the RUN HEADER information
 //
+//
+//  RAW DATA FORMAT VERSION
+//  =======================
+//
+//  Format Version 5:
+//  -----------------
+//   - now the sub millisecond information of the time is valid and decoded
+//     which enhances the precision from 51.2us to 200ns
+//
 //  Format Version 4:
 //  -----------------
@@ -42 +51 @@
 //   - added start time
 //   - added stop  time
+//
+//
+//  MRawRunHeader CLASS VERSION
+//  ===========================
 //
 //  Class Version 2:
@@ -70 +83 @@
 
 const UShort_t MRawRunHeader::kMagicNumber      = 0xc0c0;
-const Byte_t   MRawRunHeader::kMaxFormatVersion =      4;
+const Byte_t   MRawRunHeader::kMaxFormatVersion =      5;
 
 // --------------------------------------------------------------------------