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

Timestamp:

May 13, 2008, 4:56:38 PM (18 years ago)

Author:

eugene

Message:

substantial work on argument handling to support externally supplied images

File:

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

branches/eam_branch_20080511/ppSim/src/ppSimCreate.c

@@ -1 +1 @@
 # include "ppSim.h"
-
-// XXX this function forces us to define the camera (on the command line) and format (via the
-// PPSIM.OUTPUT entry).  In this case, we need to set config->format,formatName based on these
-// values.  This will be a problem when we want to load an input image (in order to add fake
-// stars).  We will need to add some logic in ppSimArguments to distinguish the cases of 1)
-// input image and 2) specified camera
 
 pmFPAfile *ppSimCreate(pmConfig *config)
@@ -30 +24 @@
             return NULL;
         }
-        
     } else {
         simImage = false;
@@ -37 +30 @@
             return NULL;
         }
-        fpa = input->fpa;
+        fpa = psMemIncrRefCounter (input->fpa);
     }
 
     // define the output image file -- this is the basis for the ppSimLoop
-    pmFPAfile *file = pmFPAfileDefineOutput(config, fpa, OUTPUT_FILE);
-    if (!file) {
+    pmFPAfile *output = pmFPAfileDefineOutput(config, fpa, OUTPUT_FILE);
+    if (!output) {
         psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to create output file from %s.  "
                 "Did you forget to specify the format?", OUTPUT_FILE);
         return NULL;
     }
-    if (file->type != PM_FPA_FILE_IMAGE) {
+    if (output->type != PM_FPA_FILE_IMAGE) {
         psError(PS_ERR_BAD_PARAMETER_TYPE, true, "%s type is not IMAGE", OUTPUT_FILE);
         psFree(fpa);
-        psFree(file);
         return NULL;
     }
     // XXX we should not require the output image to be written
-    file->save = true;
+    output->save = true;
 
-    config->format = psMemIncrRefCounter (file->format);
-    config->formatName = psStringCopy (file->formatName);
+    config->format = psMemIncrRefCounter (output->format);
+    config->formatName = psStringCopy (output->formatName);
+
+    psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, PPSIM_RECIPE); // Recipe
 
     // For photometry, we operate on the chip-mosaicked image.  we create a copy of the mosaicked
     // image for psphot so we can write out a clean image
-    if (options->doPhotom) {
+    bool doPhotom = psMetadataLookupBool(&status, recipe, "PHOTOM"); // Density of fakes
+    if (doPhotom) {
 
         // we need a chip image if we perform photometry (is it necessary to build it if we don't use it?)
@@ -67 +62 @@
         if (!chipImage) {
             psError(PS_ERR_IO, false, _("Unable to generate new file from PPSIM.CHIP"));
-            psFree(options);
+            psFree(fpa);
             return NULL;
         }
         if (chipImage->type != PM_FPA_FILE_IMAGE) {
             psError(PS_ERR_IO, true, "PPSIM.CHIP is not of type IMAGE");
-            psFree(options);
+            psFree(fpa);
             return NULL;
         }
@@ -84 +79 @@
         if (!psphotDefineFiles (config, psphotInput)) {
             psError(PSPHOT_ERR_CONFIG, false, "Trouble defining the additional input/output files for psphot");
-            return false;
+            psFree(fpa);
+            return NULL;
         }
     } else {
@@ -92 +88 @@
         if (psMetadataLookupPtr(NULL, config->arguments, "PSPHOT.PSF")) {
             // tie the psf file to the chipMosaic 
-            pmFPAfileBindFromArgs(&status, file, config, "PSPHOT.PSF.LOAD", "PSPHOT.PSF");
+            pmFPAfileBindFromArgs(&status, output, config, "PSPHOT.PSF.LOAD", "PSPHOT.PSF");
             if (!status) {
                 psError(PS_ERR_UNKNOWN, false, "Failed to find/build PSPHOT.PSF.LOAD");
                 psFree(fpa);
-                psFree(file);
                 return NULL;
             }
@@ -104 +99 @@
     // PPSIM.SOURCES carries the constructed, fake sources with their true parameters
     // XXX only invoke this code for OBJECT types of images
-    pmFPAfile *simSources = pmFPAfileDefineOutput (config, file->fpa, "PPSIM.SOURCES");
+    pmFPAfile *simSources = pmFPAfileDefineOutput (config, output->fpa, "PPSIM.SOURCES");
     if (!simSources) {
         psError(PS_ERR_UNKNOWN, false, "Cannot find a rule for PPSIM.SOURCES");
@@ -113 +108 @@
     // if we have loaded an input image, we do not need to populate the fpa
     if (!simImage) {
-        return file;
+        // 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...
+
+        psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, PPSIM_RECIPE); // Recipe
+
+        ppSimArgToRecipeF32(&status, recipe, "EXPTIME", fpa->concepts, "FPA.EXPOSURE");
+        char *filter = ppSimArgToRecipeStr(&status, recipe, "FILTER", fpa->concepts, "FPA.FILTER");
+
+        float zp = ppSimGetZeroPoint (recipe, filter);
+        psMetadataAddF32(recipe, PS_LIST_TAIL, "ZEROPOINT", PS_META_REPLACE, "Photometric zeropoint", zp);
+
+        return output;
     }
 
-    pmFPALevel phuLevel = pmFPAPHULevel(file->format); // Level at which PHU goes
+    pmFPALevel phuLevel = pmFPAPHULevel(output->format); // Level at which PHU goes
 
     pmFPAview *view = pmFPAviewAlloc(0);// View for current level
 
     if (phuLevel == PM_FPA_LEVEL_FPA) {
-        if (!pmFPAAddSourceFromView(fpa, "Simulation", view, file->format)) {
+        if (!pmFPAAddSourceFromView(fpa, "Simulation", view, output->format)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
             psFree(fpa);
             psFree(view);
-            psFree(file);
             return NULL;
         }
@@ -133 +138 @@
     while ((chip = pmFPAviewNextChip(view, fpa, 1))) {
         if (phuLevel == PM_FPA_LEVEL_CHIP) {
-            if (!pmFPAAddSourceFromView(fpa, "Simulation", view, file->format)) {
+            if (!pmFPAAddSourceFromView(fpa, "Simulation", view, output->format)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
                 psFree(fpa);
                 psFree(view);
-                psFree(file);
                 return NULL;
             }
@@ -145 +149 @@
         while ((cell = pmFPAviewNextCell(view, fpa, 1))) {
             if (phuLevel == PM_FPA_LEVEL_CELL) {
-                if (!pmFPAAddSourceFromView(fpa, "Simulation", view, file->format)) {
+                if (!pmFPAAddSourceFromView(fpa, "Simulation", view, output->format)) {
                     psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
                     psFree(fpa);
                     psFree(view);
-                    psFree(file);
                     return NULL;
                 }
@@ -159 +162 @@
     psFree(view);
 
-    return file;
+    return output;
 }