Changeset 17818 for branches/eam_branch_20080511/ppSim/src/ppSimPhotomReadout.c

Timestamp:

May 27, 2008, 7:12:46 PM (18 years ago)

Author:

eugene

Message:

working on the photometry of fake sources

File:

• branches/eam_branch_20080511/ppSim/src/ppSimPhotomReadout.c (modified) (8 diffs)

branches/eam_branch_20080511/ppSim/src/ppSimPhotomReadout.c

@@ -1 @@
-# include "psphotInternal.h"
+# include "ppSim.h"
 
-bool psphotReadout(pmConfig *config, const pmFPAview *view) {
+bool ppSimPhotomReadout(pmConfig *config, const pmFPAview *view) {
 
     psTimerStart ("psphotReadout");
@@ -18 +18 @@
     }
 
-    // find the currently selected readout
-    // XXX keep this name or go with something like PPSIM.PHOT.INPUT?
-    pmReadout  *readout = pmFPAfileThisReadout (config->files, view, "PSPHOT.INPUT");
+    // find the currently selected readout. 
+    // we always perform photometry on the mosaiced chip
+    pmReadout  *readout = pmFPAfileThisReadout (config->files, view, "PPSIM.CHIP");
     PS_ASSERT_PTR_NON_NULL (readout, false);
 
@@ -27 +27 @@
 
     // load the psf model, if suppled.  FWHM_X,FWHM_Y,etc are saved in the recipe
+    // this function uses PSPHOT.PSF.LOAD as the pmFPAfile 
     pmPSF *psf = psphotLoadPSF (config, view, recipe);
     assert (psf);
@@ -33 +34 @@
     // PPSIM.REAL.SOURCES carries the pmSource objects (from psphot analysis or loaded externally)
     psArray *realSources = psMetadataLookupPtr (NULL, readout->analysis, "PPSIM.REAL.SOURCES");
-    psArray *fakeSources = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.SOURCES");
-    forceSources = ppSimLoadForceSources (config, view);
+    psArray *forceSources = ppSimLoadForceSources (config, view);
 
-    // replace all sources
-    psphotRemoveSources (realSources, recipe);
+    // XXX make a copy of the fake-source parameters so these can be saved independently 
+    // from the measured fake-source parameters
+    psArray *injectedSources = psMetadataLookupPtr (NULL, readout->analysis, "PPSIM.SOURCES");
+    psArray *fakeSources = psArrayAlloc (injectedSources->n);
+    for (int i = 0; i < injectedSources->n; i++) {
+      fakeSources->data[i] = pmSourceCopy (injectedSources->data[i]);
+    }
+
+    // remove all sources 
+    psphotRemoveAllSources (realSources, recipe);
 
     // generate a background model (median, smoothed image)
-    if (!psphotModelBackground (config, view, "PSPHOT.INPUT")) {
+    if (!psphotModelBackground (config, view, "PPSIM.CHIP")) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }
-    if (!psphotSubtractBackground (config, view, "PSPHOT.INPUT")) {
+    if (!psphotSubtractBackground (config, view, "PPSIM.CHIP")) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }
@@ -51 +59 @@
 
     // XXX fake sources should measure peak->x,y, force sources should not
+    psMaskType maskVal = 0xff; 
     psImage *significance = psphotSignificanceImage (readout, recipe, 1, maskVal);
     ppSimDetections (significance, recipe, fakeSources);
@@ -60 +69 @@
 
     // replace all sources
-    psphotReplaceAll (realSources, recipe);
+    psphotReplaceAllSources (realSources, recipe);
 
     // construct an initial model for each object
@@ -67 +76 @@
     psphotGuessModels (readout, forceSources, recipe, psf);
     
+    psArray *sources = NULL;
+
     // linear fit to real + fake sources
-    psArray *sources = ppSimMergeSources (realSources, fakeSources);
+    sources = ppSimMergeSources (realSources, fakeSources);
     psphotFitSourcesLinear (readout, sources, recipe, psf, FALSE); // XXX option to NOT subtract
-    psphotReplaceAll (sources, recipe);
+    psphotReplaceAllSources (sources, recipe);
     psFree (sources); // only frees the merged references
 
     // linear fit to real + forced sources
-    psArray *sources = ppSimMergeSources (realSources, forceSources);
+    sources = ppSimMergeSources (realSources, forceSources);
     psphotFitSourcesLinear (readout, sources, recipe, psf, FALSE); // XXX option to NOT subtract
-    psphotReplaceAll (sources, recipe);
+    psphotReplaceAllSources (sources, recipe);
     psFree (sources); // only frees the merged references
 
@@ -85 +96 @@
     if (!psphotApResid (readout, forceSources, recipe, psf)) {
         psLogMsg ("psphot", 3, "failed on psphotApResid");
-        return psphotReadoutCleanup (config, readout, recipe, detections, psf, sources);
+        return psphotReadoutCleanup (config, readout, recipe, NULL, psf, NULL);
     }
 
-    // calculate source magnitudes
+    // calculate source magnitudes (for which set??)
     pmReadout *background = psphotSelectBackground (config, view, false);
-    psphotMagnitudes(sources, recipe, psf, background);
+    psphotMagnitudes(fakeSources, recipe, psf, background);
+    psphotMagnitudes(forceSources, recipe, psf, background);
 
     // drop the references to the image pixels held by each source
-    psphotSourceFreePixels (sources);
+    psphotSourceFreePixels (realSources);
+    psphotSourceFreePixels (fakeSources);
+    psphotSourceFreePixels (forceSources);
 
     // create the exported-metadata and free local data
-    return psphotReadoutCleanup(config, readout, recipe, detections, psf, sources);
+    // XXX this places the sources on readout->analysis as PSPHOT.SOURCES.  modify?
+    // (or don't supply the sources, and do this with a different function)
+    psphotReadoutCleanup(config, readout, recipe, NULL, psf, NULL);
+
+    // add forceSources to the readout (real and fake already there)
+    psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PPSIM.FAKE.SOURCES", PS_DATA_ARRAY, "fake photometry ", fakeSources);
+    psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PPSIM.FORCE.SOURCES", PS_DATA_ARRAY, "forced photometry ", forceSources);
+    psFree (forceSources);
+    return true;
 }