From 43555c81e9a328b526df3ed4970e593b74391127 Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Wed, 14 Sep 2022 15:14:12 +0100
Subject: [PATCH] restoring post processing calls after not doing the last
merge properly...
---
ProcessorDeposition.py | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/ProcessorDeposition.py b/ProcessorDeposition.py
index 00e7965..569c227 100644
--- a/ProcessorDeposition.py
+++ b/ProcessorDeposition.py
@@ -10,13 +10,13 @@ from string import Template
import iris
from iris.cube import CubeList
-from plotting.common.plotting_coordinator.ews_depo_disease_plotting_coordinator import EWSPlottingDepoBase
-
from ProcessorUtils import (
get_only_existing_globs,
subprocess_and_log,
add_filters_to_sublogger,
)
+from ews_postprocessing.deposition.deposition_post_processor import DepositionPostProcessor
+
logger = logging.getLogger('Processor.Deposition')
add_filters_to_sublogger(logger)
@@ -106,23 +106,23 @@ def process_EWS_plotting_dep(jobPath,config):
logger.info(f"Running EWS-Plotting with the following configs:\n{sys_config}\n{name_extraction_config}\n{run_config}\n{run_config_norm}\n{chart_config}")
- depo_plotter = EWSPlottingDepoBase()
- depo_plotter.set_param_config_files(sys_config_file_arg=sys_config,
- depo_name_extraction_config_file_arg=name_extraction_config,
- chart_config_file_arg= chart_config,
- depo_plotting_run_config_file_arg=run_config,
- depo_plotting_normalized_run_config_file_arg=run_config_norm,
- name_file_wildcard_arg=name_file_wildcard,
- wheat_sources_dir_arg=deposition_path,
- output_dir_arg=output_dir,
- issue_date_arg=config['StartString'],
- extraction_file_prefix_arg=extraction_file_prefix)
+ depo_processor = DepositionPostProcessor()
+ depo_processor.set_param_config_files(sys_config_file_arg = sys_config,
+ depo_name_extraction_config_file_arg = name_extraction_config,
+ chart_config_file_arg = chart_config,
+ depo_plotting_run_config_file_arg = run_config,
+ depo_plotting_normalized_run_config_file_arg = run_config_norm,
+ name_file_wildcard_arg = name_file_wildcard,
+ wheat_sources_dir_arg = deposition_path,
+ output_dir_arg = output_dir,
+ issue_date_arg = config['StartString'],
+ extraction_file_prefix_arg = extraction_file_prefix)
# asia/east africa env suit should not perform normalization, false gets passed here for these areas
- depo_plotter.name_extract_params.NORMALIZE = (normalize.upper() == "TRUE")
+ depo_processor.name_extract_params.NORMALIZE = (normalize.upper() == "TRUE")
- depo_plotter.plot_depo()
+ depo_processor.process()
# check the output
EWSPlottingOutputDir = f"{output_dir}/images/"
--
GitLab