Diff: SnEventFrame.h

Revision:

84:80b15993944e

Parent:

56:0bba0ef15697

Child:

114:554fa3a956b4

--- a/SnEventFrame.h	Mon Feb 23 03:04:39 2015 +0000
+++ b/SnEventFrame.h	Fri Oct 30 04:49:40 2015 +0000
@@ -51,7 +51,7 @@
                             const uint8_t loseLSB, const uint8_t loseMSB);
     
  public:
-    SnEventFrame() { ClearEvent(); }
+    SnEventFrame() { ClearEvent(true, true); }
     virtual ~SnEventFrame() {}
 
     virtual void CopyTo(SnEventFrame& evt) const {
@@ -84,32 +84,39 @@
 #endif
         
     uint32_t GetMbedTime() const { return fMbedTime; }
+    uint32_t GetEvtNum() const { return fEvtNum; }
+    int32_t  GetDTms() const { return fDTms; }
+    uint32_t GetTrgNum() const { return fTrgNum; }
+    uint16_t GetTrgBits() const { return fTrgBits; }
+    uint32_t GetCRC() const { return fCRC; }
     
-    uint32_t GetEvtNum() const { return fEvtNum; }
-    
-    void ClearEvent(const bool fully=true) {
+    void ClearEvent(const bool clearTrigs,
+                    const bool clearWaveData) {
 #ifdef EVDEBUG
         printf("CLEARING EVENT!\r\n");
 #endif
         fMbedTime = 0;
-        memset(fData, 0, kTotSamps*sizeof(int16_t));
+        
+        if (clearWaveData) {
+            memset(fData, 0, kTotSamps*sizeof(int16_t));
 #if CHIPBOARD!=ATWD4CH
-        memset(fStop, 0, kNstopBytes*sizeof(uint8_t));
+            memset(fStop, 0, kNstopBytes*sizeof(uint8_t));
 #endif
-        fCRC = 0;
-        if (fully) {
+            fCRC = 0;
+        }
+        if (clearTrigs) {
             fEvtNum = fTrgNum = 0;
             fTrgBits = 0;
         }
     }
     
-    void SetTrgBit(const ESnTrgTypes t) { fTrgBits |= kTrgBW[t]; }
+    void SetTrgBit(const ETrgBit_t t)   { fTrgBits |= t; }
     void SetTrgNum(const uint32_t t)    { fTrgNum = t; }
     void SetEvtNum(const uint32_t n)    { fEvtNum = n; }
     void SetDTms(const int32_t dtms)    { fDTms = dtms; }
     void SetCurMbedTime()               { fMbedTime = time(0); }
     
-    bool IsForcedTrg() const { return (fTrgBits & kTrgBW[kFrcTrg])!=0; }
+//    bool IsForcedTrg() const { return (fTrgBits & kFrcTrg)!=0; }
     
 #if CHIPBOARD!=ATWD4CH
     void ReadWaveformsSST(SPI& spi, DigitalOut& readingData) {