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

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2011-04-11 22:46:39 -0500 (Mon, 11 Apr 2011)
New Revision: 4336

Modified:
   SwiftApps/Montage/TODO
   SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
Log:
o SwiftApps/Montage/TODO
  -- Modifications to the TODO list

o SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
  -- Modifications to the mDiffBatch function. Assumes that the images that will be processed are in the raw_dir directory.


Modified: SwiftApps/Montage/TODO
===================================================================
--- SwiftApps/Montage/TODO	2011-04-11 19:44:52 UTC (rev 4335)
+++ SwiftApps/Montage/TODO	2011-04-12 03:46:39 UTC (rev 4336)
@@ -1,3 +1,12 @@
+o test runs
+  -- Need to do some test runs from some of the files from the big test.  Need to verify that Montage works correctly if some files are not created.
+  -- Need to test to make sure calling mOverlaps on the raw-directory is the correct thing to do.  The tutorial shows that mOverlaps is supposed to be called on proj_dir not raw_dir.  Maybe this is a situational decision in which case this is an easy fix.
+
+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)	
+
 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
@@ -6,9 +15,5 @@
 o templates
   -- Add more templates for other machines.  For sure needs localhost
 
-o scripts/Swift_Montage_Batch.swift
-  -- Need to fix mProjectBatch.  Currently calls mProject blindly.  Need to figure out how to choose between mProject and mProjectPP
-
-o test runs
-  -- Need to do some test runs from some of the files from the big test.  Need to verify that Montage works correctly if some files are not created.
-  -- Need to test to make sure calling mOverlaps on the raw-directory is the correct thing to do.  The tutorial shows that mOverlaps is supposed to be called on proj_dir not raw_dir.  Maybe this is a situational decision in which case this is an easy fix.
+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.
\ No newline at end of file

Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
===================================================================
--- SwiftApps/Montage/scripts/Swift_Montage_Batch.swift	2011-04-11 19:44:52 UTC (rev 4335)
+++ SwiftApps/Montage/scripts/Swift_Montage_Batch.swift	2011-04-12 03:46:39 UTC (rev 4336)
@@ -28,11 +28,11 @@
     {
         /* Not always going to be in proj_dir. Maybe read diff_tbl for directory. */
         /* Not sure if the information is there. */
-        Image proj_1 <single_file_mapper; file = @strcat( "proj_dir/", @d_entry.plus )>;
-        Image proj_2 <single_file_mapper; file = @strcat( "proj_dir/", @d_entry.minus )>;
+        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 diff_img <single_file_mapper; file = @strcat( "diff_dir/", @d_entry.diff )>;
-        diff_img = mDiff( proj_1, proj_2, hdr );
+        diff_img = mDiff( img_1, img_2, hdr );
 
 
         diff_imgs[ i ] = diff_img;