Changeset 26643 for branches/eam_branches/psphot.stack.20100120/src/psphotFindDetections.c

Timestamp:

Jan 20, 2010, 12:59:49 PM (16 years ago)

Author:

eugene

Message:

updating code so more functions can handle the multi-input concept

File:

• branches/eam_branches/psphot.stack.20100120/src/psphotFindDetections.c (modified) (6 diffs)

branches/eam_branches/psphot.stack.20100120/src/psphotFindDetections.c

@@ -2 +2 @@
 
 // smooth the image, search for peaks, optionally define footprints based on the peaks
-pmDetections *psphotFindDetections (pmDetections *detections, pmReadout *readout, psMetadata *recipe) {
+bool psphotFindDetections (pmConfig *config, const pmFPAview *view, const char *filename, int index) {
 
     bool status;
@@ -9 +9 @@
     int NMAX = 0;
 
+    // find the currently selected readout
+    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filename, index); // File of interest
+    psAssert (readout, "missing file?");
+
+    pmReadout *readout = pmFPAviewThisReadout(view, file->fpa);
+    psAssert (readout, "missing readout?");
+
+    // select the appropriate recipe information
+    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
+    psAssert (recipe, "missing recipe?");
+
     // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
     psImageMaskType maskVal = psMetadataLookupImageMask(&status, recipe, "MASK.PSPHOT"); // Mask value for bad pixels
-    assert (maskVal);
+    psAssert (maskVal, "missing mask value?");
 
     // Use the new pmFootprints approach?
@@ -71 +82 @@
     psphotVisualShowFootprints (detections);
 
-    return detections;
+    // save detections on the readout->analysis
+    if (!psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_DATA_PTR, "psphot detectinos", detections)) {
+        psError (PSPHOT_ERR_CONFIG, false, "problem saving detections on readout");
+        return NULL;
+    }
+
+    return true;
 }
 
@@ -77 +94 @@
 // otherwise it only contains the new peaks.
 
-# if 0
-// XXX where do we place the N sets of detections?
+// for now, let's store the detections on the readout->analysis for each readout
 bool psphotFindDetections (pmConfig *config, const pmFPAview *view)
 {
@@ -84 +100 @@
 
     int num = psMetadataAddS32 (&status, config->arguments, "PSPHOT.INPUT.NUM");
-    psAbort (!status, "programming error: must define PSPHOT.INPUT.NUM");
+    psAssert (status, "programming error: must define PSPHOT.INPUT.NUM");
 
     // loop over the available readouts
     for (int i = 0; i < num; i++) {
         if (!psphotFindDetectionsReadout (config, view, "PSPHOT.INPUT", i)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed to subtract background for PSPHOT.INPUT entry %d", i);
+            psError (PSPHOT_ERR_CONFIG, false, "failed to find initial detections for PSPHOT.INPUT entry %d", i);
             return false;
         }
@@ -95 +111 @@
     return true;
 }
-# endif