Changeset 14089 for trunk

Timestamp:

06/06/12 11:04:25 (12 years ago)

Author:

tbretz

Message:

Added reading of board times.

Location:

trunk/Mars/mraw

Files:

• MRawFitsRead.cc (modified) (3 diffs)
• MRawFitsRead.h (modified) (2 diffs)

trunk/Mars/mraw/MRawFitsRead.cc

@@ -51 +51 @@
 #include "MArrayS.h"
 
+#include "MParList.h"
+
 #include "MRawRunHeader.h"
 #include "MRawEvtHeader.h"
 #include "MRawEvtData.h"
+#include "MRawBoardsFACT.h"
 
 ClassImp(MRawFitsRead);
@@ -64 +67 @@
 //
 MRawFitsRead::MRawFitsRead(const char *fname, const char *name, const char *title)
-    : MRawFileRead(fname, name, title)
-{
+    : MRawFileRead(fname, name, title), fRawBoards(0)
+{
+}
+
+Int_t MRawFitsRead::PreProcess(MParList *pList)
+{
+    fRawBoards = (MRawBoardsFACT*)pList->FindCreateObj("MRawBoardsFACT");
+    return fRawBoards!=0;
 }
 
@@ -188 +197 @@
             return kFALSE;
 
+    if (!fin.SetPtrAddress("BoardTime", fRawBoards->fFadTime, 40))
+        return kFALSE;
+
     if (!fin.SetPtrAddress("Data", (int16_t*)(*data)->GetArray(), (*data)->GetSize()/2))
         return kFALSE;

trunk/Mars/mraw/MRawFitsRead.h

@@ -8 +8 @@
 #include <vector>
 
+class MRawBoardsFACT;
+
 class MRawFitsRead : public MRawFileRead
 {
@@ -14 +16 @@
     std::vector<UShort_t> fPixelMap; //! 
 
+    MRawBoardsFACT *fRawBoards;
+
+    Int_t    PreProcess(MParList *pList);
     istream *OpenFile(const char *filename);
     Bool_t   ReadRunHeader(istream &fin);