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

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2011-06-07 13:33:55 -0500 (Tue, 07 Jun 2011)
New Revision: 4574

Modified:
   SwiftApps/Montage/scripts/Swift_Montage_Apps.swift
   SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
Log:
Added fix so that the area file generated by mProject are also mapped for stageout


Modified: SwiftApps/Montage/scripts/Swift_Montage_Apps.swift
===================================================================
--- SwiftApps/Montage/scripts/Swift_Montage_Apps.swift	2011-06-06 20:58:31 UTC (rev 4573)
+++ SwiftApps/Montage/scripts/Swift_Montage_Apps.swift	2011-06-07 18:33:55 UTC (rev 4574)
@@ -72,7 +72,8 @@
 }
 
 
-app ( Image proj_img ) mProject( Image raw_img, MosaicData hdr )
+//app ( Image proj_img ) mProject( Image raw_img, MosaicData hdr )
+app ( Image proj_img, Image area_img ) mProject( Image raw_img, MosaicData hdr )
 {
     mProject "-X" @raw_img @proj_img @hdr;
 }

Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
===================================================================
--- SwiftApps/Montage/scripts/Swift_Montage_Batch.swift	2011-06-06 20:58:31 UTC (rev 4573)
+++ SwiftApps/Montage/scripts/Swift_Montage_Batch.swift	2011-06-07 18:33:55 UTC (rev 4574)
@@ -1,4 +1,4 @@
-( Image corr_imgs[] ) mBgBatch( Image bg_imgs[], Table img_tbl, Table corr_tbl )
+( Image corr_imgs[] ) mBackgroundBatch( Image bg_imgs[], Table img_tbl, Table corr_tbl )
 {
     Table back_list = Background_list( img_tbl, corr_tbl );
 
@@ -42,18 +42,18 @@
     Status stats[];
 
     Table status_tbl = create_status_table( diff_tbl );
-    
+
     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 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 = @strcat( "stat_dir/stat.", @d_entry.diff)>;
+
         ( diff_img, stat ) = mDiffFit( img_1, img_2, hdr );
 
-	diff_imgs[ i ] = diff_img;
+        diff_imgs[ i ] = diff_img;
         stats[ i ] = stat;
     }
     fits_tbl = mConcatFit( status_tbl, stats );
@@ -75,14 +75,17 @@
 }
 
 
-( Image proj_imgs[] ) mProjectBatch( Image raw_imgs[], MosaicData hdr )
+( Image proj_imgs[], Image area_imgs[] ) mProjectBatch( Image raw_imgs[], MosaicData hdr )
 {
     foreach img, i in raw_imgs
     {
         Image proj_img <regexp_mapper; source = @img, match = ".*\\/(.*)", transform = "proj_dir/proj_\\1">;
-        proj_img = mProject( img, hdr );
+        Image area_img <regexp_mapper; source = @proj_img, match = "(.*)\\.(.*)", transform = "proj_dir/\\1_area.\\2">;
+//        proj_img = mProject( img, hdr );
 //        proj_img = mProjectPP( img, hdr );
+        ( proj_img, area_img ) = mProject( img, hdr );
 
         proj_imgs[ i ] = proj_img;
+        area_imgs[ i ] = area_img;
     }
 }