small update to CABOFileReader.
small refactoring of demand_uptake and translocation.