Surface Metrology by Mahr covers roughness and contour measurement. Generally, these devices are based on the tactile stylus method. Thus, two dimensional profiles can be calculated and documented according to international standards.
With MarSurf equipment you are ahead, as success and further development make their benefit.