Merge branch '2016_VELO_fix' into 'Sim10/2016'

Liang Sunrequested to merge
cherry-pick-9d622506 into Sim10/2016-mu

2016 Velo error parametrisation

See merge request !103 (merged)

(cherry picked from commit 9d622506)

4eaee30a 2016 Velo error parametrisation

Merge request reports