Changeset 41923 for branches/eam_branches/ipp-20211108/ppStack/src/ppStackLoopByPercent.c

Timestamp:

Nov 21, 2021, 11:02:01 AM (5 years ago)

Author:

eugene

Message:

if convolution is not selected, the outputs go to foo.unconv.fits

File:

• branches/eam_branches/ipp-20211108/ppStack/src/ppStackLoopByPercent.c (modified) (4 diffs)

branches/eam_branches/ipp-20211108/ppStack/src/ppStackLoopByPercent.c

@@ -25 +25 @@
     // Prepare for combination (define outputs, generate output cells)
     // NOTE: expmaps will be skipped if "PPSTACK.OUTPUT.EXP" -> NULL
-    if (!ppStackCombinePrepare("PPSTACK.OUTPUT", "PPSTACK.OUTPUT.EXP", options->doBackground ? "PPSTACK.OUTPUT.BKGMODEL" : NULL, PPSTACK_FILES_STACK, stack, options, config)) {
+    ppStackFileList stackFiles = options->convolve     ? PPSTACK_FILES_STACK       : PPSTACK_FILES_UNCONV;
+    char *outName              = options->convolve     ? "PPSTACK.OUTPUT"          : "PPSTACK.UNCONV";
+    char *expName              = options->convolve     ? "PPSTACK.OUTPUT.EXP"      : "PPSTACK.UNCONV.EXP";
+    char *bckName              = options->doBackground ? "PPSTACK.OUTPUT.BKGMODEL" : NULL;
+
+    if (!ppStackCombinePrepare(outName, expName, bckName, stackFiles, stack, options, config)) {
         psError(psErrorCodeLast(), false, "Unable to prepare for combination.");
         psFree(stack);
@@ -89 +94 @@
    // Clean up
     psTrace("ppStack", 2, "Cleaning up after combination....\n");
-    if (!ppStackCleanupFiles(stack, options, config, PPSTACK_FILES_STACK, PPSTACK_FILES_PHOT, true)) {
+    if (!ppStackCleanupFiles(stack, options, config, stackFiles, PPSTACK_FILES_PHOT, true)) {
         psError(psErrorCodeLast(), false, "Unable to clean up.");
         psFree(stack);
@@ -99 +104 @@
 
     // Unconvolved stack --- it's cheap to calculate, compared to everything else!
-    // XXX unconvolved stack is currently using the convolved mask!  oops!
+    // XXX unconvolved stack is currently using the convolved mask!  oops! (EAM: is this true?)
     if (options->convolve) {
         // Start threading
@@ -109 +114 @@
 
         // Prepare for combination
-        if (!ppStackCombinePrepare("PPSTACK.UNCONV", "PPSTACK.UNCONV.EXP", NULL, PPSTACK_FILES_UNCONV,
-                                   stack, options, config)) {
+        if (!ppStackCombinePrepare("PPSTACK.UNCONV", "PPSTACK.UNCONV.EXP", NULL, PPSTACK_FILES_UNCONV, stack, options, config)) {
             psError(psErrorCodeLast(), false, "Unable to prepare for combination.");
             psFree(stack);