svn merge ^/trunk/SHERPA@29448 ^/branches/readin@29448
This reintegrates the readin branch, replacing Data_Reader with its new subclass Default_Reader, wherever parameters are read from the run card(s) or the command line. This simplifies this use case and and enforces consistency. A lot of duplicate code is removed, too. Data_Reader is still used for more low-level string parsing.
Showing with 1626 additions and 1504 deletions