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

Timestamp:

Jun 4, 2008, 1:52:32 PM (18 years ago)

Author:

eugene

Message:

significant work on the I/O pmFPAfiles, especially to get the format / metaCamera correct for the input psf vs the input image

File:

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

branches/eam_branch_20080511/ppSim/src/ppSimPhotomReadout.c

@@ -1 +1 @@
 # include "ppSim.h"
+
+psArray *ppSimSelectSources (pmConfig *config, const pmFPAview *view, const char *filename) {
+
+    pmReadout *readout = pmFPAfileThisReadout (config->files, view, filename);
+    PS_ASSERT_PTR_NON_NULL (readout, NULL);
+
+    psArray *sources = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.SOURCES");
+    return sources;
+}
+
+bool ppSimDefinePixels (psArray *sources, pmReadout *readout, psMetadata *recipe) {
+
+    bool status;
+
+    float OUTER = psMetadataLookupF32 (&status, recipe, "SKY_OUTER_RADIUS");
+    if (!status) return NULL;
+
+    for (int i = 0; i < sources->n; i++) {
+        pmSource *source = sources->data[i];
+
+        // allocate image, weight, mask arrays for each peak (square of radius OUTER)
+        pmSourceDefinePixels (source, readout, source->peak->x, source->peak->y, OUTER);
+    }
+    return true;
+}
 
 bool ppSimPhotomReadout(pmConfig *config, const pmFPAview *view) {
@@ -13 +38 @@
 
     // set the photcode for this image
-    if (!psphotAddPhotcode (recipe, config, view)) {
+    if (!psphotAddPhotcode (recipe, config, view, "PPSIM.CHIP")) {
         psError (PSPHOT_ERR_CONFIG, false, "trouble defining the photcode");
         return false;
@@ -23 +48 @@
     PS_ASSERT_PTR_NON_NULL (readout, false);
 
-    pmReadout *realSourceReadout = pmFPAfileThisReadout (config->files, view, "PPSIM.REAL.SOURCES");
-    PS_ASSERT_PTR_NON_NULL (realSourceReadout, false);
+    // the previously measured real sources are loaded into the PPSIM.REAL.SOURCES pmFPAfile
+    psArray *realSources = ppSimSelectSources (config, view, "PPSIM.REAL.SOURCES");
+    PS_ASSERT_PTR_NON_NULL (realSources, false);
+
+    // the newly injected fake sources are saved on the PPSIM.OUTPUT pmFPAfile
+    psArray *injectedSources = ppSimSelectSources (config, view, "PPSIM.OUTPUT");
+    PS_ASSERT_PTR_NON_NULL (injectedSources, false);
+
+    // XXX need to define the source pixels
+    ppSimDefinePixels (realSources, readout, recipe);
+    ppSimDefinePixels (injectedSources, readout, recipe);
+
+    // make a copy of the fake-source parameters so these can be saved independently from the
+    // measured fake-source parameters
+    psArray *fakeSources = psArrayAlloc (injectedSources->n);
+    for (int i = 0; i < injectedSources->n; i++) {
+      fakeSources->data[i] = pmSourceCopy (injectedSources->data[i]);
+    }
+
+    // load the forced source lists
+    psArray *forceSources = ppSimLoadForceSources (config, view);
+    psAssert (forceSources, "failed to load force photometry sources");
 
     // Generate the mask and weight images, including the user-defined analysis region of interest
@@ -33 +78 @@
     pmPSF *psf = psphotLoadPSF (config, view, recipe);
     assert (psf);
-
-    // load the source lists
-    // PPSIM.REAL.SOURCES carries the pmSource objects (from psphot analysis or loaded externally)
-    psArray *realSources = psMetadataLookupPtr (NULL, realSourceReadout->analysis, "PSPHOT.SOURCES");
-    psArray *forceSources = ppSimLoadForceSources (config, view);
-
-    // 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, "PSPHOT.SOURCES");
-    psArray *fakeSources = psArrayAlloc (injectedSources->n);
-    for (int i = 0; i < injectedSources->n; i++) {
-      fakeSources->data[i] = pmSourceCopy (injectedSources->data[i]);
-    }
 
     // remove all sources 
@@ -97 +129 @@
     // XXX for the fake sources, these must be identically zero
     // XXX for the force sources, need the apresid to put the mags on the correct system
-    if (!psphotApResid (readout, forceSources, recipe, psf)) {
-        psLogMsg ("psphot", 3, "failed on psphotApResid");
-        return psphotReadoutCleanup (config, readout, recipe, NULL, psf, NULL);
+    if (0) {
+        if (!psphotApResid (readout, forceSources, recipe, psf)) {
+            psLogMsg ("psphot", 3, "failed on psphotApResid");
+            return psphotReadoutCleanup (config, readout, recipe, NULL, psf, NULL);
+        }
     }
 
@@ -119 +153 @@
     // add forceSources to the readout (real and fake already there)
     // these are outputs: we need to generate the fpa structure
-    // psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PPSIM.FAKE.SOURCES", PS_DATA_ARRAY, "fake photometry ", fakeSources);
+    
+    pmReadout *fakeReadout = pmFPAfileThisReadout (config->files, view, "PPSIM.FAKE.SOURCES");
+    psMetadataAdd (fakeReadout->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES", PS_DATA_ARRAY, "fake photometry ", fakeSources);
+
     // psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PPSIM.FORCE.SOURCES", PS_DATA_ARRAY, "forced photometry ", forceSources);
     psFree (forceSources);