Changeset 17818 for branches/eam_branch_20080511/ppSim/src/ppSimLoop.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/ppSimLoop.c (modified) (3 diffs)

branches/eam_branch_20080511/ppSim/src/ppSimLoop.c

@@ -13 +13 @@
 
     // in this program, we are looping over the output image, rather than the input as in ppImage
-    pmFPAfile *file = psMetadataLookupPtr(NULL, config->files, OUTPUT_FILE); // Output file
+    pmFPAfile *file = psMetadataLookupPtr(NULL, config->files, "PPSIM.OUTPUT"); // Output file
     assert(file);
-
-    // if we have an input image, we need to add the synthetic data on top of it below
-    // XXX we may potentially use this input file to skip missing elements
-    pmFPAfile *input = psMetadataLookupPtr(NULL, config->files, "PPIMAGE.INPUT");
 
     pmFPA *fpa = file->fpa;             // FPA for file
@@ -111 +107 @@
 
             psVector *biasCols = ppSimMakeBiassec (cell, config);
-
-            pmCell *inputCell = NULL;
-            if (input) {
-                inputCell = pmFPAviewThisCell (view, input->fpa);
-            }
 
             for (int i = 0; i < cell->readouts->n; i++) {
@@ -169 +160 @@
                 readout->parent->parent->data_exists = true;
 
-                if (inputCell && inputCell->readouts->data[i]) {
-                    pmReadout *inReadout = inputCell->readouts->data[i];
-                    if (!inReadout->weight) {
-                        if (!pmReadoutGenerateWeight(inReadout, true)) {
-                            psError (PS_ERR_UNKNOWN, false, "trouble creating weight");
-                            return false;
-                        }
-                    }
-                    if (!ppSimMergeReadouts (readout, inReadout)) ESCAPE (PS_ERR_UNKNOWN, "problem merging input image with simulated image");
-                }
+                // if there is an input image, merge it with the simulated image
+                if (!ppSimMergeReadouts (config, view)) ESCAPE (PS_ERR_UNKNOWN, "problem merging input image with simulated image");
             }
             psFree(biasCols);