Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ppSim/src

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppSim/src (modified) (1 prop)
• ppSim/src/Makefile.am (modified) (1 diff)
• ppSim/src/ppSim.h (modified) (1 diff)
• ppSim/src/ppSimArguments.c (modified) (2 diffs)
• ppSim/src/ppSimCreate.c (modified) (8 diffs)
• ppSim/src/ppSimSequenceObject.c (modified) (1 diff)
• ppSim/src/ppSimUtils.c (modified) (10 diffs)
• ppSim/src/ppSimVersion.c (modified) (3 diffs)
• ppSim/src/ppSimVersionDefinitions.h.in (copied) (copied from trunk/ppSim/src/ppSimVersionDefinitions.h.in )

branches/cnb_branches/cnb_branch_20090301/ppSim/src

@@ -8 +8 @@
 .libs
 ppSimSequence
+ppSimVersionDefinitions.h

@@ -8 +8 @@
 .libs
 ppSimSequence
+ppSimVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/ppSim/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppSim ppSimSequence
 
-# PPSIM_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-# PPSIM_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-# PPSIM_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
-# 
-# # Force recompilation of ppSimVersion.c, since it gets the version information
-# ppSimVersion.c: FORCE
-#       touch ppSimVersion.c
-# FORCE: ;
+if HAVE_SVNVERSION
+PPSIM_VERSION=`$(SVNVERSION) ..`
+else
+PPSIM_VERSION="UNKNOWN"
+endif
 
-ppSim_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PSASTRO_CFLAGS) $(ppSim_CFLAGS) -DPPSIM_VERSION=$(SVN_VERSION) -DPPSIM_BRANCH=$(SVN_BRANCH) -DPPSIM_SOURCE=$(SVN_SOURCE)
+if HAVE_SVN
+PPSIM_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
+PPSIM_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+else
+PPSIM_BRANCH="UNKNOWN"
+PPSIM_SOURCE="UNKNOWN"
+endif
+
+# Force recompilation of ppSimVersion.c, since it gets the version information
+ppSimVersion.c: ppSimVersionDefinitions.h
+ppSimVersionDefinitions.h: ppSimVersionDefinitions.h.in FORCE
+        -$(RM) ppSimVersionDefinitions.h
+        $(SED) -e "s|@PPSIM_VERSION@|\"$(PPSIM_VERSION)\"|" -e "s|@PPSIM_BRANCH@|\"$(PPSIM_BRANCH)\"|" -e "s|@PPSIM_SOURCE@|\"$(PPSIM_SOURCE)\"|" ppSimVersionDefinitions.h.in > ppSimVersionDefinitions.h
+FORCE: ;
+
+ppSim_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PSASTRO_CFLAGS) $(ppSim_CFLAGS)
 ppSim_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) $(PSPHOT_LIBS) $(PSASTRO_LIBS)
 ppSim_SOURCES = \

branches/cnb_branches/cnb_branch_20090301/ppSim/src/ppSim.h

@@ -183 +183 @@
 char *ppSimTypeToString (ppSimType type);
 
-float ppSimGetZeroPoint (psMetadata *recipe, char *filter);
+float ppSimGetZeroPoint(psMetadata *recipe, const char *filter);
 
 bool ppSimMergeReadouts (pmConfig *config, pmFPAview *view);

branches/cnb_branches/cnb_branch_20090301/ppSim/src/ppSimArguments.c

@@ -31 +31 @@
     psMetadataAddStr(arguments,  PS_LIST_TAIL, "-format", 0, "Camera format name", NULL);
     psMetadataAddStr(arguments,  PS_LIST_TAIL, "-type", 0, "Exposure type (BIAS|DARK|FLAT|OBJECT)", NULL);
+    psMetadataAddStr(arguments,  PS_LIST_TAIL, "-obs_mode", 0, "observation mode", NULL);
     psMetadataAddStr(arguments,  PS_LIST_TAIL, "-filter", 0, "Filter name", NULL);
     psMetadataAddF32(arguments,  PS_LIST_TAIL, "-exptime", 0, "Exposure time (s)", NAN);
@@ -108 +109 @@
     ppSimArgToRecipeF32(&status, options, "STARS.DENSITY", arguments, "-starsdensity");
     ppSimArgToRecipeBool(&status, options, "PHOTOM",        arguments, "+photom");
+    psString obs_mode = psMetadataLookupStr(&status, arguments, "-obs_mode");
+    if (obs_mode) {
+        psMetadataAddStr(options, PS_LIST_TAIL, "OBS_MODE", 0, "observation mode", obs_mode);
+    }
+
 
     // if we are loading the input image (not creating it), then we can skip the remaining arguments

branches/cnb_branches/cnb_branch_20090301/ppSim/src/ppSimCreate.c

@@ -12 +12 @@
     pmFPAfile *input = pmFPAfileDefineFromArgs (&status, config, "PPSIM.INPUT", "INPUT");
     if (!input) {
-        // if we have not specified the camera already, we need to interpolate the recipes associated with this camera, and read other command-line recipes
-        if (!pmConfigReadRecipes(config, PM_RECIPE_SOURCE_CL)) {
-            psError(PS_ERR_IO, false, "Error merging recipes from camera config for %s", config->cameraName);
-            return NULL;
-        }
+        // if we have not specified the camera already, we need to interpolate the recipes associated with this camera, and read other command-line recipes
+        if (!pmConfigReadRecipes(config, PM_RECIPE_SOURCE_CL)) {
+            psError(PS_ERR_IO, false, "Error merging recipes from camera config for %s", config->cameraName);
+            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).
-        if (input->type != PM_FPA_FILE_IMAGE) {
-            psError(PS_ERR_IO, true, "PPSIM.INPUT is not of type IMAGE");
-            return NULL;
-        }
+        // If an image is supplied, we still generate a fake image and merge them together downstream
+        // (otherwise, we get the variance wrong).
+        if (input->type != PM_FPA_FILE_IMAGE) {
+            psError(PS_ERR_IO, true, "PPSIM.INPUT is not of type IMAGE");
+            return NULL;
+        }
     }
 
@@ -30 +30 @@
     fpa = pmFPAConstruct(config->camera, config->cameraName); // FPA to contain the observation
     if (!fpa) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to construct an FPA from camera configuration.");
-        return NULL;
+        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to construct an FPA from camera configuration.");
+        return NULL;
     }
 
@@ -37 +37 @@
     pmFPAfile *output = pmFPAfileDefineOutput(config, fpa, "PPSIM.OUTPUT");
     if (!output) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to create output file from PPSIM.OUTPUT. Did you forget to specify the format?");
-        return NULL;
+        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to create output file from PPSIM.OUTPUT. Did you forget to specify the format?");
+        return NULL;
     }
     if (output->type != PM_FPA_FILE_IMAGE) {
-        psError(PS_ERR_BAD_PARAMETER_TYPE, true, "PPSIM.OUTPUT type is not IMAGE");
-        psFree(fpa);
-        return NULL;
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true, "PPSIM.OUTPUT type is not IMAGE");
+        psFree(fpa);
+        return NULL;
     }
     // XXX we should not require the output image to be written
@@ -58 +58 @@
 
     if (type == PPSIM_TYPE_OBJECT) {
-        // adjust the seeing by the scale
-        float seeing = psMetadataLookupF32(&status, recipe, "SEEING");
-        if (isnan(seeing)) {
-            psError(PS_ERR_BAD_PARAMETER_TYPE, true, "seeing is not defined");
-            psFree(fpa);
-            return NULL;
-        }
-        float scale = psMetadataLookupF32(&status, recipe, "PIXEL.SCALE");
-        if (isnan(scale)) {
-            psError(PS_ERR_BAD_PARAMETER_TYPE, true, "pixel scale is not defined");
-            psFree(fpa);
-            return NULL;
-        }
-        psMetadataAddF32(recipe, PS_LIST_TAIL, "SEEING", PS_META_REPLACE, "Seeing SIGMA (pixels)", seeing / 2.0 / sqrt(2.0 * log(2.0)) / scale);
-
-        // if we have been supplied an input image, but no ra & dec, use the input image values
-        if (input) {
-            float ra = psMetadataLookupF32(&status, recipe, "RA");
-            if (isnan(ra)) {
-                ra = psMetadataLookupF64(&status, input->fpa->concepts, "FPA.RA");
-                psMetadataAddF32(recipe, PS_LIST_TAIL, "RA", PS_META_REPLACE, "ra (radians)", ra);
-            }
-            float dec = psMetadataLookupF32(&status, recipe, "DEC");
-            if (isnan(dec)) {
-                dec = psMetadataLookupF64(&status, input->fpa->concepts, "FPA.DEC");
-                psMetadataAddF32(recipe, PS_LIST_TAIL, "DEC", PS_META_REPLACE, "dec (radians)", dec);
-            }
-        }
+        // adjust the seeing by the scale
+        float seeing = psMetadataLookupF32(&status, recipe, "SEEING");
+        if (isnan(seeing)) {
+            psError(PS_ERR_BAD_PARAMETER_TYPE, true, "seeing is not defined");
+            psFree(fpa);
+            return NULL;
+        }
+        float scale = psMetadataLookupF32(&status, recipe, "PIXEL.SCALE");
+        if (isnan(scale)) {
+            psError(PS_ERR_BAD_PARAMETER_TYPE, true, "pixel scale is not defined");
+            psFree(fpa);
+            return NULL;
+        }
+        psMetadataAddF32(recipe, PS_LIST_TAIL, "SEEING", PS_META_REPLACE, "Seeing SIGMA (pixels)", seeing / 2.0 / sqrt(2.0 * log(2.0)) / scale);
+
+        // if we have been supplied an input image, but no ra & dec, use the input image values
+        if (input) {
+            float ra = psMetadataLookupF32(&status, recipe, "RA");
+            if (isnan(ra)) {
+                ra = psMetadataLookupF64(&status, input->fpa->concepts, "FPA.RA");
+                psMetadataAddF32(recipe, PS_LIST_TAIL, "RA", PS_META_REPLACE, "ra (radians)", ra);
+            }
+            float dec = psMetadataLookupF32(&status, recipe, "DEC");
+            if (isnan(dec)) {
+                dec = psMetadataLookupF64(&status, input->fpa->concepts, "FPA.DEC");
+                psMetadataAddF32(recipe, PS_LIST_TAIL, "DEC", PS_META_REPLACE, "dec (radians)", dec);
+            }
+        }
     }
 
     if ((type == PPSIM_TYPE_OBJECT) || (type == PPSIM_TYPE_FLAT)) {
-        // determine the zeropoint from the filter
-        float zp = psMetadataLookupF32(&status, recipe, "ZEROPOINT");
-        if (isnan(zp)) {
-            char *filter = psMetadataLookupStr(&status, recipe, "FILTER");
-            float zp = ppSimGetZeroPoint (recipe, filter);
-            psMetadataAddF32(recipe, PS_LIST_TAIL, "ZEROPOINT", PS_META_REPLACE, "Photometric zeropoint", zp);
-        }
+        // determine the zeropoint from the filter
+        float zp = psMetadataLookupF32(&status, recipe, "ZEROPOINT");
+        if (isnan(zp)) {
+            char *filter = psMetadataLookupStr(&status, recipe, "FILTER");
+            float zp = ppSimGetZeroPoint (recipe, filter);
+            psMetadataAddF32(recipe, PS_LIST_TAIL, "ZEROPOINT", PS_META_REPLACE, "Photometric zeropoint", zp);
+        }
     }
 
@@ -103 +103 @@
     if (doPhotom) {
 
-        // XXX at the moment, we can perform photometry on the fake sources and the forced
-        // photometry positions, but not one or the other.  Also, we only support photometry in
-        // the context of an image previously analysed by psphot.  Add support for:
-        // * photometry of a pure fake image (requires peak detection and psf creation)
-        // * photometry of forced source positions without fake image (this might work, it just
-        // requires not generating any fake features).
-
-        if (!input) {
-            psError(PS_ERR_UNKNOWN, false, "input image not found; currently required for photometry");
-            return NULL;
-        }
-
-        // we need a chip image if we perform photometry (is it necessary to build it if we don't use it?)
-        pmFPAfile *fakeImage = pmFPAfileDefineChipMosaic(config, output->fpa, "PPSIM.FAKE.CHIP");
-        if (!fakeImage) {
-            psError(PS_ERR_IO, false, _("Unable to generate new file from PPSIM.FAKE.CHIP"));
-            psFree(fpa);
-            return NULL;
-        }
-        if (fakeImage->type != PM_FPA_FILE_IMAGE) {
-            psError(PS_ERR_IO, true, "PPSIM.FAKE.CHIP is not of type IMAGE");
-            psFree(fpa);
-            return NULL;
-        }
-
-        // we need a chip image if we perform photometry (is it necessary to build it if we don't use it?)
-        pmFPAfile *forceImage = NULL;
-        if (input) {
-            forceImage = pmFPAfileDefineChipMosaic(config, input->fpa, "PPSIM.FORCE.CHIP");
-            if (!forceImage) {
-                psError(PS_ERR_IO, false, _("Unable to generate new file from PPSIM.FORCE.CHIP"));
-                psFree(fpa);
-                return NULL;
-            }
-            if (forceImage->type != PM_FPA_FILE_IMAGE) {
-                psError(PS_ERR_IO, true, "PPSIM.FORCE.CHIP is not of type IMAGE");
-                psFree(fpa);
-                return NULL;
-            }
-        }
-
-        // define associated psphot input/output files
-        if (!ppSimPhotomFiles (config, fakeImage, forceImage)) {
-            psError(PSPHOT_ERR_CONFIG, false, "Trouble defining the additional input/output files for psphot");
-            psFree(fpa);
-            return NULL;
-        }
+        // XXX at the moment, we can perform photometry on the fake sources and the forced
+        // photometry positions, but not one or the other.  Also, we only support photometry in
+        // the context of an image previously analysed by psphot.  Add support for:
+        // * photometry of a pure fake image (requires peak detection and psf creation)
+        // * photometry of forced source positions without fake image (this might work, it just
+        // requires not generating any fake features).
+
+        if (!input) {
+            psError(PS_ERR_UNKNOWN, false, "input image not found; currently required for photometry");
+            return NULL;
+        }
+
+        // we need a chip image if we perform photometry (is it necessary to build it if we don't use it?)
+        pmFPAfile *fakeImage = pmFPAfileDefineChipMosaic(config, output->fpa, "PPSIM.FAKE.CHIP");
+        if (!fakeImage) {
+            psError(PS_ERR_IO, false, _("Unable to generate new file from PPSIM.FAKE.CHIP"));
+            psFree(fpa);
+            return NULL;
+        }
+        if (fakeImage->type != PM_FPA_FILE_IMAGE) {
+            psError(PS_ERR_IO, true, "PPSIM.FAKE.CHIP is not of type IMAGE");
+            psFree(fpa);
+            return NULL;
+        }
+
+        // we need a chip image if we perform photometry (is it necessary to build it if we don't use it?)
+        pmFPAfile *forceImage = NULL;
+        if (input) {
+            forceImage = pmFPAfileDefineChipMosaic(config, input->fpa, "PPSIM.FORCE.CHIP");
+            if (!forceImage) {
+                psError(PS_ERR_IO, false, _("Unable to generate new file from PPSIM.FORCE.CHIP"));
+                psFree(fpa);
+                return NULL;
+            }
+            if (forceImage->type != PM_FPA_FILE_IMAGE) {
+                psError(PS_ERR_IO, true, "PPSIM.FORCE.CHIP is not of type IMAGE");
+                psFree(fpa);
+                return NULL;
+            }
+        }
+
+        // define associated psphot input/output files
+        if (!ppSimPhotomFiles (config, fakeImage, forceImage)) {
+            psError(PSPHOT_ERR_CONFIG, false, "Trouble defining the additional input/output files for psphot");
+            psFree(fpa);
+            return NULL;
+        }
     } else {
-        // have we supplied a psf model?  this happens in ppSimPhotomFiles if we request a photometry
-        // analysis.  however, even if we do not, a psf model may be used to generate the fake
-        // sources.
-        if (psMetadataLookupPtr(NULL, config->arguments, "PSPHOT.PSF")) {
-            // tie the psf file to the chipMosaic 
-            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);
-                return NULL;
-            }
-        }
+        // have we supplied a psf model?  this happens in ppSimPhotomFiles if we request a photometry
+        // analysis.  however, even if we do not, a psf model may be used to generate the fake
+        // sources.
+        if (psMetadataLookupPtr(NULL, config->arguments, "PSPHOT.PSF")) {
+            // tie the psf file to the chipMosaic
+            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);
+                return NULL;
+            }
+        }
     }
 
@@ -169 +169 @@
     pmFPAfile *simSources = pmFPAfileDefineOutput (config, output->fpa, "PPSIM.SOURCES");
     if (!simSources) {
-        psError(PS_ERR_UNKNOWN, false, "Cannot find a rule for PPSIM.SOURCES");
-        return false;
+        psError(PS_ERR_UNKNOWN, false, "Cannot find a rule for PPSIM.SOURCES");
+        return false;
     }
     simSources->save = true;
@@ -176 +176 @@
     // 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...
-
-        psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, PPSIM_RECIPE); // Recipe
-
-        ppSimArgToRecipeF32(&status, recipe, "EXPTIME", input->fpa->concepts, "FPA.EXPOSURE");
-        char *filter = ppSimArgToRecipeStr(&status, recipe, "FILTER", input->fpa->concepts, "FPA.FILTER");
-
-        float zp = ppSimGetZeroPoint (recipe, filter);
-        psMetadataAddF32(recipe, PS_LIST_TAIL, "ZEROPOINT", PS_META_REPLACE, "Photometric zeropoint", zp);
+        // 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", input->fpa->concepts, "FPA.EXPOSURE");
+        char *filter = ppSimArgToRecipeStr(&status, recipe, "FILTER", input->fpa->concepts, "FPA.FILTERID");
+
+        float zp = ppSimGetZeroPoint(recipe, filter);
+        if (!isfinite(zp)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to find zero point for filter %s", filter);
+            psFree(fpa);
+            return NULL;
+        }
+        psMetadataAddF32(recipe, PS_LIST_TAIL, "ZEROPOINT", PS_META_REPLACE, "Photometric zeropoint", zp);
     }
 
@@ -193 +198 @@
 
     if (phuLevel == PM_FPA_LEVEL_FPA) {
-        if (!pmFPAAddSourceFromView(fpa, "Simulation", view, output->format)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
-            psFree(fpa);
-            psFree(view);
-            return NULL;
-        }
+        if (!pmFPAAddSourceFromView(fpa, "Simulation", view, output->format)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
+            psFree(fpa);
+            psFree(view);
+            return NULL;
+        }
     }
 
     pmChip *chip;                       // Chip from FPA
     while ((chip = pmFPAviewNextChip(view, fpa, 1))) {
-        if (phuLevel == PM_FPA_LEVEL_CHIP) {
-            if (!pmFPAAddSourceFromView(fpa, "Simulation", view, output->format)) {
-                psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
-                psFree(fpa);
-                psFree(view);
-                return NULL;
-            }
-        }
-
-        pmCell *cell;                   // Cell from chip
-        while ((cell = pmFPAviewNextCell(view, fpa, 1))) {
-            if (phuLevel == PM_FPA_LEVEL_CELL) {
-                if (!pmFPAAddSourceFromView(fpa, "Simulation", view, output->format)) {
-                    psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
-                    psFree(fpa);
-                    psFree(view);
-                    return NULL;
-                }
-            }
-        }
+        if (phuLevel == PM_FPA_LEVEL_CHIP) {
+            if (!pmFPAAddSourceFromView(fpa, "Simulation", view, output->format)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
+                psFree(fpa);
+                psFree(view);
+                return NULL;
+            }
+        }
+
+        pmCell *cell;                   // Cell from chip
+        while ((cell = pmFPAviewNextCell(view, fpa, 1))) {
+            if (phuLevel == PM_FPA_LEVEL_CELL) {
+                if (!pmFPAAddSourceFromView(fpa, "Simulation", view, output->format)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
+                    psFree(fpa);
+                    psFree(view);
+                    return NULL;
+                }
+            }
+        }
     }
 

branches/cnb_branches/cnb_branch_20090301/ppSim/src/ppSimSequenceObject.c

@@ -95 +95 @@
                             psStringAppend (&command, " -dec %f", dec);
                             psStringAppend (&command, " -pa %f", pos);
+                            psStringAppend (&command, " -obs_mode OBJECT.%s", (char *) filters->data[i]);
 
                             double frnd = psRandomUniform(rng);

branches/cnb_branches/cnb_branch_20090301/ppSim/src/ppSimUtils.c

@@ -112 +112 @@
 ppSimType ppSimTypeFromString (char *typeStr) {
 
-    if (!strcasecmp (typeStr, "BIAS"))   return PPSIM_TYPE_BIAS;
-    if (!strcasecmp (typeStr, "DARK"))   return PPSIM_TYPE_DARK;
-    if (!strcasecmp (typeStr, "FLAT"))   return PPSIM_TYPE_FLAT;
+    if (!strcasecmp (typeStr, "BIAS"))   return PPSIM_TYPE_BIAS;
+    if (!strcasecmp (typeStr, "DARK"))   return PPSIM_TYPE_DARK;
+    if (!strcasecmp (typeStr, "FLAT"))   return PPSIM_TYPE_FLAT;
     if (!strcasecmp (typeStr, "OBJECT")) return PPSIM_TYPE_OBJECT;
     psAbort("Should never get here.");
@@ -133 +133 @@
 
     char *typeStr = psMetadataLookupStr(NULL, recipe, "IMAGE.TYPE"); // Type of image to simulate
+    char *obs_mode = psMetadataLookupStr(NULL, recipe, "OBS_MODE");
 
     psMetadataAddStr(fpa->concepts, PS_LIST_TAIL, "FPA.OBSTYPE", PS_META_REPLACE, "Observation type", typeStr);
     psMetadataAddStr(fpa->concepts, PS_LIST_TAIL, "FPA.OBJECT", PS_META_REPLACE, "Observation name", typeStr);
+    psMetadataAddStr(fpa->concepts, PS_LIST_TAIL, "FPA.OBS.MODE", PS_META_REPLACE, "Observation mode", obs_mode);
     psMetadataAddF32(fpa->concepts, PS_LIST_TAIL, "FPA.EXPOSURE", PS_META_REPLACE, "Exposure time (sec)", expTime);
     psMetadataAddStr(fpa->concepts, PS_LIST_TAIL, "FPA.FILTERID", PS_META_REPLACE, "Filter name", filter);
@@ -174 +176 @@
     if (binning <= 0) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Binning (%d) is non-positive.", binning);
-        exit(PS_EXIT_CONFIG_ERROR);
+        exit(PS_EXIT_CONFIG_ERROR);
     }
     return true;
@@ -181 +183 @@
 // Get a value from the command-line arguments and add it to recipe options
 float ppSimArgToRecipeF32(bool *status,
-                          psMetadata *options,    // Target to which to add value
-                          const char *recipeName, // Name for value in the recipe
-                          psMetadata *arguments,  // Command-line arguments
-                          const char *argName       // Argument name in the command-line arguments
+                          psMetadata *options,    // Target to which to add value
+                          const char *recipeName, // Name for value in the recipe
+                          psMetadata *arguments,  // Command-line arguments
+                          const char *argName       // Argument name in the command-line arguments
     )
 {
@@ -198 +200 @@
 // Get a value from the command-line arguments and add it to recipe options
 int ppSimArgToRecipeS32(bool *status,
-                        psMetadata *options,    // Target to which to add value
-                        const char *recipeName, // Name for value in the recipe
-                        psMetadata *arguments,  // Command-line arguments
-                        const char *argName         // Argument name in the command-line arguments
+                        psMetadata *options,    // Target to which to add value
+                        const char *recipeName, // Name for value in the recipe
+                        psMetadata *arguments,  // Command-line arguments
+                        const char *argName         // Argument name in the command-line arguments
     )
 {
@@ -214 +216 @@
 // Get a value from the command-line arguments and add it to recipe options
 bool ppSimArgToRecipeBool(bool *status,
-                          psMetadata *options,    // Target to which to add value
-                          const char *recipeName, // Name for value in the recipe
-                          psMetadata *arguments,  // Command-line arguments
-                          const char *argName       // Argument name in the command-line arguments
+                          psMetadata *options,    // Target to which to add value
+                          const char *recipeName, // Name for value in the recipe
+                          psMetadata *arguments,  // Command-line arguments
+                          const char *argName       // Argument name in the command-line arguments
     )
 {
@@ -231 +233 @@
 // if it is not specified, do not override the existing recipe value
 char *ppSimArgToRecipeStr(bool *status,
-                          psMetadata *options,    // Target to which to add value
-                          const char *recipeName, // Name for value in the recipe
-                          psMetadata *arguments,  // Command-line arguments
-                          const char *argName       // Argument name in the command-line arguments
+                          psMetadata *options,    // Target to which to add value
+                          const char *recipeName, // Name for value in the recipe
+                          psMetadata *arguments,  // Command-line arguments
+                          const char *argName       // Argument name in the command-line arguments
     )
 {
@@ -241 +243 @@
     char *value = psMetadataLookupStr(&myStatus, arguments, argName); // Value of interest
     if (status) {
-        *status = myStatus;
+        *status = myStatus;
     }
     if (!value) return NULL;
@@ -248 +250 @@
 }
 
-float ppSimGetZeroPoint (psMetadata *recipe, char *filter) {
-
-    bool mdok;
-    float zp;
+float ppSimGetZeroPoint(psMetadata *recipe, const char *filter)
+{
+    PS_ASSERT_METADATA_NON_NULL(recipe, NAN);
+    PS_ASSERT_STRING_NON_EMPTY(filter, NAN);
 
     // use the filter to get the zeropoint from the recipe
-    psMetadataItem *zpItem = psMetadataLookup (recipe, "ZEROPTS");
-    // check that item is multi...
-            
-    psArray *entries = psListToArray (zpItem->data.list);
-          
-    // search for matching filter
-    for (int i = 0; i < entries->n; i++) {
-        psMetadataItem *item = entries->data[i];
-        psMetadata *entry = item->data.V;
-
-        char *filterName = psMetadataLookupStr (&mdok, entry, "FILTER");
-        assert (filterName);
-
-        if (strcmp(filterName, filter)) continue;
-
-        zp = psMetadataLookupF32 (&mdok, entry, "ZERO_PT");
-        assert (mdok);
-        psFree (entries);
-        return zp;
-    }
-    psFree (entries);
-    return NAN;
+    psMetadata *zeropoints = psMetadataLookupMetadata(NULL, recipe, "ZEROPTS");
+    if (!zeropoints) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to find ZEROPTS in recipe");
+        return NAN;
+    }
+
+    return psMetadataLookupF32(NULL, zeropoints, filter);
 }
 
@@ -295 +282 @@
 
     for (int i = 0; i < sources->n; i++) {
-        pmSource *source = sources->data[i];
+        pmSource *source = sources->data[i];
 
         // allocate image, weight, mask arrays for each peak (square of radius OUTER)

branches/cnb_branches/cnb_branch_20090301/ppSim/src/ppSimVersion.c

@@ -1 +1 @@
 #include "ppSim.h"
+#include "ppSimVersionDefinitions.h"
 
 #ifndef PPSIM_VERSION
@@ -11 +12 @@
 #endif
 
-#define xstr(s) str(s)
-#define str(s) #s
-
 psString ppSimVersion(void)
 {
     char *value = NULL;
-    psStringAppend(&value, "%s@%s", xstr(PPSIM_BRANCH), xstr(PPSIM_VERSION));
+    psStringAppend(&value, "%s@%s", PPSIM_BRANCH, PPSIM_VERSION);
     return value;
 }
@@ -23 +21 @@
 psString ppSimSource(void)
 {
-    return psStringCopy(xstr(PPSIM_SOURCE));
+    return psStringCopy(PPSIM_SOURCE);
 }
 

@@ -8 +8 @@
 .libs
 ppSimSequence
+ppSimVersionDefinitions.h