From a96b85af22d16e7d7738504c412be570cedcf2a4 Mon Sep 17 00:00:00 2001
From: Nicolas Vilchez <nicolas.vilchez@cnrs-orleans.fr>
Date: Mon, 1 Dec 2014 13:23:28 +0000
Subject: [PATCH] Task #5678 correct minor bug for Final iteration with
 outerfovclean option = yes

---
 .../pyselfcal/src/class_selfcalrun.py         | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/CEP/Calibration/pyselfcal/src/class_selfcalrun.py b/CEP/Calibration/pyselfcal/src/class_selfcalrun.py
index 9c94650fc60..e447b0acd2e 100644
--- a/CEP/Calibration/pyselfcal/src/class_selfcalrun.py
+++ b/CEP/Calibration/pyselfcal/src/class_selfcalrun.py
@@ -124,14 +124,25 @@ class selfCalRun:
 			if os.path.isdir(self.IterDir) != True:
 				cmd="""mkdir %s"""%(self.IterDir)
 				os.system(cmd)	
-				
-			print ''
-			cmd="""cp -r %s* %s"""%(self.obsDir,self.IterDir)
-			print cmd
-			print '' 
-			os.system(cmd)				
-			
+							
 			
+			# copy original data
+			if self.outerFOVclean =='no':
+					
+					print ''
+					cmd=""" cp -r %s* %s"""%(self.obsDir,self.IterDir)
+					print cmd
+					print ''
+					os.system(cmd)							
+									
+			# copy data from PreProcessing directory		
+			if self.outerFOVclean =='yes':
+
+					print ''							
+					cmd=""" cp -r %s %s"""%("""%sPreprocessDir/Iter%s/*sub%s"""%(self.outputDir,self.preprocessIndex,self.preprocessIndex),self.IterDir)
+					print cmd
+					print ''
+					os.system(cmd)				
 			
 			#if os.listdir(self.IterDir) == []:
 			#		cmd=""" cp -r %s %s"""%(self.outputDir+"""Iter%s/*Iter%s"""%(self.i-1,self.i-1),self.IterDir)
-- 
GitLab