Changeset 39947 for trunk

Timestamp:

Jan 16, 2017, 12:27:26 AM (10 years ago)

Author:

mhuber

Message:

adding fix to broken hack for not saving intermediate in/refConv files and missing stack .cmf for SSdiff...

File:

• trunk/ippScripts/scripts/diff_skycell.pl (modified) (2 diffs)

trunk/ippScripts/scripts/diff_skycell.pl

@@ -217 +217 @@
 }
 
+## EAM 2015.03.12 : for the PV3 3pi diffs, we do NOT want to save these images.  here i am hacking this value to 0, but it should depend on the
+## values in filerules or recipe...
+$saveInConv  = 0;
+$saveRefConv = 0;
+## MEH adding above from ipptest:ipp-20150312 hack.. 
+## -- of course this wont work because of the poor code doing a defined check rather than value check.. so fix...
+undef $saveInConv;
+undef $saveRefConv;
+
 &my_die("Unable to identify template", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless defined $template;
 &my_die("Unable to identify input", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless defined $input;
@@ -274 +283 @@
 #&my_die("Couldn't find input: $templateSources", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($templateSources);
 
-if ($diff_type eq 'WS') {
+## MEH -- needs to be for both kinds of diffs using stacks...
+if ($diff_type eq 'WS' || $diff_type eq 'SS') {
     # LANL processed stack images do not have a set of sources transferred back, so we need to choose a different source list.
     unless($ipprc->file_exists($templateSources)) {