--- a/python/storage.py	Wed Jul 02 11:35:05 2014 -0400
+++ b/python/storage.py	Wed Jul 02 17:43:16 2014 -0400
@@ -558,7 +558,8 @@
 #########################
 
 class ProcessParameters:
-    '''Class for all parameters controlling data processing: input, method parameters, etc. for tracking, classification and safety
+    '''Class for all parameters controlling data processing: input,
+    method parameters, etc. for tracking, classification and safety
 
     Note: framerate is already taken into account'''
 
@@ -570,6 +571,7 @@
         config = ConfigParser()
         config.readfp(FakeSecHead(openCheck(filename)))
         self.sectionHeader = config.sections()[0]
+        # Tracking/display parameters
         self.videoFilename = config.get(self.sectionHeader, 'video-filename')
         self.databaseFilename = config.get(self.sectionHeader, 'database-filename')
         self.homographyFilename = config.get(self.sectionHeader, 'homography-filename')
@@ -589,6 +591,10 @@
         self.firstFrameNum = config.getint(self.sectionHeader, 'frame1')
         self.videoFrameRate = config.getfloat(self.sectionHeader, 'video-fps')
 
+        # Classification parameters
+        
+
+        # Safety parameters
         self.maxPredictedSpeed = config.getfloat(self.sectionHeader, 'max-predicted-speed')/3.6/self.videoFrameRate
         self.predictionTimeHorizon = config.getfloat(self.sectionHeader, 'prediction-time-horizon')*self.videoFrameRate
         self.collisionDistance = config.getfloat(self.sectionHeader, 'collision-distance')

--- a/tracking.cfg	Wed Jul 02 11:35:05 2014 -0400
+++ b/tracking.cfg	Wed Jul 02 17:43:16 2014 -0400
@@ -81,7 +81,23 @@
 # minimum average number of features per frame to create a vehicle hypothesis
 min-nfeatures-group = 3
 # Road user classification
-# TODO
+# filename of the general ped/cyc/veh SVM classifier
+pbv-svm-filename = modelPBV.xml
+# filename of the cyc/veh SVM classifier
+pbv-svm-filename = modelBV.xml
+# maximum pedestrian speed (agregate: mean, median, 85th centile, etc.) 3.6 m/s
+max-ped-speed = 0.12
+# maximum cyclist speed (agregate: mean, median, 85th centile, etc.) 10.8 m/s (3xped)
+max-cyc-speed = 0.36
+# mean pedestrian speed and standard deviation (in a normal distribution) 1.36+-0.24 m/s
+mean-ped-speed = 0.45
+std-ped-speed = 0.008
+# mean cyclist speed and standard deviation (in a log-normal distribution) 1.36+-0.24 m/s
+mean-cyc-speed = 0.45
+std-cyc-speed = 0.008
+# mean vehicle speed and standard deviation (in a normal distribution) 5.12+-2.11 m/s
+mean-veh-speed = 0.17
+std-veh-speed = 0.07
 # Safety analysis
 # maximum speed when predicting future motion (km/h)
 max-predicted-speed = 50