Mydevel branch

Energy of HFEtplus and HFminus stored separately