Task #8437: Use globally unique location for concat.ms to support scratch dir on globalfs

CEP/Pipeline/recipes/sip/bin/imaging_pipeline.py

@@ -265,8 +265,8 @@ class imaging_pipeline(control):
         # MS per image. It must be stored on the same host as the final image.
         self.target_data = copy.deepcopy(self.output_data)
 
-        for item in self.target_data:
-            item.file = os.path.join(self.scratch_directory, 'concat.ms')
+        for idx, item in enumerate(self.target_data):
+            item.file = os.path.join(self.scratch_directory, 'ms_per_image_%d' % idx, 'concat.ms')
 
 
     @xml_node

CEP/Pipeline/recipes/sip/bin/long_baseline_pipeline.py

@@ -206,8 +206,8 @@ class longbaseline_pipeline(control):
         # MS per image. It must be stored on the same host as the final image.
         self.target_data = copy.deepcopy(self.output_data)
 
-        for item in self.target_data:
-            item.file = os.path.join(self.scratch_directory, 'concat.ms')
+        for idx, item in enumerate(self.target_data):
+            item.file = os.path.join(self.scratch_directory, 'ms_per_image_%d' % idx, 'concat.ms')
 
 
     @xml_node