Multi D Analysis

updated to run on r0 v r1.
also weighted the averages correctly in the combination of trial types