Skip to content

Commit

Permalink
[Master] 2017.05.19. Set precision with static method
Browse files Browse the repository at this point in the history
* Set file precision via static method. This needed if queue is populated not directly via queue manager. For example loaded from file.
  • Loading branch information
IvarsKarpics committed May 19, 2017
1 parent 77bb9e5 commit 3072f45
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
2 changes: 2 additions & 0 deletions BeamlineSetup.py
Original file line number Diff line number Diff line change
Expand Up @@ -354,12 +354,14 @@ def get_default_path_template(self):
path_template.run_number = self[parent_key].getProperty('run_number')
path_template.suffix = self.session_hwobj["file_info"].getProperty('file_suffix')

"""
path_template.precision = '04'
try:
if self.session_hwobj["file_info"].getProperty('precision'):
path_template.precision = eval(self.session_hwobj["file_info"].getProperty('precision'))
except:
pass
"""

path_template.start_num = int(self[parent_key].getProperty('start_image_number'))
path_template.num_files = int(self[parent_key].getProperty('number_of_images'))
Expand Down
8 changes: 8 additions & 0 deletions Session.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,14 @@ def init(self):
self['file_info'].getProperty('archive_base_directory'),
self['file_info'].getProperty('archive_folder'))

precision = "04"
try:
precision = eval(self.session_hwobj["file_info"].getProperty('precision'))
except:
pass

queue_model_objects.PathTemplate.set_precision(precision)

def get_base_data_directory(self):
"""
Returns the base data directory taking the 'contextual'
Expand Down
10 changes: 9 additions & 1 deletion queue_model_objects_v1.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,10 @@ def __init__(self):
self.lims_group_id = None
self.interleave_num_images = None

def set_name_from_task(self, task):
if isinstance(task, DataCollection):
self._name = "Standart"

class Sample(TaskNode):
def __init__(self):
TaskNode.__init__(self)
Expand Down Expand Up @@ -1117,6 +1121,10 @@ def set_path_template_style(synchotron_name, template=None):
PathTemplate.synchotron_name = synchotron_name
PathTemplate.template = template

@staticmethod
def set_precision(precision):
PathTemplate.precision = precision

def __init__(self):
object.__init__(self)

Expand All @@ -1129,7 +1137,7 @@ def __init__(self):
self.wedge_prefix = str()
self.run_number = int()
self.suffix = str()
self.precision = str()
#self.precision = str()
self.start_num = int()
self.num_files = int()

Expand Down

0 comments on commit 3072f45

Please sign in to comment.