Fix sampling computation, data alignment (with upper unit, cf jira discussion).