--- yoda/event/physics/anticounter/AnticounterEvent.h 2004/12/20 14:15:10 2.3 +++ yoda/event/physics/anticounter/AnticounterEvent.h 2005/08/29 09:46:12 5.0 @@ -1,6 +1,6 @@ /** @file * $Source: /home/cvsmanager/yoda/event/physics/anticounter/AnticounterEvent.h,v $ - * $Id: AnticounterEvent.h,v 2.2 2004/12/16 17:32:48 kusanagi Exp $ + * $Id: AnticounterEvent.h,v 4.5 2005/08/29 08:27:37 kusanagi Exp $ * $Author: kusanagi $ * * Header file for the raw anticoincidence events @@ -8,7 +8,7 @@ #ifndef ANTICOUNTER_EVENT_H #define ANTICOUNTER_EVENT_H -#include "event/SubPacket.h" +#include "../../SubPacket.h" namespace pamela { /** * Namespace for all code related to the anticoincidence unit. @@ -22,24 +22,26 @@ public: - unsigned short header[2][2]; - unsigned short status[2]; - unsigned short hitmap[2]; - unsigned short regist[2][6]; - unsigned short shift[2][16]; - unsigned short counters[2][16]; - unsigned short coinc[2][8]; - unsigned short trigg[2]; - unsigned short clock[2][2]; - unsigned short temp[2][2]; - unsigned short DAC[2][8]; - unsigned short CRC[2]; - unsigned short ERROR; + UINT16 header[2][2]; + UINT16 status[2]; + UINT16 hitmap[2]; + UINT16 regist[2][6]; + UINT16 shift[2][16]; + UINT16 counters[2][16]; + UINT16 coinc[2][8]; + UINT16 trigg[2]; + UINT16 clock[2][2]; + UINT16 temp[2][2]; + UINT16 DAC[2][8]; + UINT16 CRC[2]; + UINT16 CRCcheck[2]; + UINT8 unpackError; + AnticounterEvent(void); ~AnticounterEvent(void); - ClassDef(AnticounterEvent, 1) + ClassDef(AnticounterEvent, 2) }; } }