--- yoda/event/EventCounter.h	2004/09/24 11:57:32	2.1
+++ yoda/event/EventCounter.h	2004/12/09 08:47:42	2.3
@@ -1,6 +1,6 @@
 /** @file
  * $Source: /home/cvsmanager/yoda/event/EventCounter.h,v $
- * $Id: EventCounter.h,v 2.0 2004/09/21 20:49:57 kusanagi Exp $
+ * $Id: EventCounter.h,v 2.2 2004/12/03 22:04:04 kusanagi Exp $
  * $Author: kusanagi $
  * 
  * Header file for the EventCounter class.
@@ -9,9 +9,7 @@
 #define EVENTCOUNTER_H
 
 #include <map>
-
-#include <TObject.h> //Substituted by Maurizio 05 Feb 2004
-
+#include "Exception.h"
 #include "PscuHeader.h"
 
 namespace pamela {
@@ -59,11 +57,13 @@
     int TofInit;
     int TrgInit;
     int NdInit;
+    int S4Init;
     int CalAlarm;
     int AcAlarm;
     int TrkAlarm;
     int TrgAlarm;
     int TofAlarm;
+    int S4Alarm;
 
     typedef std::map<const pamela::PacketType *, int *> CounterMap;
     CounterMap CMap; //!
@@ -73,14 +73,16 @@
     /** Get the run number for the last read event of this type. */
     int getPscu() const { return Pscu; };
     /** Get the run number for the last read event of this type. */
-    int Get(pamela::PacketType const *) const;
+    int Get(pamela::PacketType const *) const throw (NotExistingCounterException);
     /** Get the run number for the next event of this type. */
-    int Next(pamela::PacketType const *) const;
+    int Next(pamela::PacketType const *) const throw (NotExistingCounterException);
     int GetRunNumber(void) const { return RunNumber; }
-    void Increment(pamela::PacketType const *);
+    void Increment(pamela::PacketType const *) throw (NotExistingCounterException);
     void PrintCounters() const ;
     ClassDef(EventCounter, 1)
   };
 }
 
 #endif /* EVENTCOUNTER_H */
+
+