diff --git a/ews/coordinator/processor_surveys.py b/ews/coordinator/processor_surveys.py index 327e7191524e841e551d11e40300203e5d405de8..e4835816cbdd5e9e601573b3405d44bba9e5ffd1 100644 --- a/ews/coordinator/processor_surveys.py +++ b/ews/coordinator/processor_surveys.py @@ -204,8 +204,8 @@ class ProcessorSurveys(ProcessorBase): processed_surveys_filepath = f"{Export_csv_path}/Processed_SurveyData.csv" - survey_errors_to_remove_filepath = f"{config['ResourcesPath']}/assets/coordinator/SURVEYDATA_MANUAL/SurveyDataErrorsToRemove.csv" - survey_additions_filepath = f"{config['ResourcesPath']}/assets/coordinator/SURVEYDATA_MANUAL/LIVE_SURVEYDATA_TOUSE.csv" + survey_errors_to_remove_filepath = f"{config['AssetsPath']}/coordinator/SURVEYDATA_MANUAL/SurveyDataErrorsToRemove.csv" + survey_additions_filepath = f"{config['AssetsPath']}/coordinator/SURVEYDATA_MANUAL/LIVE_SURVEYDATA_TOUSE.csv" # perform here in python, using the 'KEY' column # check the key column is unique, if not raise a warning and remove duplicates @@ -348,7 +348,7 @@ class ProcessorSurveys(ProcessorBase): # days 1-7 are forecast days # days 8 and 9 are buffers in case NAME needs to run with the # previous day's source job - day_offsets = [-2,9], + day_offsets = [-2, 9], output_dir = output_directory) logger.debug('Placing copy of result in job directory with conventional name') diff --git a/pipeline_resources/configs/coordinator/template_sys_config_EastAfrica.json b/pipeline_resources/configs/coordinator/template_sys_config_EastAfrica.json index 73b5719ae2ad93bc831c8ce8419abd01a8fafd71..edfec1b1c3e1a9f60b32258c5f92084f462f0b32 100644 --- a/pipeline_resources/configs/coordinator/template_sys_config_EastAfrica.json +++ b/pipeline_resources/configs/coordinator/template_sys_config_EastAfrica.json @@ -5,8 +5,8 @@ "StartString" : "?", "ProjectRoot" : "<path to project root>", "MetoFTP" : "<path to MetoFTP>", - "WorkspacePathout" : "${ProjectRoot}/regions/EastAfrica/workspace", - "WorkspacePath" : "${ProjectRoot}/regions/EastAfrica/workspace", + "WorkspacePathout" : "${ProjectRoot}/regions/EastAfrica/workspace/", + "WorkspacePath" : "${ProjectRoot}/regions/EastAfrica/workspace/", "ConfigsPath" : "${ProjectRoot}/code/coordinator/pipeline_resources/configs", "AssetsPath" : "${ProjectRoot}/regions/EastAfrica/resources/assets", "LoggingConfigPath" : "${ProjectRoot}/code/coordinator/pipeline_resources/configs/coordinator/log_config.json", diff --git a/pipeline_resources/configs/source_gen/config_EastAfrica_mapspam2017.json b/pipeline_resources/configs/source_gen/config_EastAfrica_mapspam2017.json index 7397b95db2dc866f0680fbb6c1231fa8b21c05f3..0a5f7eeb33b1b703c8325437aa450370e8a98050 100644 --- a/pipeline_resources/configs/source_gen/config_EastAfrica_mapspam2017.json +++ b/pipeline_resources/configs/source_gen/config_EastAfrica_mapspam2017.json @@ -3,11 +3,11 @@ "wheat_source_name" : "MAPSPAM2017", "wheat_file" : "NA", "wheat_rasters_bydate" : { - "20170101" : "${ResourcesPath}/assets/source_gen/spam2017V1r1_SSA_gr_H_WHEA_A_clipEastAfrica.tif" + "20170101" : "${AssetsPath}/source_gen/spam2017V1r1_SSA_gr_H_WHEA_A_clipEastAfrica.tif" }, - "cluster_poly_file" : "${ResourcesPath}/assets/source_gen/boundaries/EastAfrica_clusters.shp", + "cluster_poly_file" : "${AssetsPath}/source_gen/boundaries/EastAfrica_clusters.shp", "id_col" : "id", - "region_file" : "${ResourcesPath}/assets/source_gen/boundaries/EastAfrica_9regions.shp", + "region_file" : "${AssetsPath}/source_gen/boundaries/EastAfrica_9regions.shp", "region_id_col" : "REGION_ID", - "wheat_stages_file" : "${ResourcesPath}/assets/source_gen/approx_growth_timing_cleaned.csv" + "wheat_stages_file" : "${AssetsPath}/source_gen/approx_growth_timing_cleaned.csv" }