Changeset 11382

Timestamp:

Jan 29, 2007, 12:37:04 PM (19 years ago)

Author:

eugene

Message:

added psphotAddPhotcode

Location:

trunk/psphot/src

Files:

• psphot.h (modified) (1 diff)
• psphotOutput.c (modified) (1 diff)
• psphotReadout.c (modified) (1 diff)

trunk/psphot/src/psphot.h

@@ -67 +67 @@
 
 // output functions
+bool            psphotAddPhotcode (psMetadata *recipe, pmConfig *config, pmFPAview *view);
 bool            psphotDumpMoments (psMetadata *recipe, psArray *sources);
 psMetadata     *psphotDefineHeader (psMetadata *recipe);

trunk/psphot/src/psphotOutput.c

@@ -73 +73 @@
     }
     fclose (f);
+    return true;
+}
+
+bool psphotAddPhotcode (psMetadata *recipe, pmConfig *config, pmFPAview *view) {
+
+    bool status;
+
+    pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PSPHOT.INPUT");
+    assert (status);
+
+    // determine PHOTCODE from fpa & view, overwrite in recipe
+    // XXX test this:
+    char *photcode = pmConceptsPhotcodeForView (config, input, view);
+    assert (photcode);
+
+    psMetadataAddStr (recipe, PS_LIST_TAIL, "PHOTCODE", PS_META_REPLACE, "photcode from FPA concepts", photcode);
+    psLogMsg ("psphot", 3, "PHOTCODE is %s", photcode);
+
+    psFree (photcode);
     return true;
 }

trunk/psphot/src/psphotReadout.c

@@ -21 +21 @@
     if (!pmReadoutGenerateMaskWeight (readout, true)) {
         psError (PSPHOT_ERR_CONFIG, false, "trouble creating mask and/or weight");
+        return false;
+    }
+
+    // set the photcode for this image
+    if (!psphotAddPhotcode (recipe, config, view)) {
+        psError (PSPHOT_ERR_CONFIG, false, "trouble defining the photcode");
         return false;
     }