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

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2011-06-08 12:47:05 -0500 (Wed, 08 Jun 2011)
New Revision: 4582

Modified:
   SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
Log:
the different table is now called on the raw image data. Calling the difference table on the projected images was causing some problems in which the raw images didn't overlap but the projected images did.  this caused problems for mDiff and mDiffFit as files weren't being created. wrote wrapper scripts to solve this issue but this solution is much nicer


Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
===================================================================
--- SwiftApps/Montage/scripts/Swift_Montage_Batch.swift	2011-06-08 04:41:46 UTC (rev 4581)
+++ SwiftApps/Montage/scripts/Swift_Montage_Batch.swift	2011-06-08 17:47:05 UTC (rev 4582)
@@ -39,7 +39,8 @@
 }
 
 
-( Image diff_imgs[], Table fits_tbl ) mDiffFitBatch( string src_dir, string dest_dir, Table diff_tbl, MosaicData hdr )
+( 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, Table diff_tbl, MosaicData hdr )
 {
     DiffStruct diffs[] <csv_mapper; file = diff_tbl, skip = 1, hdelim="| ">;
     Status stats[];
@@ -48,8 +49,8 @@
 
     foreach d_entry, i in diffs
     {
-        Image img_1 <single_file_mapper; file = @strcat( src_dir+"/", @d_entry.plus )>;
-        Image img_2 <single_file_mapper; file = @strcat( src_dir+"/", @d_entry.minus )>;
+        Image img_1 <single_file_mapper; file = @strcat( src_dir+"/proj_", @d_entry.plus )>;
+        Image img_2 <single_file_mapper; file = @strcat( src_dir+"/proj_", @d_entry.minus )>;
 	Image area_img_1 <regexp_mapper; source = @img_1, match = "(.*)\\.(.*)", transform = "\\1_area.\\2">;
 	Image area_img_2 <regexp_mapper; source = @img_2, match = "(.*)\\.(.*)", transform = "\\1_area.\\2">;