Changeset 30118 for branches/czw_branch/20101203/psphot/src/psphotOutput.c

Timestamp:

Dec 20, 2010, 2:30:45 PM (16 years ago)

Author:

watersc1

Message:

Attempting to bring branch in sync with trunk

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src/psphotOutput.c (modified) (4 diffs)

branches/czw_branch/20101203/psphot/src/psphotOutput.c

@@ -1 +1 @@
 # include "psphotInternal.h"
+
+// convert filerule to filerule.NUM and look up in the config->arguments metadata
+int psphotFileruleCount(const pmConfig *config, const char *filerule) {
+
+    bool status = false;
+
+    psString name = NULL;
+    psStringAppend(&name, "%s.NUM", filerule);
+    int num = psMetadataLookupS32 (&status, config->arguments, name);
+    if (!status) {
+      // we only explicitly define (filerule.NUM) if we have more than 1
+      num = 1;
+    }
+    psFree (name);
+    return num;
+}
 
 pmReadout *psphotSelectBackground (pmConfig *config,
@@ -63 +79 @@
     fclose (f);
     return true;
-}
-
-// XXX replace this with a call to a pmConfig function (pmConfigDump...)
-bool psphotDumpConfig (pmConfig *config) {
-
-  psMetadataConfigWrite (config->user, "user.md");
-  psMetadataConfigWrite (config->camera, "camera.md");
-  psMetadataConfigWrite (config->recipes, "recipes.md");
-  psMetadataConfigWrite (config->arguments, "arguments.md");
-  psMetadataConfigWrite (config->files, "files.md");
-  return true;
 }
 
@@ -126 +131 @@
 }
 
+bool psphotCleanInputsReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index);
+bool psphotCleanInputs (pmConfig *config, const pmFPAview *view, const char *filerule) {
+
+    int num = psphotFileruleCount(config, filerule);
+
+    // loop over the available readouts
+    for (int i = 0; i < num; i++) {
+        if (!psphotCleanInputsReadout (config, view, filerule, i)) {
+          psError (PSPHOT_ERR_CONFIG, false, "failed to clean inputs for %s entry %d", filerule, i);
+            return false;
+        }
+    }
+    return true;
+}
+
+bool psphotCleanInputsReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index) {
+
+    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, index); // File of interest
+    PS_ASSERT (file, false);
+
+    pmReadout  *readout = pmFPAviewThisReadout (view, file->fpa);
+
+    // XXX anything else to remove?
+    if (psMetadataLookup(readout->analysis, "PSPHOT.DETECTIONS")) {
+        psMetadataRemoveKey(readout->analysis, "PSPHOT.DETECTIONS");
+    }
+
+    return true;
+}
+
 bool psphotAddPhotcode (pmConfig *config, const pmFPAview *view, const char *filerule) {
 
-    bool status = false;
-
-    int num = psMetadataLookupS32 (&status, config->arguments, "PSPHOT.INPUT.NUM");
-    psAssert (status, "programming error: must define PSPHOT.INPUT.NUM");
+    int num = psphotFileruleCount(config, filerule);
 
     // loop over the available readouts
     for (int i = 0; i < num; i++) {
         if (!psphotAddPhotcodeReadout (config, view, filerule, i)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed to add photcode to PSPHOT.INPUT entry %d", i);
+          psError (PSPHOT_ERR_CONFIG, false, "failed to add photcode to %s entry %d", filerule, i);
             return false;
         }
@@ -357 +389 @@
     // XXX need alternative output function
     // psMetadata *psfData = pmPSFtoMetadata (NULL, try->psf);
-    // psMetadataConfigWrite (psfData, "psfmodel.dat");
+    // psMetadataConfigWrite (psfData, "psfmodel.dat", NULL);
     psLogMsg ("psphot.choosePSF", PS_LOG_INFO, "wrote out psf-subtracted image, psf data, exiting\n");