Changeset 38709

Timestamp:

Sep 3, 2015, 1:22:04 PM (11 years ago)

Author:

bills

Message:

When performing diff updates add argument -updatemode to the ppSub command line.
When supplied, ppSub will unconditionally save the output pixels, mask, and variance images
regardless of what the file rule says.
This is necessary to update PV3 diffs which were generated without the pixels being saved
but users will want to see them.

Location:

trunk

Files:

• ippScripts/scripts/diff_skycell.pl (modified) (3 diffs)
• ppSub/src/ppSubArguments.c (modified) (1 diff)
• ppSub/src/ppSubCamera.c (modified) (2 diffs)

trunk/ippScripts/scripts/diff_skycell.pl

@@ -78 +78 @@
 # XXX camera is not known here; cannot use filerules... 
 my $logDest = "$outroot.log";
+my $updateMode = 0;
 if ($run_state eq 'update') {
     $logDest .= '.update';
+    $updateMode = 1;
 }
 $ipprc->redirect_to_logfile($logDest) or my_die( "Unable to redirect output", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR ) if $redirect;
@@ -322 +324 @@
     }
 
-    # use WARPSTATS if we're updating, as we don't care about the new stuff from the STACK and DIFF STATS recipes
+    # use WARPSTATS if we're updating, as we don't care about the new stuff from the STACK and DIFF STATS recipes.
+    # The only value that we use is -quality
     $recipe_ppstats = 'WARPSTATS';
 }
@@ -351 +354 @@
 {
     my $command = "$ppSub $outroot";
+    $command .= " -updatemode" if $updateMode;
     $command .= " -inimage $input";
     $command .= " -refimage $template";

trunk/ppSub/src/ppSubArguments.c

@@ -103 +103 @@
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-save-refconv", 0, "Save reference convolved images?", false);
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-visual", 0, "Show diagnostic plots", NULL);
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-updatemode", 0, "update mode?", false);
 
     if (argc == 1 || !psArgumentParse(arguments, &argc, argv) || argc != 2) {

trunk/ppSub/src/ppSubCamera.c

@@ -317 +317 @@
     checkFileruleFileSave (output, config);
     checkFileruleFileSave (outMask, config);
+    pmFPAfile *outVar = NULL;
     if (inVar && refVar) {
-        pmFPAfile *outVar = defineOutputFile(config, output, false, "PPSUB.OUTPUT.VARIANCE",
+        outVar = defineOutputFile(config, output, false, "PPSUB.OUTPUT.VARIANCE",
                                              PM_FPA_FILE_VARIANCE);
         if (!outVar) {
@@ -325 +326 @@
         }
         checkFileruleFileSave (outVar, config);
+    }
+    // If we are in update mode unconditionally save the output files
+    bool updateMode = psMetadataLookupBool(NULL, config->arguments, "-updatemode");
+    if (updateMode) {
+        output->save = true;
+        outMask->save = true;
+        if (outVar) {
+            outVar->save = true;
+        }
     }