Changeset 26542 for branches/eam_branches/20091201/psphot/src/psphotSubtractBackground.c

Timestamp:

Jan 7, 2010, 5:07:54 PM (17 years ago)

Author:

eugene

Message:

upgrade psphot functions to work in the stack context (see doc/stack.txt)

File:

• branches/eam_branches/20091201/psphot/src/psphotSubtractBackground.c (modified) (6 diffs)

branches/eam_branches/20091201/psphot/src/psphotSubtractBackground.c

@@ -4 +4 @@
 // generate the median in NxN boxes, clipping heavily
 // linear interpolation to generate full-scale model
-bool psphotSubtractBackground (pmConfig *config, const pmFPAview *view, const char *filename)
+bool psphotSubtractBackgroundReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index)
 {
     bool status = true;
@@ -13 +13 @@
 
     // find the currently selected readout
-    pmFPAfile *file = psMetadataLookupPtr (&status, config->files, filename);
+    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filename, index); // File of interest
+
     pmFPA *inFPA = file->fpa;
     pmReadout *readout = pmFPAviewThisReadout (view, inFPA);
@@ -19 +20 @@
     psImage *mask  = readout->mask;
 
-    // find the currently selected readout
-    pmReadout *model = pmFPAfileThisReadout (config->files, view, "PSPHOT.BACKMDL");
+    // find the currently selected readout (XXX note that the model is saved on PSPHOT.BACKMDL regardless of 'filename'
+    pmFPAfile *modelFile = pmFPAfileSelectSingle(config->files, "PSPHOT.BACKMDL", index); // File of interest
+    assert (modelFile);
+    pmReadout *model = pmFPAviewThisReadout (view, modelFile->fpa);
     assert (model);
 
@@ -35 +38 @@
 
     // select background pixels, from output background file, or create
+    // XXX for now, we will only allow a single background image to be generated
     file = psMetadataLookupPtr (&status, config->files, "PSPHOT.BACKGND");
     if (file) {
@@ -66 +70 @@
 
     // back-sub image pixels, from output background file (don't create if not requested)
+    // XXX for now, we will only allow a single background-subtracted image to be generated
     file = psMetadataLookupPtr (&status, config->files, "PSPHOT.BACKSUB");
     if (file) {
@@ -113 +118 @@
 }
 
-// XXX supply filename or keep PSPHOT.INPUT fixed?
-bool psphotStackSubtractBackground (pmConfig *config, const pmFPAview *view)
+bool psphotSubtractBackground (pmConfig *config, const pmFPAview *view)
 {
-    bool status = true;
+    bool status = false;
 
-    int num = psMetadataAddS32 (&status, config->arguments, "INPUTS.NUM");
-    psAbort (!status, "programming error: must define INPUTS.NUM");
+    int num = psMetadataLookupS32 (&status, config->arguments, "PSPHOT.INPUT.NUM");
+    psAssert (status, "programming error: must define PSPHOT.INPUT.NUM");
 
     // loop over the available readouts
     for (int i = 0; i < num; i++) {
-
-        pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PSPHOT.INPUT", i); // File of interest
-
-        // find the currently selected readout
-        pmReadout  *readout = pmFPAviewThisReadout (view, file->fpa);
-        PS_ASSERT_PTR_NON_NULL (readout, false);
-
-        psImageBinning *binning = psphotBackgroundBinning(readout->image, config); // Image binning parameters
-        pmReadout *model = pmFPAGenerateReadout(config, view, "PSPHOT.BACKMDL", inFPA, binning); // this needs to be a MULTI like PSPHOT.INPUT
-        pmReadout *modelStdev = pmFPAGenerateReadout(config, view, "PSPHOT.BACKMDL.STDEV", inFPA, binning); // this needs to be a MULTI like PSPHOT.INPUT
-
-        // XXX save results on model->analysis or readout->analysis??
-        // XXX need to create a worker function from the function above...
-        if (!backgroundModel(model->image, modelStdev->image, model->analysis, readout, binning, config)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to generate background model");
+        if (!psphotSubtractBackgroundReadout (config, view, "PSPHOT.INPUT", i)) {
+            psError (PSPHOT_ERR_CONFIG, false, "failed to subtract background for PSPHOT.INPUT entry %d", i);
             return false;
         }
-        // display the backsub and backgnd images
-        psphotVisualShowBackground (config, view, readout);
-
-        npass ++;
     }
     return true;