Added time segments for electricity markets, consolidated ELYBASE+ELYPEAK into HPP - no result change