[Swift-commit] r4351 - in SwiftApps/Montage: . scripts

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2011-04-12 22:56:17 -0500 (Tue, 12 Apr 2011)
New Revision: 4351

Modified:
   SwiftApps/Montage/TODO
   SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
Log:
o SwiftApps/Montage/TODO
  -- Deleted task for mDiifBatch on how to handle the directories to get the files from

o SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
  -- added "/" to the strcat call so that the file can mapped.


Modified: SwiftApps/Montage/TODO
===================================================================
--- SwiftApps/Montage/TODO	2011-04-13 02:41:08 UTC (rev 4350)
+++ SwiftApps/Montage/TODO	2011-04-13 03:56:17 UTC (rev 4351)
@@ -1,15 +1,14 @@
 o scripts/Swift_Montage_Batch.swift
-  -- Need to fix mDiffBatch.  Right now I have it assume the files will be in raw_dir.  I need to have this be more general. Perhaps pass in the directory the images live in.
-  -- Need to fix mProjectBatch.  Currently calls mProject blindly.  Need to figure out how to choose between mProject and mProjectPP
   -- Must map out the area files as well.  Then change all the app procedures accordingly to remove the -n option.(-n stands for ignore the area files)	
+  -- Need to fix mProjectBatch.  Currently calls mProject blindly.  Need to figure out how to choose between mProject and mProjectPP
 
 o exec/montage.sh
   -- Fix how to calculate the run directory
   -- Figure out how to specify what site location that are going to be run on and do gensites on the templates
   -- Make sure all environment variables are set that are needed to run the execution script
 
+o optimizations
+  -- Create different pool entries. One for projectiog, calculating difference images, and background rectification. Each one will require different number of workers to execute with so different pool entries will be required.  This will also change the tc.data files.
+
 o templates
   -- Add more templates for other machines.  For sure needs localhost
-
-o sites files
-  -- Create different pool entries. One for projectiog, calculating difference images, and background rectification. Each one will require different number of workers to execute with so different pool entries will be required.  This will also change the tc.data files.

Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
===================================================================
--- SwiftApps/Montage/scripts/Swift_Montage_Batch.swift	2011-04-13 02:41:08 UTC (rev 4350)
+++ SwiftApps/Montage/scripts/Swift_Montage_Batch.swift	2011-04-13 03:56:17 UTC (rev 4351)
@@ -26,10 +26,10 @@
 
     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+"/", @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 )>;
+        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;