Changeset 26475

Timestamp:

Dec 22, 2009, 10:01:06 AM (16 years ago)

Author:

eugene

Message:

fixing bugs related to stacking PR images

Location:

branches/eam_branches/20091201/ppStack

Files:

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

branches/eam_branches/20091201/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;
     }

branches/eam_branches/20091201/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);

branches/eam_branches/20091201/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

branches/eam_branches/20091201/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);

branches/eam_branches/20091201/ppStack/src/ppStackOptions.c

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

branches/eam_branches/20091201/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

branches/eam_branches/20091201/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);

branches/eam_branches/20091201/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);

branches/eam_branches/20091201/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?

branches/eam_branches/20091201/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