[Swift-commit] r4586 - in SwiftApps/Montage: exec scripts

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2011-06-08 16:56:42 -0500 (Wed, 08 Jun 2011)
New Revision: 4586

Added:
   SwiftApps/Montage/scripts/montage.swift
Modified:
   SwiftApps/Montage/exec/montage.sh
Log:
Fixed error in the execution scirpt. erroneus space in the config file path. added the general montage workflow to the scripts repository


Modified: SwiftApps/Montage/exec/montage.sh
===================================================================
--- SwiftApps/Montage/exec/montage.sh	2011-06-08 21:48:30 UTC (rev 4585)
+++ SwiftApps/Montage/exec/montage.sh	2011-06-08 21:56:42 UTC (rev 4586)
@@ -67,9 +67,10 @@
 rm -f sites.properties
 
 mv sites.xml ${WORK_DIRECTORY}
+cp ${SWIFT_MONTAGE}/scripts/montage.swift ${WORK_DIRECTORY}
 cp $4 ${WORK_DIRECTORY}
 cp -r $5 ${WORK_DIRECTORY}
 cd ${WORK_DIRECTORY}
-echo "swift -tc.file tc.data -sites.file sites.xml -config ${SWIFT_MONTAGE}/etc swift_montage.properties ${SWIFT_MONTAGE}/scripts/montage.swift"
+echo "swift -tc.file tc.data -sites.file sites.xml -config ${SWIFT_MONTAGE}/etc/swift_montage.properties ${SWIFT_MONTAGE}/scripts/montage.swift | tee -a swift.out"
 
 #clear ; swiftrun -sites localhost pads -input raw_dir header.hdr -script m101_montage.swift

Added: SwiftApps/Montage/scripts/montage.swift
===================================================================
--- SwiftApps/Montage/scripts/montage.swift	                        (rev 0)
+++ SwiftApps/Montage/scripts/montage.swift	2011-06-08 21:56:42 UTC (rev 4586)
@@ -0,0 +1,35 @@
+import "Swift_Montage_Types";
+import "Swift_Montage_Apps";
+import "Swift_Montage_Batch";
+
+MosaicData header <"header.hdr">;
+Table images_tbl <"images.tbl">;
+Table raw_images_tbl <"raw-images.tbl">;
+Table difference_tbl <"diffs.tbl">;
+Table fits_images_tbl <"fits.tbl">;
+Table corrections_tbl <"corrections.tbl">;
+Table stat_tbl <"stats.tbl">;
+Image corrected_mos <"final/corrected.fits">;
+JPEG corrected_jpg_img <"final/corrected.jpg">;
+Image projected_images[];
+Image projected_areas[];
+Image difference_images[];
+Image corrected_images[];
+
+Image raw_image_files[] <filesys_mapper; location = "raw_dir", suffix = ".fits">;
+
+difference_tbl = mOverlaps( raw_images_tbl );
+
+( projected_images, projected_areas ) = mProjectBatch( raw_image_files, header );
+
+images_tbl = mImgtbl( projected_images );
+
+( difference_images, fits_images_tbl ) = mDiffFitBatch( "proj_dir", "diff_dir", @filenames(projected_images), difference_tbl, header );
+
+corrections_tbl = mBgModel( images_tbl, fits_images_tbl );
+
+corrected_images = mBackgroundBatch( projected_images, images_tbl, corrections_tbl );
+
+corrected_mos = mAdd( corrected_images, images_tbl, header );
+
+corrected_jpg_img = mJPEG( corrected_mos );