moved function calculating ergodic parameters
cosmetic changes
break down of calibration engine