Changeset 17851

Timestamp:

May 29, 2008, 3:26:56 AM (18 years ago)

Author:

eugene

Message:

loaded, fake, and forced sources are stored on different pmFPAfile containers

File:

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

branches/eam_branch_20080511/ppSim/src/ppSimPhotomReadout.c

@@ -23 +23 @@
     PS_ASSERT_PTR_NON_NULL (readout, false);
 
+    pmReadout *realSourceReadout = pmFPAfileThisReadout (config->files, view, "PPSIM.REAL.SOURCES");
+    PS_ASSERT_PTR_NON_NULL (realSourceReadout, false);
+
     // Generate the mask and weight images, including the user-defined analysis region of interest
     psphotSetMaskAndWeight (config, readout, recipe);
@@ -33 +36 @@
     // load the source lists
     // PPSIM.REAL.SOURCES carries the pmSource objects (from psphot analysis or loaded externally)
-    psArray *realSources = psMetadataLookupPtr (NULL, readout->analysis, "PPSIM.REAL.SOURCES");
+    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, "PPSIM.SOURCES");
+    psArray *injectedSources = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.SOURCES");
     psArray *fakeSources = psArrayAlloc (injectedSources->n);
     for (int i = 0; i < injectedSources->n; i++) {
@@ -115 +118 @@
 
     // 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);
+    // 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);
+    // psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PPSIM.FORCE.SOURCES", PS_DATA_ARRAY, "forced photometry ", forceSources);
     psFree (forceSources);
     return true;