Now working as the hybrid code

Removed the need for the annoying ETICS_CEP flag; now dt_scf is read from the config file.
This commit is contained in:
Yohai Meiron 2020-04-13 23:08:42 -04:00
parent 75ad0f0e89
commit b51613695f
5 changed files with 140 additions and 95 deletions

View file

@ -228,5 +228,12 @@ Config::Config(std::string file_name)
ext_dehnen_r = get_parameter<double>(dictionary, "ext_dehnen_r", -1);
ext_dehnen_gamma = get_parameter<double>(dictionary, "ext_dehnen_gamma", -1);
#ifdef ETICS
dt_scf = get_parameter<double>(dictionary, "dt_scf");
grapite_mask_file_name = get_parameter<std::string>(dictionary, "grapite_mask_file_name", "grapite.mask");
etics_dump_coeffs = get_parameter<bool>(dictionary, "etics_dump_coeffs", false);
grapite_active_search = get_parameter<bool>(dictionary, "grapite_active_search", false);
#endif
error_checking();
}