Changeset 35350 for branches/eam_branches/ipp-20130307/ippScripts/scripts/diff_skycell.pl

Timestamp:

Apr 2, 2013, 3:01:21 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130307

Files:

• . (modified) (1 prop)
• ippScripts/scripts/diff_skycell.pl (modified) (1 diff)

branches/eam_branches/ipp-20130307/ippScripts/scripts/diff_skycell.pl

@@ -113 +113 @@
 my ($inputMagic, $templateMagic); # Are the inputs been magicked?
 my ($saveInConv, $saveRefConv);   # Save the input or reference convolved images?
-# Prescan to decide if this is or is not a stack stack diff. The check above confirms we only have two entries.
-if ((${ $files }[0]->{warp_id} == 0)&&
-    (${ $files }[1]->{warp_id} == 0)) {
-    # Both are zero, so stack stack diff;
-    unless ($use_convolved) {
-        $use_convolved = 0;
-    }
-}
-else {
-    # We're in some sort of warp stack or warp warp (don't care about the last one.)
-    $use_convolved = 1;
-}
+# CZW 2013-03-21: We only want to use unconvolved inputs.  Ever, if I understand correctly.
+unless ($use_convolved) {
+    $use_convolved = 0;
+}
+
+# # Prescan to decide if this is or is not a stack stack diff. The check above confirms we only have two entries.
+# if ((${ $files }[0]->{warp_id} != 0)&&
+#     (${ $files }[1]->{warp_id} != 0)) {
+#     # Both are zero, so stack stack diff;
+# }
+# else {
+
+#     # We're in some sort of warp stack or warp warp (don't care about the last one.)
+#     $use_convolved = 1; ## This is a hack to do a test for mops, and should not be committed.
+# }
 
 # ppSub does (input) - (template) after PSF-match convolution.