Changeset 26475 for branches/eam_branches/20091201/ppStack/src/ppStackPrepare.c

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/ppStackPrepare.c (modified) (1 diff)

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