From 5ae3dc9bc057fd9f7ec39c595d1a6fe9d3d75b80 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Thu, 14 Apr 2016 06:05:23 +0000
Subject: [PATCH] Task #8437: Use globally unique temp file names in
imager_awimager and imager_source_finding recipes
---
CEP/Pipeline/recipes/sip/master/imager_awimager.py | 4 ++--
CEP/Pipeline/recipes/sip/master/imager_source_finding.py | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CEP/Pipeline/recipes/sip/master/imager_awimager.py b/CEP/Pipeline/recipes/sip/master/imager_awimager.py
index 1e88c5ecb27..bc4cc5a1861 100644
--- a/CEP/Pipeline/recipes/sip/master/imager_awimager.py
+++ b/CEP/Pipeline/recipes/sip/master/imager_awimager.py
@@ -120,7 +120,7 @@ class imager_awimager(BaseRecipe, RemoteCommandRecipeMixIn):
sourcedb_map.iterator = input_map.iterator = output_map.iterator = \
DataMap.SkipIterator
- for measurement_item, source_item in zip(input_map, sourcedb_map):
+ for idx, (measurement_item, source_item) in enumerate(zip(input_map, sourcedb_map)):
if measurement_item.skip or source_item.skip:
jobs.append(None)
continue
@@ -134,7 +134,7 @@ class imager_awimager(BaseRecipe, RemoteCommandRecipeMixIn):
self.environment,
self.inputs['parset'],
self.inputs['working_directory'],
- self.inputs['output_image'],
+ "%s-%s" % (self.inputs['output_image'], idx),
measurement_path,
sourcedb_path,
self.inputs['mask_patch_size'],
diff --git a/CEP/Pipeline/recipes/sip/master/imager_source_finding.py b/CEP/Pipeline/recipes/sip/master/imager_source_finding.py
index 59fd13cfed4..40bb1cf6c0b 100644
--- a/CEP/Pipeline/recipes/sip/master/imager_source_finding.py
+++ b/CEP/Pipeline/recipes/sip/master/imager_source_finding.py
@@ -91,15 +91,15 @@ class imager_source_finding(BaseRecipe, RemoteCommandRecipeMixIn):
node_command = " python %s" % (self.__file__.replace("master", "nodes"))
jobs = []
input_map.iterator = DataMap.SkipIterator
- for item in input_map:
+ for idx, item in enumerate(input_map):
arguments = [item.file,
self.inputs["bdsm_parset_file_run1"],
self.inputs["bdsm_parset_file_run2x"],
- catalog_output_path,
+ "%s-%s" % (catalog_output_path, idx),
os.path.join(
self.inputs["working_directory"],
- "bdsm_output.img"),
- self.inputs['sourcedb_target_path'],
+ "bdsm_output-%s.img" % (idx, )),
+ "%s-%s" % (self.inputs['sourcedb_target_path'], idx),
self.environment,
self.inputs['working_directory'],
self.inputs['makesourcedb_path']
--
GitLab