Skip to content
Browse files

HiEDR2Mosiac: Added stop/resume at NoProj step

This allows a user to have a chance to bundle adjust the HiRISE
imagery before projection.
  • Loading branch information...
1 parent d8c053d commit 0e3b559d38db46470149c5d0a3f41d888c10b228 Zack Moratto committed Nov 17, 2012
Showing with 22 additions and 10 deletions.
  1. +22 −10 src/asp/Tools/hiedr2mosaic.py.in
View
32 src/asp/Tools/hiedr2mosaic.py.in
@@ -274,7 +274,7 @@ def mosaic( noprojed_CCDs, averages ):
sample_sum = 1;
line_sum = 1;
for i in range( noprojed_CCDs.match-1, noprojed_CCDs.min()-1, -1):
- if( i not in noprojed_CCDs); continue
+ if( i not in noprojed_CCDs): continue
sample_sum += averages[i][0]
line_sum += averages[i][1]
handmos( noprojed_CCDs[i], mosaic,
@@ -284,7 +284,7 @@ def mosaic( noprojed_CCDs, averages ):
sample_sum = 1;
line_sum = 1;
for i in range( noprojed_CCDs.match+1, noprojed_CCDs.max()+1, 1):
- if( i not in noprojed_CCDs); continue
+ if( i not in noprojed_CCDs): continue
sample_sum -= averages[i-1][0]
line_sum -= averages[i-1][1]
handmos( noprojed_CCDs[i], mosaic,
@@ -330,6 +330,10 @@ def main():
parser.set_defaults(threads=4)
parser.add_option("--manual", action="callback", callback=man,
help="Read the manual.")
+ parser.add_option("--stop-at-no-proj", dest="stop_no_proj", action="store_true",
+ help="Process the IMG files only to have SPICE attached. This allows jigsaw to happen")
+ parser.add_option("--resume-at-no-proj", dest="resume_no_proj", action="store_true",
+ help="Pick back up after spiceinit has happened or jigsaw. This was noproj uses your new camera information")
parser.add_option("-t", "--threads", dest="threads",
help="Number of threads to use.",type="int")
parser.add_option("-m", "--match", dest="match",
@@ -349,17 +353,25 @@ def main():
# post_isis_20 = is_post_isis_3_1_20();
isisversion( True )
- # hi2isis
- hi2isised = hi2isis( args, options.threads )
+ if not options.resume_no_proj:
+ # hi2isis
+ hi2isised = hi2isis( args, options.threads )
- # hical
- hicaled = hical( hi2isised, options.threads, options.delete )
+ # hical
+ hicaled = hical( hi2isised, options.threads, options.delete )
- # histitch
- histitched = histitch( hicaled, options.threads, options.delete )
+ # histitch
+ histitched = histitch( hicaled, options.threads, options.delete )
- # attach spice
- spice( histitched, options.threads )
+ # attach spice
+ spice( histitched, options.threads )
+
+ if options.stop_no_proj:
+ print "Finished"
+ return 0
+
+ if options.resume_no_proj:
+ histitched = args
CCD_files = CCDs( histitched, options.match )

0 comments on commit 0e3b559

Please sign in to comment.
Something went wrong with that request. Please try again.