Changeset 11490 for trunk/Mars/mraw

Timestamp:

07/20/11 18:03:06 (13 years ago)

Author:

tbretz

Message:

Replaced fPCTime by a two byte buffer and init full time; added StartCell to reading.

Location:

trunk/Mars/mraw

Files:

• MRawFitsRead.cc (modified) (4 diffs)
• MRawFitsRead.h (modified) (1 diff)

trunk/Mars/mraw/MRawFitsRead.cc

@@ -47 +47 @@
 
 #include "MArrayB.h"
+#include "MArrayS.h"
 
 #include "MRawRunHeader.h"
@@ -97 +98 @@
     fRawRunHeader->SetRunType(0/*data*/);
 
-    return kTRUE;
+    return
+        fin.HasKey("NPIX") && fin.HasKey("RUNID")  &&
+        fin.HasKey("NROI") && fin.HasKey("BLDVER") &&
+        fin.HasKey("NIGHT");
 }
 
@@ -105 +109 @@
 
     MArrayB **data   = reinterpret_cast<MArrayB**>(fRawEvtData1->DataMember("fHiGainFadcSamples"));
+    MArrayS **cell   = reinterpret_cast<MArrayS**>(fRawEvtData1->DataMember("fStartCells"));
     UInt_t   *evtnum = reinterpret_cast<UInt_t*>  (fRawEvtHeader->DataMember("fDAQEvtNumber"));
 
-    if (!data || !evtnum)
+    if (!data || !cell || !evtnum)
         return kFALSE;
 
     fRawEvtData1->ResetPixels();
     fRawEvtData2->ResetPixels(0, 0);
+    fRawEvtData1->InitStartCells();
 
     if (!fin.SetRefAddress("EventNum", *evtnum))
         return kFALSE;
 
-    if (!fin.SetRefAddress("PCTime", fPCTime))
+    fPCTime.resize(2);
+    if (!fin.SetVecAddress("PCTime", fPCTime))
         return kFALSE;
 
-    if (!fin.SetPtrAddress("Data", (uint16_t*)(*data)->GetArray(), (*data)->GetSize()/2))
+    if (!fin.SetPtrAddress("Data", (int16_t*)(*data)->GetArray(), (*data)->GetSize()/2))
+        return kFALSE;
+
+    if (!fin.SetPtrAddress("StartCell", (uint16_t*)(*cell)->GetArray(), (*cell)->GetSize()))
         return kFALSE;
 
@@ -132 +142 @@
         return kFALSE;
 
-    fRawEvtTime->SetUnixTime(fPCTime, 0);
+    fRawEvtTime->SetUnixTime(fPCTime[0], fPCTime[1]);
+
+    // FIXME: Correctly sort the pixels here!
 
     fRawEvtData1->SetReadyToSave();

trunk/Mars/mraw/MRawFitsRead.h

@@ -6 +6 @@
 #endif
 
+#include <vector>
+
 class MRawFitsRead : public MRawFileRead
 {
 private:
-    UInt_t   fPCTime; //! Buffer
+    std::vector<UInt_t> fPCTime; //! Buffer
 
     istream *OpenFile(const char *filename);