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

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2011-04-12 21:41:08 -0500 (Tue, 12 Apr 2011)
New Revision: 4350

Modified:
   SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
Log:
o SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
  -- Change to the interface for mDiffBatch. Specify a source and destinition directory for the images


Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
===================================================================
--- SwiftApps/Montage/scripts/Swift_Montage_Batch.swift	2011-04-12 22:53:58 UTC (rev 4349)
+++ SwiftApps/Montage/scripts/Swift_Montage_Batch.swift	2011-04-13 02:41:08 UTC (rev 4350)
@@ -20,21 +20,18 @@
 }
 
 
-( Image diff_imgs[] ) mDiffBatch( Table diff_tbl, MosaicData hdr )
+( Image diff_imgs[] ) mDiffBatch( string src_dir, string dest_dir, Table diff_tbl, MosaicData hdr )
 {
     DiffStruct diffs[] <csv_mapper; file = diff_tbl, skip = 1, hdelim="| ">;
 
     foreach d_entry, i in diffs
     {
-        /* Not always going to be in proj_dir. Maybe read diff_tbl for directory. */
-        /* Not sure if the information is there. */
-        Image img_1 <single_file_mapper; file = @strcat( "raw_dir/", @d_entry.plus )>;
-        Image img_2 <single_file_mapper; file = @strcat( "raw_dir/", @d_entry.minus )>;
+        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 diff_img <single_file_mapper; file = @strcat( "diff_dir/", @d_entry.diff )>;
+        Image diff_img <single_file_mapper; file = @strcat( dest_dir, @d_entry.diff )>;
         diff_img = mDiff( img_1, img_2, hdr );
 
-
         diff_imgs[ i ] = diff_img;
     }
 }