[Swift-commit] r4607 - SwiftApps/Montage/scripts

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2011-06-13 15:32:19 -0500 (Mon, 13 Jun 2011)
New Revision: 4607

Modified:
   SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
Log:
added parameter to the batch fucntions so that they all have to be given the appropriate source, destination, and status directory


Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
===================================================================
--- SwiftApps/Montage/scripts/Swift_Montage_Batch.swift	2011-06-13 20:08:54 UTC (rev 4606)
+++ SwiftApps/Montage/scripts/Swift_Montage_Batch.swift	2011-06-13 20:32:19 UTC (rev 4607)
@@ -1,4 +1,4 @@
-( Image corr_imgs[] ) mBackgroundBatch( Image bg_imgs[], Table img_tbl, Table corr_tbl )
+( Image corr_imgs[] ) mBackgroundBatch( string dest, Image bg_imgs[], Table img_tbl, Table corr_tbl )
 {
     Table back_list = Background_list( img_tbl, corr_tbl );
 
@@ -7,7 +7,7 @@
     foreach background_entry, i in back_struct
     {
         Image proj_img <single_file_mapper; file = @strcat( @dirname( bg_imgs[i] )+"/", @background_entry.fname )>;
-        Image corr_img <regexp_mapper; source = @proj_img, match = ".*\\/(.*)", transform = "corr_dir/\\1">;
+        Image corr_img <regexp_mapper; source = @proj_img, match = ".*\\/(.*)", transform = dest+"/\\1">;
 
         float a = background_entry.a;
         float b = background_entry.b;
@@ -36,7 +36,7 @@
 }
 
 
-( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, string files[], Table diff_tbl, MosaicData hdr )
+( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, string stat_dir, string files[], Table diff_tbl, MosaicData hdr )
 {
     DiffStruct diffs[] <csv_mapper; file = diff_tbl, skip = 1, hdelim="| ">;
     Status stats[];
@@ -49,7 +49,7 @@
         Image img_2 <single_file_mapper; file = @strcat( src_dir+"/", @d_entry.minus )>;
 
         Image diff_img <single_file_mapper; file = @strcat( dest_dir+"/", @d_entry.diff )>;
-	Status stat <single_file_mapper; file = @strcat( "stat_dir/stat.", @d_entry.diff)>;
+	Status stat <single_file_mapper; file = stat_dir+ at strcat( "/stat.", @d_entry.diff)>;
         
         ( diff_img, stat ) = mDiffFit( img_1, img_2, hdr );
 
@@ -75,11 +75,11 @@
 }
 
 
-( Image proj_imgs[] ) mProjectBatch( Image raw_imgs[], MosaicData hdr )
+( Image proj_imgs[] ) mProjectBatch( string dest, Image raw_imgs[], MosaicData hdr )
 {
     foreach img, i in raw_imgs
     {
-        Image proj_img <regexp_mapper; source = @img, match = ".*\\/(.*)", transform = "proj_dir/proj_\\1">;
+        Image proj_img <regexp_mapper; source = @img, match = ".*\\/(.*)", transform = dest+"/proj_\\1">;
         proj_img = mProject( img, hdr );
 //        proj_img = mProjectPP( img, hdr );