Changeset 30141 for branches/eam_branches/ipp-20101205/psphot/src/psphotStackMatchPSFsNext.c

Timestamp:

Dec 21, 2010, 3:01:12 PM (16 years ago)

Author:

eugene

Message:

for psf-matched images: re-determine the psf; re-generate the models with the new psf; re-fit the fluxes; subtract all sources; as radial aperture fluxes are measured only replace the current source of interest; replace all sources before convolving to the next psf

File:

• branches/eam_branches/ipp-20101205/psphot/src/psphotStackMatchPSFsNext.c (modified) (5 diffs)

branches/eam_branches/ipp-20101205/psphot/src/psphotStackMatchPSFsNext.c

@@ -26 +26 @@
     }
 
-    float targetFWHM = fwhmValues->data.F32[lastSize + 1];
-    float currentFWHM = fwhmValues->data.F32[lastSize];
-
     int num = psphotFileruleCount(config, filerule);
 
@@ -36 +33 @@
     // loop over the available readouts
     for (int i = 0; i < num; i++) {
-        if (!psphotStackMatchPSFsNextReadout (config, view, filerule, i, recipe, currentFWHM, targetFWHM)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed to smooth image %s (%d) to target PSF %f", filerule, i, targetFWHM);
+        if (!psphotStackMatchPSFsNextReadout (config, view, filerule, i, recipe, fwhmValues, lastSize)) {
+            psError (PSPHOT_ERR_CONFIG, false, "failed to smooth image %s (%d) to target PSF %f", filerule, i, fwhmValues->data.F32[lastSize+1]);
             psImageConvolveSetThreads(oldThreads);
             return false;
@@ -47 +44 @@
 }
 
-bool psphotStackMatchPSFsNextReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe, float currentFWHM, float targetFWHM) {
+bool psphotStackMatchPSFsNextReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe, psVector *fwhmValues, int lastSize) {
 
     bool status = false;
@@ -70 +67 @@
         minGauss = 0.5;
     }
+
+    float targetFWHM = fwhmValues->data.F32[lastSize + 1];
+    float currentFWHM = fwhmValues->data.F32[lastSize];
 
     if (targetFWHM <= currentFWHM) {
@@ -131 +131 @@
     // so we save this in a vector.  if the vector is not yet defined, create it
 
-    psVector *fwhmValues = psMetadataLookupVector(&status, readout->analysis, "STACK.PSF.FWHM.VALUES");
-    psAssert(fwhmValues, "should already exist..");
-    psVectorAppend(fwhmValues, targetFWHM);
+    psVector *fwhmValuesOut = psMetadataLookupVector(&status, readout->analysis, "STACK.PSF.FWHM.VALUES");
+    psAssert(fwhmValuesOut, "should already exist..");
+    psVectorAppend(fwhmValuesOut, targetFWHM);
+
+    // do not generate a PSF if we already were supplied one
+    pmPSF *psfOld = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.PSF");
+    if (psfOld) {
+        // save PSF on readout->analysis
+        char psfEntry[64];
+        snprintf (psfEntry, 64, "PSPHOT.PSF.V%d", lastSize);
+        if (!psMetadataAddPtr (readout->analysis, PS_LIST_TAIL, psfEntry, PS_META_REPLACE | PS_DATA_UNKNOWN, "psphot psf model", psfOld)) {
+            psError (PSPHOT_ERR_UNKNOWN, false, "problem saving sources on readout");
+            return false;
+        }
+        psMetadataRemoveKey(readout->analysis, "PSPHOT.PSF");
+    }
 
     return true;