Changeset 42094 for trunk/ppStack/src/ppStackFiles.c

Timestamp:

Feb 28, 2022, 3:01:31 PM (4 years ago)

Author:

eugene

Message:

some cleanup of ppStackFiles: JPEG1 & JPEG2 are not part of the "convolved" output: they are activated explicitly in ppStackJPEGs.c; add option to generate stacks using the pmStackCombineByPercent method; trap failures in the ppStackReadout threads; fix normalization for both convolved and unconvolved versions (was inconsistent in ppStackLoop)

Location:

trunk/ppStack

Files:

• . (modified) (1 prop)
• src/ppStackFiles.c (modified) (4 diffs)

trunk/ppStack/src/ppStackFiles.c

@@ -1 +1 @@
 #include "ppStack.h"
+# define DEBUG 0
 
 // Here follows lists of files for activation/deactivation at various stages.  Each must be NULL-terminated.
@@ -28 +29 @@
 static char *filesStack[] = { "PPSTACK.OUTPUT", "PPSTACK.OUTPUT.MASK", "PPSTACK.OUTPUT.VARIANCE",
                               "PPSTACK.OUTPUT.EXP", "PPSTACK.OUTPUT.EXPNUM", "PPSTACK.OUTPUT.EXPWT",
-                              "PPSTACK.OUTPUT.JPEG1", "PPSTACK.OUTPUT.JPEG2",
                               "PPSTACK.OUTPUT.BKGMODEL",
                               NULL };
@@ -45 +45 @@
 {
     switch (list) {
-      case PPSTACK_FILES_NONE:     return filesNOP;
-      case PPSTACK_FILES_PREPARE:  return filesPrepare;
-      case PPSTACK_FILES_TARGET:   return filesTarget;
-      case PPSTACK_FILES_CONVOLVE: return filesConvolve;
-      case PPSTACK_FILES_STACK:    return filesStack;
-      case PPSTACK_FILES_UNCONV:   return filesUnconv;
-      case PPSTACK_FILES_PHOT:     return filesPhot;
-    case PPSTACK_FILES_BKG:        return filesBkg;
-    case PPSTACK_FILES_MEDIAN_IN:        return filesMedianIn;
-    case PPSTACK_FILES_MEDIAN_OUT:        return filesMedianOut;
+      case PPSTACK_FILES_NONE:       return filesNOP;
+      case PPSTACK_FILES_PREPARE:    return filesPrepare;
+      case PPSTACK_FILES_TARGET:     return filesTarget;
+      case PPSTACK_FILES_CONVOLVE:   return filesConvolve;
+      case PPSTACK_FILES_STACK:      return filesStack;
+      case PPSTACK_FILES_UNCONV:     return filesUnconv;
+      case PPSTACK_FILES_PHOT:       return filesPhot;
+      case PPSTACK_FILES_BKG:        return filesBkg;
+      case PPSTACK_FILES_MEDIAN_IN:  return filesMedianIn;
+      case PPSTACK_FILES_MEDIAN_OUT: return filesMedianOut;
       default:
         psAbort("Unrecognised file list: %x", list);
@@ -99 +99 @@
     char **files = stackFiles(list);    // Files to turn on/off
     for (int i = 0; files[i] != NULL; i++) {
+        if (DEBUG) {
+            if (state) {
+                fprintf (stderr, "activate %s\n", files[i]);
+            } else {
+                fprintf (stderr, "deativate %s\n", files[i]);
+            }
+        }
         pmFPAfileActivate(config->files, state, files[i]);
     }