From eaf76f2578f9e6be392120d35b39403c3952a24f Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Fri, 30 Aug 2024 12:09:55 +0100
Subject: [PATCH] adding new fit_lb584 to work as part of the production code
(long way to go) adding new json config param 'NAMEFileDateRegexp', which
allows the epi Loader to work with daily production and epi - fit NAME data
restoring accidentally deleted reference to the config dict used by
processor_base - allowing access of the config after a run by epi fit
swapping the epi fit gitlab-ci task to use the new fit_lb584
---
.gitlab-ci.yml | 2 +-
ews/coordinator/processor_base.py | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c85ccb3..da0d111 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -136,7 +136,7 @@ epi_fit:
mkdir $CI_PROJECT_DIR/fitting_outputs
- python3 $PACKAGES_DIR/epimodel/ews/epi_model/fit.py
+ python3 $PACKAGES_DIR/epimodel/ews/epi_model/fit_lb584.py
/storage/app/EWS_prod/regions/EastAfrica/test_workspace/integration/epi_fit/dev/data_proc/6.0_epi_pipeline/inputs/configs/epi_fit_S3_H4_D1_M1_F2_Q1_short_epi.json
$CI_PROJECT_DIR/fitting_outputs/
2016
diff --git a/ews/coordinator/processor_base.py b/ews/coordinator/processor_base.py
index a7de1fd..fb905c6 100755
--- a/ews/coordinator/processor_base.py
+++ b/ews/coordinator/processor_base.py
@@ -238,6 +238,7 @@ class ProcessorBase:
# read the run config json, and replace any tokens with values from the sys_config (such at the
# directory root for the installation)
config: dict = parse_json_file_with_tokens(config_path, sys_config)
+ self.config = config # set the class variable so it can be accessed externally
# then add the sys_config keys and values to the configjson
for k, v in sys_config.items():
--
GitLab