Changeset 26454

Timestamp:

Dec 17, 2009, 9:43:45 AM (16 years ago)

Author:

eugene

Message:

The new code which generates unconvolved and convolved stacks broke
the ability to run PR-style images without convolutions AND without
input psf models from pswarp. The zero point matching code also
requires input sources, and it had become mandatory. To fix this, I
have made the following modifications:

1) add an option to avoid matching zero points (MATCH.ZERO.POINTS)

2) do not activate the pmFPAfile PPSTACK.CONv.KERNEL unless
CONVOLVE is true

3) do not attempt to load the sources unless CONVOLVE, PHOT, or
MATCH.ZERO.POINTS is true.

4) the call of pmStackCombine ppStackReadout needs to test for the
existence of the rejected sources.

This check-in also includes again the pmReadoutFake threading which
had caused errors (problem was in pmSourceGroups.c)

Location:

trunk/ppStack/src

Files:

• ppStackCombineInitial.c (modified) (1 diff)
• ppStackConvolve.c (modified) (1 diff)
• ppStackFiles.c (modified) (1 diff)
• ppStackMatch.c (modified) (2 diffs)
• ppStackOptions.c (modified) (1 diff)
• ppStackOptions.h (modified) (1 diff)
• ppStackPrepare.c (modified) (1 diff)
• ppStackReadout.c (modified) (1 diff)
• ppStackSetup.c (modified) (1 diff)
• ppStackSources.c (modified) (1 diff)

trunk/ppStack/src/ppStackCombineInitial.c

@@ -20 +20 @@
     if (!options->convolve) {
         // No need to do initial combination when we haven't convolved
+        // XXX either allocate inspect and rejected here, or do not require them downstream
         return true;
     }

trunk/ppStack/src/ppStackConvolve.c

@@ -59 +59 @@
         pmFPAfileActivate(config->files, false, NULL);
         ppStackFileActivationSingle(config, PPSTACK_FILES_CONVOLVE, true, i);
+        if (options->convolve) {
+            // XXX PPSTACK.CONV.KERNEL not defined unless convolve
+            // pmFPAfileActivate(config->files, true, "PPSTACK.CONV.KERNEL");
+            pmFPAfileActivateSingle(config->files, true, "PPSTACK.CONV.KERNEL", i); // Activated file
+        }
+
         pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT", i); // File of interest
         pmFPAview *view = ppStackFilesIterateDown(config);

trunk/ppStack/src/ppStackFiles.c

@@ -17 +17 @@
 
 /// Files required for the convolution
-static char *filesConvolve[] = { "PPSTACK.INPUT", "PPSTACK.INPUT.MASK", "PPSTACK.INPUT.VARIANCE",
-                                 "PPSTACK.CONV.KERNEL", NULL };
+static char *filesConvolve[] = { "PPSTACK.INPUT", "PPSTACK.INPUT.MASK", "PPSTACK.INPUT.VARIANCE", NULL };
+
+//                                 "PPSTACK.CONV.KERNEL", NULL };
 
 /// Output files for the combination

trunk/ppStack/src/ppStackMatch.c

@@ -344 +344 @@
                                                        footprint); // Filtered list of sources
 
+            bool oldThreads = pmReadoutFakeThreads(true); // Old threading state
             if (!pmReadoutFakeFromSources(fake, readout->image->numCols, readout->image->numRows,
                                           stampSources, SOURCE_MASK, NULL, NULL, options->psf,
@@ -353 +354 @@
                 return false;
             }
+            pmReadoutFakeThreads(oldThreads);
 
             fake->mask = psImageCopy(NULL, readout->mask, PS_TYPE_IMAGE_MASK);

trunk/ppStack/src/ppStackOptions.c

@@ -42 +42 @@
 
     options->convolve = true;
+    options->matchZPs = true;
     options->stats = NULL;
     options->statsFile = NULL;

trunk/ppStack/src/ppStackOptions.h

@@ -9 +9 @@
     // Setup
     bool convolve;                      // Convolve images?
+    bool matchZPs;                      // Adjust relative fluxes based on transparency analysis?
     psMetadata *stats;                  // Statistics for output
     FILE *statsFile;                    // File to which to write statistics

trunk/ppStack/src/ppStackPrepare.c

@@ -176 +176 @@
 
 
-        pmReadout *ro = pmFPAviewThisReadout(view, inputFile->fpa); // Readout with sources
-        psArray *sources = psMetadataLookupPtr(NULL, ro->analysis, "PSPHOT.SOURCES"); // Sources
-        if (!sources) {
-            psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find sources in readout.");
-            return NULL;
-        }
-        options->sourceLists->data[index] = psMemIncrRefCounter(sources);
+        bool redoPhot = psMetadataLookupBool(NULL, recipe, "PHOT");
+        psArray *sources = NULL;
+
+        if (options->convolve || options->matchZPs || redoPhot) {
+            pmReadout *ro = pmFPAviewThisReadout(view, inputFile->fpa); // Readout with sources
+            sources = psMetadataLookupPtr(NULL, ro->analysis, "PSPHOT.SOURCES"); // Sources
+            if (!sources) {
+                psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find sources in readout.");
+                return NULL;
+            }
+            options->sourceLists->data[index] = psMemIncrRefCounter(sources);
+        }
 
         // Re-do photometry if we don't trust the source lists
-        if (psMetadataLookupBool(NULL, recipe, "PHOT")) {
+        if (redoPhot) {
             psTrace("ppStack", 2, "Photometering input %d of %d....\n", index, num);
             pmFPAfileActivate(config->files, false, NULL);
             ppStackFileActivationSingle(config, PPSTACK_FILES_CONVOLVE, true, index);
+            if (options->convolve) {
+                pmFPAfileActivate(config->files, true, "PPSTACK.CONV.KERNEL");
+            }
             pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT", index); // File
             pmFPAview *photView = ppStackFilesIterateDown(config);

trunk/ppStack/src/ppStackReadout.c

@@ -272 +272 @@
 
     if (!pmStackCombine(outRO, stack, maskVal | maskBad, maskSuspect, maskBad, 0, iter, combineRej,
-                        combineSys, combineDiscard, useVariance, safe, true)) {
+                        combineSys, combineDiscard, useVariance, safe, rejected)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts.");
         psFree(stack);

trunk/ppStack/src/ppStackSetup.c

@@ -21 +21 @@
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSTACK_RECIPE); // ppStack recipe
     psAssert(recipe, "We've thrown an error on this before.");
+
+    options->matchZPs = psMetadataLookupBool(NULL, recipe, "MATCH.ZERO.POINTS"); // Adjust zero points based on tranparency analysis?
 
     options->convolve = psMetadataLookupBool(NULL, recipe, "CONVOLVE"); // Convolve images?

trunk/ppStack/src/ppStackSources.c

@@ -61 +61 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
+    if (!options->matchZPs) {
+        int num = psMetadataLookupS32(NULL, config->arguments, "INPUTS.NUM"); // Number of inputs
+        options->norm = psVectorAlloc(num, PS_TYPE_F32);
+        psVectorInit (options->norm, 0.0);
+
+        // XXX do I need to set this?
+        // options->sumExposure = sumExpTime;
+
+        return true;
+    }
+
     psArray *sourceLists = options->sourceLists; // Source lists for each input
     psVector *inputMask = options->inputMask; // Mask for inputs