--- yoda/event/EventCounter.h	2004/12/03 22:04:04	2.2
+++ yoda/event/EventCounter.h	2006/05/30 19:10:01	6.2
@@ -1,6 +1,6 @@
-/** @file
+/**     @file
  * $Source: /home/cvsmanager/yoda/event/EventCounter.h,v $
- * $Id: EventCounter.h,v 2.1 2004/09/24 11:57:32 kusanagi Exp $
+ * $Id: EventCounter.h,v 6.1 2006/02/15 15:47:14 kusanagi Exp $
  * $Author: kusanagi $
  * 
  * Header file for the EventCounter class.
@@ -10,7 +10,8 @@
 
 #include <map>
 #include "Exception.h"
-#include "PscuHeader.h"
+#include "PacketType.h"
+#include <TObject.h>
 
 namespace pamela {
   /**
@@ -27,23 +28,23 @@
     int CalibCalPulse2;
     int Physics;
     int CalibTrkBoth;
-    int Calib_Trk1;
-    int Calib_Trk2;
-    int Calib_Cal;
-    int Calib_Trd;
-    int Calib_Tof;
-    int Calib_S4;
-    int Calib_CalPed;
-    int Calib_Ac;
-    int Run_Header;
-    int Run_Trailer;
+    int CalibTrk1;
+    int CalibTrk2;
+    int CalibCal;
+    int CalibTof;
+    int CalibS4;
+    int CalibCalPed;
+    int Calib1_Ac1;
+    int Calib1_Ac2;
+    int Calib2_Ac1;
+    int Calib2_Ac2;
+    int RunHeader;
+    int RunTrailer;
     int CalibHeader;
     int CalibTrailer;
     int InitHeader;
     int InitTrailer;
     int EventTrk;
-    int TestTrk;
-    int TestTof;
     int Log;
     int VarDump;
     int ArrDump;
@@ -51,17 +52,23 @@
     int Tmtc;
     int Mcmd;
     int ForcedFECmd;
-    int AcInit;
+    int Ac1Init;
     int CalInit;
     int TrkInit;
     int TofInit;
     int TrgInit;
     int NdInit;
+    int S4Init;
+    int Ac2Init;
     int CalAlarm;
-    int AcAlarm;
+    int Ac1Alarm;
     int TrkAlarm;
     int TrgAlarm;
     int TofAlarm;
+    int S4Alarm;
+    int Ac2Alarm;
+    int TsbT;
+    int TsbB;
 
     typedef std::map<const pamela::PacketType *, int *> CounterMap;
     CounterMap CMap; //!
@@ -77,8 +84,10 @@
     int GetRunNumber(void) const { return RunNumber; }
     void Increment(pamela::PacketType const *) throw (NotExistingCounterException);
     void PrintCounters() const ;
-    ClassDef(EventCounter, 1)
+    ClassDef(EventCounter, 7)
   };
 }
 
 #endif /* EVENTCOUNTER_H */
+
+