Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
bis-aria
ariaec
Commits
8d14ebd8
Commit
8d14ebd8
authored
Jan 14, 2019
by
Fabrice Allain
Browse files
fix: revision of output slurm file for cns refine.csh
parent
fdfd9d95
Changes
3
Hide whitespace changes
Inline
Side-by-side
aria/core/Cluster.py
View file @
8d14ebd8
...
...
@@ -107,7 +107,7 @@ class ClusteringXMLPickler(XMLBasePickler):
def
load_from_element
(
self
,
xml_elt
):
"""
Load
clustering settings from XMLElement
Instantiate
clustering settings from XMLElement
Parameters
----------
...
...
aria/core/JobManager.py
View file @
8d14ebd8
...
...
@@ -280,10 +280,15 @@ class Job(Thread, AriaBaseClass):
checkscript
=
'_%s'
%
str
(
jobid
)
if
jobid
else
''
if
jobid
:
# Update script output with job id
script
=
checkscript
.
join
(
os
.
path
.
splitext
(
d
[
'script'
]))
self
.
_up_script
(
d
[
'script'
],
{
'sge_job_id'
:
jobid
},
script
)
# Create specific checkpoint file
checkscript
=
checkscript
.
join
(
os
.
path
.
splitext
(
d
[
'check_script'
]))
self
.
_up_script
(
d
[
'check_script'
],
{
'sge_job_id'
:
jobid
},
checkscript
)
d
[
'script'
]
=
script
d
[
'check_script'
]
=
checkscript
checkcmd
=
self
.
checkcmd_template
%
d
...
...
aria/core/PeakAssigner.py
View file @
8d14ebd8
...
...
@@ -41,6 +41,8 @@ def peak_shape(deltas, errors):
class
PeakAssignerSettings
(
Settings
):
order
=
()
def
create
(
self
):
from
.Settings
import
NonNegativeFloat
from
.Settings
import
YesNoChoice
,
FourLetterString
,
String
...
...
@@ -711,7 +713,7 @@ class PeakAssignerTextPickler(AriaBaseClass):
class
PeakAssignerXMLPickler
(
XMLBasePickler
):
def
_xml_state
(
self
,
x
):
"""
Define clustering
xml tag from PeakAssignerSettings object
Instantiate Peak assigner
xml tag from PeakAssignerSettings object
Parameters
----------
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment