Changeset 41923 for branches/eam_branches/ipp-20211108

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

Location:

branches/eam_branches/ipp-20211108/ppStack/src

Files:

• ppStackFiles.c (modified) (3 diffs)
• ppStackJPEGs.c (modified) (1 diff)
• ppStackLoopByPercent.c (modified) (4 diffs)
• ppStackPhotometry.c (modified) (1 diff)

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

@@ -28 +28 @@
 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 +44 @@
 {
     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 +98 @@
     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]);
     }

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

@@ -33 +33 @@
     psFree(ro2);
 
+    pmFPAfileActivate(config->files, true, "PPSTACK.OUTPUT.JPEG1");
+    pmFPAfileActivate(config->files, true, "PPSTACK.OUTPUT.JPEG2");
+
     return true;
 }

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);

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

@@ -19 +19 @@
     ppStackFileActivation(config, PPSTACK_FILES_PHOT, true);
     pmFPAview *photView = ppStackFilesIterateDown(config); // View to readout
-    ppStackFileActivation(config, PPSTACK_FILES_STACK, true);
+
+    ppStackFileList stackFiles = options->convolve ? PPSTACK_FILES_STACK : PPSTACK_FILES_UNCONV;
+    ppStackFileActivation(config, stackFiles, true);
 
     pmFPAfile *photFile = psMetadataLookupPtr(NULL, config->files, "PSPHOT.INPUT"); // File for photometry