Measurements with a redesigned 3D-PTV system in natural and mixed convection