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
7beab62c
Commit
7beab62c
authored
4 years ago
by
Dr T. Mona
Browse files
Options
Downloads
Patches
Plain Diff
Cleaning unnecessary additional argument and if condition.
parent
fe7477af
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Processor.py
+8
-24
8 additions, 24 deletions
Processor.py
with
8 additions
and
24 deletions
Processor.py
+
8
−
24
View file @
7beab62c
...
...
@@ -249,14 +249,7 @@ def parse_and_check_args(todayString):
my_parser
.
add_argument
(
'
--noupload
'
,
action
=
'
store_true
'
,
help
=
'
whether results of script should be saved to willow public directory
'
,
)
my_parser
.
add_argument
(
'
-b
'
,
'
-bakrun
'
,
'
--plotting
'
,
'
--onlyplotting
'
,
action
=
'
store_true
'
,
help
=
'
if env.suit. results are already available in a _bak folder, and only replotting required
'
,
dest
=
'
bak_run
'
help
=
'
whether results of script should be saved to willow public directory
'
)
# get an object holding all of the args
...
...
@@ -448,22 +441,13 @@ def run_Process():
with
open
(
f
"
{
jobPath
}
/
{
configFileName
}
.json
"
,
'
w
'
)
as
write_file
:
json
.
dump
(
configjson
,
write_file
,
indent
=
4
)
if
not
args
.
bak_run
:
try
:
processing_outputs
=
process_in_job
(
jobPath
,
status
,
configjson
,
args
.
component
)
except
:
logger
.
exception
(
'
Some error in process_in_job()
'
)
status
.
reset
(
'
ERROR
'
)
endJob
(
status
,
premature
=
True
)
else
:
try
:
# Copy previously succesfully finished env.suit. results from a _bak folder
processing_outputs
=
ProcessorComponents
.
process_copy_past_job_env2_0
(
jobPath
,
status
,
configjson
,
args
.
component
)
except
:
logger
.
exception
(
'
Some error in ProcessorComponents.process_copy_past_job_env2_0()
'
)
status
.
reset
(
'
ERROR
'
)
endJob
(
status
,
premature
=
True
)
try
:
processing_outputs
=
process_in_job
(
jobPath
,
status
,
configjson
,
args
.
component
)
except
:
logger
.
exception
(
'
Some error in process_in_job()
'
)
status
.
reset
(
'
ERROR
'
)
endJob
(
status
,
premature
=
True
)
if
processing_outputs
:
if
isinstance
(
processing_outputs
,
list
):
...
...
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