Changeset 17148 for trunk/Mars/mraw

Timestamp:

09/09/13 12:39:18 (11 years ago)

Author:

ftemme

Message:

Merging changes from the MC branch in the trunk

Location:

trunk/Mars

Files:

• . (modified) (1 prop)
• mraw/MRawEvtData.cc (modified) (2 diffs)
• mraw/MRawEvtData.h (modified) (2 diffs)
• mraw/MRawEvtHeader.h (modified) (1 diff)

trunk/Mars/mraw/MRawEvtData.cc

@@ -114 +114 @@
 //
 MRawEvtData::MRawEvtData(const char *name, const char *title)
-    : fRunHeader(0), fNumBytesPerSample(1), fIsSigned(false)
+    : fRunHeader(0), fNumBytesPerSample(1), fTriggerType(0), fIsSigned(false)
 {
     fName  = name  ? name  : "MRawEvtData";
@@ -359 +359 @@
 
     fNumBytesPerSample = fRunHeader ? fRunHeader->GetNumBytesPerSample() : 1;
+
+
+    if (fRunHeader == 0)
+    {
+        fTriggerType = 0x0000;
+    }
+    else
+    {
+        switch(fRunHeader->GetRunType())
+        {
+        case MRawRunHeader::kRTMonteCarlo|MRawRunHeader::kRTData:
+            fTriggerType = 0x0004; break;
+        case MRawRunHeader::kRTMonteCarlo|MRawRunHeader::kRTPedestal:
+            fTriggerType = 0x0400; break;
+        case MRawRunHeader::kRTMonteCarlo|MRawRunHeader::kRTCalibration:
+            fTriggerType = 0x0164; break;
+        default:
+            fTriggerType = 0x0000; break;
+        }
+    }
 
     fHiGainPixId       = new MArrayS(numconnected);

trunk/Mars/mraw/MRawEvtData.h

@@ -12 +12 @@
 //class ifstream;
 #include <iosfwd>
+#include <stdint.h>
 
 class MRawRunHeader;
@@ -36 +37 @@
 
     MArrayB *fABFlags;            //-> A information about the exact trigger position
-    MArrayS *fStartCells;         //
+    MArrayS *fStartCells;         // {fits: unit=uint16 ; name=StartCellData }
+
+    UShort_t fTriggerType;       // {fits: unit=uint16 ; name=TriggerType }
 
     UShort_t fNumBytesPerSample;

trunk/Mars/mraw/MRawEvtHeader.h

@@ -53 +53 @@
     MTime   *fTime;            //! object to store the time in (ReadEvt)
 
-    UInt_t   fDAQEvtNumber;    // Number of Event [fits: name=EventNum]
+    UInt_t   fDAQEvtNumber;    // Number of Event {fits: name=EventNum ; unit=uint32}
 
     UInt_t   fNumTrigLvl1;     // Number of 1st level tiggers between 2 events