Changeset 17702 for branches/eam_branch_20080511/ppSim/src/ppSimCreate.c

Timestamp:

May 15, 2008, 12:01:36 PM (18 years ago)

Author:

eugene

Message:

working on getting the input image options right

File:

• branches/eam_branch_20080511/ppSim/src/ppSimCreate.c (modified) (5 diffs)

branches/eam_branch_20080511/ppSim/src/ppSimCreate.c

@@ -17 +17 @@
             return NULL;
         }
-
-        simImage = true;
-        fpa = pmFPAConstruct(config->camera); // FPA to contain the observation
-        if (!fpa) {
-            psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to construct an FPA from camera configuration.");
-            return NULL;
-        }
     } else {
+      // If an image is supplied, we still generate a fake image and merge them together downstream
+      // (otherwise, we get the variance wrong).
         simImage = false;
         if (input->type != PM_FPA_FILE_IMAGE) {
@@ -30 +25 @@
             return NULL;
         }
-        fpa = psMemIncrRefCounter (input->fpa);
+    }
+
+    // generate the fpa structure used by the output camera (determined from INPUT or specified)
+    assert (config->camera);
+    fpa = pmFPAConstruct(config->camera); // FPA to contain the observation
+    if (!fpa) {
+      psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to construct an FPA from camera configuration.");
+      return NULL;
     }
 
@@ -98 +100 @@
 
     // PPSIM.SOURCES carries the constructed, fake sources with their true parameters
-    // XXX only invoke this code for OBJECT types of images
+    // XXX only invoke this code for OBJECT types of images?
     pmFPAfile *simSources = pmFPAfileDefineOutput (config, output->fpa, "PPSIM.SOURCES");
     if (!simSources) {
@@ -106 +108 @@
     simSources->save = true;
 
-    // if we have loaded an input image, we do not need to populate the fpa
-    if (!simImage) {
+    // if we have loaded an input image, we derive certain values from the image, if possible
+    if (input) {
         // we need to extract certain metadata from the image and populate the recipe.
         // or else we need to set the fpa concepts based on the recipe options...
@@ -118 +120 @@
         float zp = ppSimGetZeroPoint (recipe, filter);
         psMetadataAddF32(recipe, PS_LIST_TAIL, "ZEROPOINT", PS_META_REPLACE, "Photometric zeropoint", zp);
-
-        return output;
     }