From fd6bfb9f67efa2d0176ca89fa8ac9fa877bbe5b1 Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Thu, 20 Jun 2024 12:03:12 +0100
Subject: [PATCH] fixing survey configs
---
ews/coordinator/processor_surveys.py | 6 +++---
.../coordinator/template_sys_config_EastAfrica.json | 4 ++--
.../configs/source_gen/config_EastAfrica_mapspam2017.json | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ews/coordinator/processor_surveys.py b/ews/coordinator/processor_surveys.py
index 327e719..e483581 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 73b5719..edfec1b 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 7397b95..0a5f7ee 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"
}
--
GitLab