--- a/python/events.py	Wed Jun 19 23:35:24 2013 -0400
+++ b/python/events.py	Thu Jun 20 14:31:24 2013 -0400
@@ -8,9 +8,7 @@
 import multiprocessing
 import itertools
 
-import moving
-import prediction
-import indicators
+import moving, prediction, indicators, utils
 
 __metaclass__ = type
 
@@ -31,7 +29,25 @@
                       'Collision Course Angle',
                       'Distance',
                       'Minimum Distance',
-                      'Speed Differential']
+                      'Velocity Angle',
+                      'Speed Differential',
+                      'Collision Probability',
+                      'Time to Collision',
+                      'Probability of Successful Evasive Action',
+                      'predicted Post Encroachment Time']
+
+    indicatorNameToIndices = utils.inverseEnumeration(indicatorNames)
+
+    indicatorShortNames = ['',
+                           'CCAng',
+                           'Dist',
+                           'MinDist',
+                           'VA',
+                           'SD',
+                           'PoC',
+                           'TTC',
+                           'P(SEA)',
+                           'pPET']
 
     def __init__(self, num = None, timeInterval = None, roaduserNum1 = None, roaduserNum2 = None, roadUser1 = None, roadUser2 = None, categoryNum = None):
         moving.STObject.__init__(self, num, timeInterval)
@@ -103,6 +119,7 @@
         for i in list(commonTimeInterval)[:-1]: # do not look at the 1 last position/velocities, often with errors
             self.collisionPoints[i], self.crossingZones[i] = prediction.computeCrossingsCollisionsAtInstant(i, self.roadUser1, self.roadUser2, predictionParameters, collisionDistanceThreshold, timeHorizon, computeCZ, debug)
             TTCs[i] = prediction.computeExpectedIndicator(self.collisionPoints[i])
+        # add probability of collision, and probability of successful evasive action
         self.addIndicator(indicators.SeverityIndicator('TTC', TTCs))
         
         if computeCZ: