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

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2011-04-11 12:54:47 -0500 (Mon, 11 Apr 2011)
New Revision: 4333

Modified:
   SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
   SwiftApps/Montage/scripts/mDiff_wrap.sh
   SwiftApps/Montage/scripts/mFitplane_wrap.sh
Log:
o SwiftApps/Montage/scripts/mFitplane_wrap.sh
o SwiftApps/Montage/scripts/mDiff_wrap.sh
  -- Changed to line to mkdir -p so mkdir will not clobber an already created directory.
  -- always touch the file to make sure that the file is created

o SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
  -- Changed to always use the slower mProject operation until I can figure out how to choose between the fast projection and the regular projection


Modified: SwiftApps/Montage/scripts/Swift_Montage_Batch.swift
===================================================================
--- SwiftApps/Montage/scripts/Swift_Montage_Batch.swift	2011-04-08 23:45:03 UTC (rev 4332)
+++ SwiftApps/Montage/scripts/Swift_Montage_Batch.swift	2011-04-11 17:54:47 UTC (rev 4333)
@@ -61,8 +61,8 @@
     foreach img, i in raw_imgs
     {
         Image proj_img <regexp_mapper; source = @img, match = ".*\\/(.*)", transform = "proj_dir/proj_\\1">;
-        proj_img = mProjectPP( img, hdr );
-//        proj_img = mProject( img, hdr );
+//        proj_img = mProjectPP( img, hdr );
+        proj_img = mProject( img, hdr );
 
         proj_imgs[ i ] = proj_img;
     }

Modified: SwiftApps/Montage/scripts/mDiff_wrap.sh
===================================================================
--- SwiftApps/Montage/scripts/mDiff_wrap.sh	2011-04-08 23:45:03 UTC (rev 4332)
+++ SwiftApps/Montage/scripts/mDiff_wrap.sh	2011-04-11 17:54:47 UTC (rev 4333)
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 mDiff $1 $2 $3 $4 $5
-if [ $? == 1 ]; then
-    touch $4
-fi
+
+mkdir -p `dirname $4`
+touch $4
+
 exit 0

Modified: SwiftApps/Montage/scripts/mFitplane_wrap.sh
===================================================================
--- SwiftApps/Montage/scripts/mFitplane_wrap.sh	2011-04-08 23:45:03 UTC (rev 4332)
+++ SwiftApps/Montage/scripts/mFitplane_wrap.sh	2011-04-11 17:54:47 UTC (rev 4333)
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 mFitplane $1 $2 $3
-if [ $? == 1 ]; then
-    touch $2
-fi
+
+mkdir -p `dirname $2`
+touch $2
+
 exit 0