Commit 47820a3b authored by Cecilia Nievas's avatar Cecilia Nievas
Browse files

Merge branch 'dev_minor_bugs' into 'master'

Two minor bug fixes in SERA rebuild 01 associated with issues 2 and 3: wrong variable name, sat_27f_model not supported

See merge request dynamicexposure/globaldynamicexposure/gde_calculations_prototype!6
parents 5474c1f3 279a3aa8
......@@ -103,7 +103,7 @@ def run_this_file(config_dict):
# Go admin unit by admin unit:
adm_level= admin_levels[case]
# Retrieve the IDs of all admin units associated with country_name and adm_level:
adm_ids_list= gdet_psql.retrieve_distinct_admin_IDs_by_country_case_admin_level(DB_name_grid, DB_username_grid, DB_schema_name_grid, DB_table_name, country_name, case, adm_level)
adm_ids_list= gdet_psql.retrieve_distinct_admin_IDs_by_country_case_admin_level(DB_name_grid, DB_username_grid, DB_schema_name_grid, DB_table_name_grid, country_name, case, adm_level)
# Initialise variables to collect values per admin unit from SERA csv files:
sera_num_bdgs_per_admin_unit= np.zeros([len(adm_ids_list)])
sera_num_dwells_per_admin_unit= np.zeros([len(adm_ids_list)])
......@@ -134,6 +134,8 @@ def run_this_file(config_dict):
param_for_weighting_adj= 'ghs_km2'
elif param_for_weighting=='sat_27f':
param_for_weighting_adj= 'sat_27f_km2'
elif param_for_weighting=='sat_27f_model':
param_for_weighting_adj= 'sat_27f_model_km2'
else:
param_for_weighting_adj= param_for_weighting
cells_ids, _= gdet_psql.get_cells_and_weights_from_country_occup_adm_id(DB_name_grid, DB_username_grid, DB_schema_name_grid, DB_table_name_grid, country_name, case, admin_id, param_for_weighting_adj)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment