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

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2011-06-14 14:31:00 -0500 (Tue, 14 Jun 2011)
New Revision: 4614

Modified:
   SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
Log:
renaming of some variables in the batch scripts. Added stat_dir variable to the interface of mFitBatch


Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
===================================================================
--- SwiftApps/Montage/scripts/Swift_Montage_Batch.swift	2011-06-14 14:02:14 UTC (rev 4613)
+++ SwiftApps/Montage/scripts/Swift_Montage_Batch.swift	2011-06-14 19:31:00 UTC (rev 4614)
@@ -1,20 +1,20 @@
-( Image corr_imgs[] ) mBackgroundBatch( string dest, Image bg_imgs[], Table img_tbl, Table corr_tbl )
+( Image rect_imgs[] ) mBackgroundBatch( string dest, Image imgs[], Table img_tbl, Table rect_tbl )
 {
-    Table back_list = Background_list( img_tbl, corr_tbl );
+    Table back_list = Background_list( img_tbl, rect_tbl );
 
     BackgroundStruct back_struct[] = readData2( back_list );
 
     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 = dest+"/\\1">;
+        Image orig_img <single_file_mapper; file = @strcat( @dirname( imgs[i] )+"/", @background_entry.fname )>;
+        Image rect_img <regexp_mapper; source = @orig_img, match = ".*\\/(.*)", transform = dest+"/\\1">;
 
         float a = background_entry.a;
         float b = background_entry.b;
         float c = background_entry.c;
-        corr_img = mBackground( proj_img, a, b, c );
+        rect_img = mBackground( orig_img, a, b, c );
 
-        corr_imgs[ i ] = corr_img;
+        rect_imgs[ i ] = rect_img;
     }
 }
 
@@ -60,9 +60,9 @@
 }
 
 
-( Table fits_tbl ) mFitBatch( Image diff_imgs[], Table diff_tbl )
+( Table fits_tbl ) mFitBatch( string stat_dir, Image diff_imgs[], Table diff_tbl )
 {
-    Status stats[] <structured_regexp_mapper; source = diff_imgs, match = ".*\\/(.*)", transform = "stat_dir/stat.\\1">;
+    Status stats[] <structured_regexp_mapper; source = diff_imgs, match = ".*\\/(.*)", transform = stat_dir+"/stat.\\1">;
 
     Table status_tbl = create_status_table( diff_tbl );