Changeset 11353

Timestamp:

Jan 27, 2007, 5:03:01 PM (19 years ago)

Author:

eugene

Message:

photcode from concepts

File:

• trunk/psphot/src/psphotParseCamera.c (modified) (3 diffs)

trunk/psphot/src/psphotParseCamera.c

@@ -36 +36 @@
     // XXX drop this?  we put this in the default recipe?
     psMetadataAddStr (recipe, PS_LIST_TAIL, "FITMODE",         PS_META_NO_REPLACE, "default fitting mode", "NONE");
-    psMetadataAddStr (recipe, PS_LIST_TAIL, "PHOTCODE",        PS_META_NO_REPLACE, "default photcode",     "NONE");
     psMetadataAddStr (recipe, PS_LIST_TAIL, "BREAK_POINT",     PS_META_NO_REPLACE, "default break point",  "NONE");
     psMetadataAddF32 (recipe, PS_LIST_TAIL, "ZERO_PT",         PS_META_NO_REPLACE, "default zero point",    25.00);
     psMetadataAddS32 (recipe, PS_LIST_TAIL, "BACKGROUND.XBIN", PS_META_NO_REPLACE, "default binning",          64);
     psMetadataAddS32 (recipe, PS_LIST_TAIL, "BACKGROUND.YBIN", PS_META_NO_REPLACE, "default binning",          64);
+
+    // determine PHOTCODE from fpa & view, overwrite in recipe
+    // XXX test this:
+    psMetadataAddStr (recipe, PS_LIST_TAIL, "PHOTCODE",        PS_META_NO_REPLACE, "default photcode",     "NONE");
+    char *photcode = pmConceptsPhotcodeForView (config, input, view);
+    if (photcode) {
+        psMetadataAddStr (recipe, PS_LIST_TAIL, "PHOTCODE", PS_META_REPLACE, "photcode from FPA concepts", photcode);
+        psFree (photcode);
+    }
 
     // XXX we need to be able to distinguish several cases:
@@ -49 +57 @@
 
     // these calls bind the I/O handle to the specified fpa
-    bool saveOutput = psMetadataLookupBool (&status, recipe, "SAVE.OUTPUT");
-    if (!status || saveOutput) {
+    bool saveOutput = psMetadataLookupBool (NULL, recipe, "SAVE.OUTPUT");
+    if (saveOutput) {
         if (!pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.OUTPUT")) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.OUTPUT");
@@ -109 +117 @@
     }
 
+    // XXX add in example PSF image thumbnails
     // pmFPAfileConstruct (config->files, format, config->camera, "PSPHOT.PSF_SAMPLE");