FAQ | This is a LIVE service | Changelog

Skip to content
Snippets Groups Projects
Commit eaf76f25 authored by L. Bower's avatar L. Bower
Browse files

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
parent b8826118
No related branches found
No related tags found
No related merge requests found
...@@ -136,7 +136,7 @@ epi_fit: ...@@ -136,7 +136,7 @@ epi_fit:
mkdir $CI_PROJECT_DIR/fitting_outputs 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 /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/ $CI_PROJECT_DIR/fitting_outputs/
2016 2016
......
...@@ -238,6 +238,7 @@ class ProcessorBase: ...@@ -238,6 +238,7 @@ class ProcessorBase:
# read the run config json, and replace any tokens with values from the sys_config (such at the # read the run config json, and replace any tokens with values from the sys_config (such at the
# directory root for the installation) # directory root for the installation)
config: dict = parse_json_file_with_tokens(config_path, sys_config) 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 # then add the sys_config keys and values to the configjson
for k, v in sys_config.items(): for k, v in sys_config.items():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment