addressed comments raised in reviews
moved output generation outside the calculators
Merge branch 'risk-from-ses' into risk-base-calc-refactoring