Changeset 24099

Timestamp:

May 6, 2009, 5:28:08 PM (17 years ago)

Author:

bills

Message:

set OBS_MODE keyword for simulated images.

Location:

trunk

Files:

• ippconfig/recipes/ppSim.config (modified) (1 diff)
• ippconfig/simtest/format.config (modified) (1 diff)
• ppSim/src/ppSimArguments.c (modified) (2 diffs)
• ppSim/src/ppSimSequenceObject.c (modified) (1 diff)
• ppSim/src/ppSimUtils.c (modified) (1 diff)

trunk/ippconfig/recipes/ppSim.config

@@ -5 +5 @@
 
 IMAGE.TYPE      STR     BIAS            # default image type
+
+OBS_MODE        STR     NONE
 
 BIAS            BOOL    TRUE

trunk/ippconfig/simtest/format.config

@@ -40 +40 @@
         FPA.DEC         STR     DEC
         FPA.OBJECT      STR     OBJECT
+        FPA.OBS.MODE    STR     OBS_MODE
         FPA.TIME        STR     DATE-OBS UTC-OBS        # Date and time
         FPA.EXPOSURE    STR     EXPTIME

trunk/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

trunk/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);

trunk/ppSim/src/ppSimUtils.c

@@ -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);