FAQ
| This is a
LIVE
service |
Changelog
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ews-coordinator
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Container Registry
Operate
Terraform modules
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gilligan Lab for Epidemiology and Modelling
Wheat rusts
ews-coordinator
Commits
b8826118
Commit
b8826118
authored
6 months ago
by
L. Bower
Browse files
Options
Downloads
Patches
Plain Diff
minor tidying
removing redundant clause
parent
66165c55
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ews/coordinator/processor_base.py
+1
-44
1 addition, 44 deletions
ews/coordinator/processor_base.py
ews/coordinator/processor_epidemiology.py
+3
-3
3 additions, 3 deletions
ews/coordinator/processor_epidemiology.py
with
4 additions
and
47 deletions
ews/coordinator/processor_base.py
+
1
−
44
View file @
b8826118
...
...
@@ -141,50 +141,7 @@ class ProcessorBase:
dictionary
:
dict
=
vars
(
args
)
return
dictionary
# def build_sys_config(self, sys_config_path: str) -> dict:
# '''This config obtains aspects of each dict in configs that must be common to
# them all. '''
#
# # initialise universal config
# # sys_config = {
# # "ProjectRoot": set(),
# # 'WorkspacePathout': set(),
# # "MetoFTP": set(),
# # "WorkspacePath": set(),
# # "ResourcesPath": set()
# # }
#
# sys_config = {}
# # keys = sys_config.keys()
#
# # get value of each key from each config file
# try:
# sys_config = open_and_check_config(sys_config_path)
# # for key in keys:
# # if key in config_i.keys():
# # sys_config[key].add(config_i[key])
# except:
# logger.exception(f"Failure in opening or checking config {sys_config_path}")
# end_script(premature = True)
#
# # Check for and keep only one value per key
# # for key in keys:
# # if len(sys_config[key]) > 1:
# # logger.error(f"Config files point to multiple {key} but this script can only handle one.")
# # end_script(premature = True)
# #
# # sys_config[key] = sys_config[key].pop()
#
# # config_tokens = {'ProjectRoot': sys_config['ProjectRoot'],
# # 'WorkspacePathout': sys_config['WorkspacePathout'],
# # 'MetoFTP': sys_config['MetoFTP'],
# # 'WorkspacePath': sys_config['WorkspacePath'],
# # 'ResourcesPath': sys_config['ResourcesPath']}
#
# return sys_config
def
prepare_job_directory
(
self
,
job_path
):
def
prepare_job_directory
(
self
,
job_path
:
str
):
"""
create job directory or archive if already exists (due to a rerun)
...
...
This diff is collapsed.
Click to expand it.
ews/coordinator/processor_epidemiology.py
+
3
−
3
View file @
b8826118
...
...
@@ -617,11 +617,11 @@ class ProcessorEpidemiology(ProcessorBase):
def
process_EWS_plotting_epi
(
self
,
job_path
,
config
):
"""
We infer whether to attemp plotting based on the presence or absence of the EWS-Plotting ke
t
in the config.
We infer whether to attemp
t
plotting based on the presence or absence of the EWS-Plotting ke
y
in the config.
"""
if
'
EWS-Plotting
'
in
config
and
config
[
'
EWS-Plotting
'
]
is
not
None
:
if
'
EWS-Plotting
'
in
config
:
logger
.
info
(
'
started process_EWS_plotting_epi()
'
)
logger
.
info
(
'
started process_EWS_plotting_epi()
as the EWS-Plotting key is present in the config
'
)
# initalise necessary variables from config
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment