Changeset 26681 for branches/eam_branches/psphot.stack.20100120/src/psphotSubtractBackground.c

Timestamp:

Jan 25, 2010, 7:52:41 PM (16 years ago)

Author:

eugene

Message:

various API updates to work with multiple INPUT files (not yet finished)

File:

• branches/eam_branches/psphot.stack.20100120/src/psphotSubtractBackground.c (modified) (5 diffs)

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

@@ -4 +4 @@
 // generate the median in NxN boxes, clipping heavily
 // linear interpolation to generate full-scale model
-bool psphotSubtractBackgroundReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index)
+bool psphotSubtractBackgroundReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index, psMetadata *recipe)
 {
     bool status = true;
@@ -25 +25 @@
     pmReadout *model = pmFPAviewThisReadout (view, modelFile->fpa);
     assert (model);
-
-    // select the appropriate recipe information
-    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
-    assert (recipe);
 
     // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
@@ -114 +110 @@
     // the pmReadout selected in this function are all view on entries in config->files
 
+    // display the backsub and backgnd images
+    // move this inthe the subtract background loop
+    psphotVisualShowBackground (config, view, readout);
+
     npass ++;
     return true;
@@ -122 +122 @@
     bool status = false;
 
+    // select the appropriate recipe information
+    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
+    psAssert (recipe, "missing recipe?");
+
     int num = psMetadataLookupS32 (&status, config->arguments, "PSPHOT.INPUT.NUM");
     psAssert (status, "programming error: must define PSPHOT.INPUT.NUM");
@@ -127 +131 @@
     // loop over the available readouts
     for (int i = 0; i < num; i++) {
-        if (!psphotSubtractBackgroundReadout (config, view, "PSPHOT.INPUT", i)) {
+        if (!psphotSubtractBackgroundReadout (config, view, "PSPHOT.INPUT", i, recipe)) {
             psError (PSPHOT_ERR_CONFIG, false, "failed to subtract background for PSPHOT.INPUT entry %d", i);
             return false;