Changeset 27091

Timestamp:

Feb 25, 2010, 2:25:24 PM (16 years ago)

Author:

bills

Message:

hacks to allow stamps from stack-stack diffs to "work"

File:

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

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

@@ -445 +445 @@
         my ($warp_id, $exp_id, $exp_name, $chip_id, $cam_id);
         if ($inverse and !$image->{bothways}) {
-            print STDERR "Inverse images requested for diffRun that is not bothways. Ignoring.\n";
+            print STDERR "Inverse images requested for diffRun that is not bothways. Ignoring inverse.\n";
             $inverse = 0;
         }
@@ -470 +470 @@
             $image->{cam_id} = $cam_id;
         } else {
-            print STDERR "unexpected result warp_id not defined\n";
-            next;
+            my $stack1 = $image->{stack1};
+            # XXX: change this to check $image->{diff_mode} once it's populated and
+            # included in the difftool output
+            if ($stack1 and ($stack1 != 9223372036854775807)) {
+
+                # we have a stack - stack diff (well it might be stack - warp....)
+                # but at any rate we only handle image type diff
+                if ($img_type ne "diff") {
+                    print STDERR "lookup_diff: cannot lookup IMG_TYPE $img_type bydiff from SSdiff\n";
+                    next;
+                }
+
+                # XXX: If difftool doesn't return a camera insert it here
+                if (!$image->{camera}) {
+                    $image->{camera} = "GPC1";
+                    # lie about the magicked status since stack stack diffs don't require destreaking
+                    # we can remove this once diff_mode gets included
+                    $image->{magicked} = 42;
+                }
+            } else {
+                print STDERR "unexpected result: both warp1 and stack1 are null\n";
+                next;
+            }
         }
         if ($img_type eq "diff") {
@@ -483 +504 @@
                 $image->{weight} = $ipprc->filename($filerule_base . ".VARIANCE", $image->{path_base});
             } else {
-                # XXX this will only happen if the minuend is not a warp
-                print STDERR "WARNING: cannot resolve camera so cannot get weight and mask images\n";
+                # XXX this will only happen if the minuend is not a warp. See hack above
+                print STDERR "WARNING: cannot resolve camera so cannot get resolve file rules\n";
                 next;
             }