Commit c6c03b63 authored by Thomas Vincent's avatar Thomas Vincent

Avoid duplicated attribute/variable + update docstrings

parent 50060d23
This diff is collapsed.
......@@ -153,11 +153,10 @@ class KmapMerger(object):
self.__set_status(self.READY)
def __set_status(self, status, msg=None):
"""
Sets the status of this instance.
"""Sets the status of this instance.
:param status:
:param msg:
:return:
"""
assert status in self.__STATUSES
self.__status = status
......@@ -167,15 +166,14 @@ class KmapMerger(object):
overwrite=False,
blocking=True,
callback=None):
"""
Starts the merge.
"""Starts the merge.
:param overwrite: if False raises an exception if some files already
exist.
exist.
:param blocking: if False, the merge will be done in a separate
thread and this method will return immediately.
:param callback: callback that will be called when the merging is done.
It overwrites the one passed the constructor.
:return:
It overwrites the one passed the constructor.
"""
self.__set_status(self.RUNNING)
......@@ -214,11 +212,7 @@ class KmapMerger(object):
thread.start()
def __run_merge(self):
"""
Runs the merge.
:return:
"""
"""Runs the merge."""
self.__set_status(self.RUNNING)
self.__master = None
......@@ -503,7 +497,7 @@ class KmapMerger(object):
if len(chan_per_deg) != 2:
raise ValueError('chan_per_deg must be a two elements array.')
self.__params['chan_per_deg'] = [float(chan_per_deg[0]),
float(chan_per_deg[1])]
float(chan_per_deg[1])]
center_chan = property(lambda self: self.__params['center_chan'])
......@@ -534,7 +528,6 @@ class KmapMerger(object):
raise ValueError('n_proc must be strictly positive')
self.__n_proc = n_proc
image_roi = property(lambda self: self.__image_roi)
""" Image ROI (origin_row, origin_column, height, width) to save.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment