--- a/tracking.cfg	Wed Jun 03 16:00:46 2015 +0200
+++ b/tracking.cfg	Fri Jun 05 02:25:30 2015 +0200
@@ -84,20 +84,28 @@
 # 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
+bv-svm-filename = modelBV.xml
+# method to aggregate road user speed
+speed-aggregation-method = 'median'
+# number of frames to ignore at both ends of a series (noisy)
+nframes-ignore-at-ends = 2
+# quantile for the speed aggregation, if quantile is chosen
+speed-aggregation-quantile = 50
+# speed value below which all classes are equiprobable (distributions give odd values there) (km/h)
+min-speed-equiprobable = 3.33
+# maximum pedestrian speed (agregate: mean, median, 85th centile, etc.) 10 km/h
+max-ped-speed = 10.0
+# maximum cyclist speed (agregate: mean, median, 85th centile, etc.) 30 km/h (3xped)
+max-cyc-speed = 30.0
+# mean pedestrian speed and standard deviation (in a normal distribution) 4.91+-0.88 km/h
+mean-ped-speed = 4.91
+std-ped-speed = 0.88
+# mean cyclist speed and standard deviation (in a log-normal distribution) 11.+-4.83 km/h
+cyc-speed-loc = 2.31
+cyc-speed-scale = 0.42
+# mean vehicle speed and standard deviation (in a normal distribution) 18.45+-7.6 km/h
+mean-veh-speed = 18.45
+std-veh-speed = 7.6
 # Safety analysis
 # maximum speed when predicting future motion (km/h)
 max-predicted-speed = 50