Skip to content
Snippets Groups Projects
Commit 1ebeffb5 authored by Wouter Klijn's avatar Wouter Klijn
Browse files

Task #3543: test of bugfix of copier script

parent 30031234
Branches
Tags
No related merge requests found
...@@ -147,6 +147,27 @@ class msss_target_pipeline(control): ...@@ -147,6 +147,27 @@ class msss_target_pipeline(control):
self.io_data_mask = [x and y for (x, y) in zip(data_mask, inst_mask)] self.io_data_mask = [x and y for (x, y) in zip(data_mask, inst_mask)]
def _create_target_map_for_instruments(self, instrument_map,
input_data_map):
"""
Create a mapfile with target locations: based on the host found in the
input_data_map, the name of the instrument file and the working \
directory + job name
"""
scratch_dir = os.path.join(
self.inputs['working_directory'], self.inputs['job_name'])
target_locations = []
for instrument_pair, data_pair in zip(instrument_map, input_data_map):
host_instr, path_instr = instrument_pair
host_data, path_data = data_pair
# target location == working dir instrument file name
target_path = os.path.join(scratch_dir, os.path.basename(path_instr))
target_location.append((host_data, target_path))
return target_locations
def _copy_instrument_files(self, instrument_map, input_data_map, def _copy_instrument_files(self, instrument_map, input_data_map,
mapfile_dir): mapfile_dir):
# For the copy recipe a target mapfile is needed # For the copy recipe a target mapfile is needed
...@@ -154,18 +175,19 @@ class msss_target_pipeline(control): ...@@ -154,18 +175,19 @@ class msss_target_pipeline(control):
# with the filename based on the # with the filename based on the
copier_map_path = os.path.join(mapfile_dir, "copier") copier_map_path = os.path.join(mapfile_dir, "copier")
create_directory(copier_map_path) create_directory(copier_map_path)
# source_map, target_map, new_instrument_map = \ target_map = self._create_target_map_for_instruments(instrument_map,
# self._create_target_map_for_instruments(instrument_map, input_data_map)
# input_data_map)
#Write the two needed maps to file #Write the two needed maps to file
source_path = os.path.join(copier_map_path, "source_instruments.map") source_path = os.path.join(copier_map_path, "source_instruments.map")
store_data_map(source_path, instrument_map) store_data_map(source_path, instrument_map)
target_path = os.path.join(copier_map_path, "target_instruments.map") target_path = os.path.join(copier_map_path, "target_instruments.map")
store_data_map(target_path, input_data_map) store_data_map(target_path, target_map)
raise Exception(target_path)
copied_files_path = os.path.join(copier_map_path, "copied_instruments.map") copied_files_path = os.path.join(copier_map_path, "copied_instruments.map")
store_data_map(target_path, input_data_map)
new_instrument_map = self.run_task("copier", new_instrument_map = self.run_task("copier",
mapfile_source=source_path, mapfile_source=source_path,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment