--- yoda/event/EventCounter.h	2005/05/28 08:37:00	4.2
+++ yoda/event/EventCounter.h	2006/05/30 19:10:02	6.3
@@ -1,6 +1,6 @@
 /**     @file
  * $Source: /home/cvsmanager/yoda/event/EventCounter.h,v $
- * $Id: EventCounter.h,v 4.1 2005/05/28 08:30:01 kusanagi Exp $
+ * $Id: EventCounter.h,v 6.2 2006/05/30 19:10:01 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 {
   /**
@@ -26,6 +27,7 @@
     int CalibCalPulse1;
     int CalibCalPulse2;
     int Physics;
+    int CalibTrkBoth;
     int CalibTrk1;
     int CalibTrk2;
     int CalibCal;
@@ -43,8 +45,6 @@
     int InitHeader;
     int InitTrailer;
     int EventTrk;
-    int TestTrk;
-    int TestTof;
     int Log;
     int VarDump;
     int ArrDump;
@@ -61,11 +61,12 @@
     int S4Init;
     int Ac2Init;
     int CalAlarm;
-    int AcAlarm;
+    int Ac1Alarm;
     int TrkAlarm;
     int TrgAlarm;
     int TofAlarm;
     int S4Alarm;
+    int Ac2Alarm;
     int TsbT;
     int TsbB;
 
@@ -83,7 +84,7 @@
     int GetRunNumber(void) const { return RunNumber; }
     void Increment(pamela::PacketType const *) throw (NotExistingCounterException);
     void PrintCounters() const ;
-    ClassDef(EventCounter, 4)
+    ClassDef(EventCounter, 7)
   };
 }