Changeset 35500

Timestamp:

May 3, 2013, 11:39:01 AM (13 years ago)

Author:

bills

Message:

implement setting using RUN_TYPE to restrict diff lookups by diff_mode
warp_warp, warp_stack, stack_stack

File:

• trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (5 diffs)

trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -471 +471 @@
         $base_name    = "path_base"; # name of the field for the warptool output
     } elsif ($stage eq "diff") {
-        # XXX: is this path ever used for diff images anymore?
+
         if ($component or $use_imfile_id or !$skycenter) {
             $command = "$difftool -diffskyfile -pstamp_order -dbname $imagedb";
@@ -490 +490 @@
         $psf_name    = "PSPHOT.PSF.SKY.SAVE";
         $base_name   = "path_base";
+        my $diff_mode = getDiffMode($row->{RUN_TYPE});
+        $command .= " -diff_mode $diff_mode" if $diff_mode;
     } elsif ($stage eq "stack") {
         $skycell_id = $component;
@@ -735 +737 @@
 
     my $command = "$difftool -dbname $imagedb -pstamp_order";
-    
+
     my $choose_components = 0;
     if ($byid) {
@@ -751 +753 @@
     }
 
+    my $diff_mode = getDiffMode($rowList->[0]->{RUN_TYPE});
+    $command .= " -diff_mode $diff_mode" if $diff_mode;
+    
     my $output = runToolAndParse($command, $verbose);
 
@@ -1836 +1841 @@
 }
 
+sub getDiffMode {
+    my $run_type = shift;
+    my $diff_mode;
+    if (!isnull($run_type)) {
+        $run_type = lc($run_type);
+        if ($run_type eq 'warp_warp') {
+            $diff_mode = 1;
+        } elsif ($run_type eq 'warp_stack') {
+            $diff_mode = 2;
+        } elsif ($run_type eq 'stack_stack') {
+            $diff_mode = 4;
+        } else {
+            print STDERR "Ingnoring unrecognized diff RUN_TYPE : $run_type\n";
+        }
+    }
+    return $diff_mode;
+}
+        
+
 sub my_die
 {