Merged addTheElecIDMVAoutputCSA14 from repository HuguesBrun
clean up / re-ordering of the code
update to have scenario 1 and 2