Changeset 10185

Timestamp:

Nov 24, 2006, 11:06:14 AM (20 years ago)

Author:

eugene

Message:

fixed code to measure local background for sources: added new function psphotSelectBackground, new args for psphotMagnitudes

Location:

trunk/psphot/src

Files:

• psphot.c (modified) (1 diff)
• psphot.h (modified) (2 diffs)
• psphotMagnitudes.c (modified) (3 diffs)
• psphotOutput.c (modified) (1 diff)
• psphotReadout.c (modified) (2 diffs)

trunk/psphot/src/psphot.c

@@ -28 +28 @@
     }
 
+    // XXX for test checking of the config system
+    // psphotDumpConfig (config);
+
     // call psphot for each readout
     if (!psphotImageLoop (config)) {

trunk/psphot/src/psphot.h

@@ -44 +44 @@
 bool            psphotReplaceUnfit (psArray *sources);
 bool            psphotApResid (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf);
-bool            psphotMagnitudes (psArray *sources, psMetadata *recipe, pmPSF *psf, const pmConfig *config);
+bool            psphotMagnitudes (psArray *sources, psMetadata *recipe, pmPSF *psf, pmReadout *background);
 bool            psphotSkyReplace (pmConfig *config, pmFPAview *view);
 bool            psphotReadoutCleanup (pmConfig *config, pmReadout *readout, psMetadata *recipe, pmPSF *psf, psArray *sources);
@@ -69 +69 @@
 bool            psphotWeightBias (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf);
 int             psphotSaveImage (psMetadata *header, psImage *image, char *filename);
+bool psphotDumpConfig (pmConfig *config);
+pmReadout *psphotSelectBackground (pmConfig *config, pmFPAview *view);
 
 // PSF / DBL / EXT evaluation functions

trunk/psphot/src/psphotMagnitudes.c

@@ -4 +4 @@
                       psMetadata *recipe,
                       pmPSF *psf,
-                      const pmConfig *config)
+                      pmReadout *background)
 {
     bool status = false;
@@ -13 +13 @@
     pmSourceMagnitudesInit (recipe);
 
+    // XXX require (assert) that we have a background model, or 
+    // allow it to be missing, setting local sky to 0.0?
+
     // Get enough information to return sky level
-    assert (config != NULL);
-    const psImage *background = NULL;
-    int DX = 0, DY = 0, dx = 0, dy = 0; // unpacked with PSPHOT.BACKMDL
-    {
-        const pmFPAfile *backgroundFile = psMetadataLookupPtr(&status, config->files, "PSPHOT.BACKMDL");
-        if (backgroundFile != NULL) {
-            assert (backgroundFile->readout != NULL);
-            background = backgroundFile->readout->image;
-
-            assert(backgroundFile->readout->analysis != NULL);
-            DX = psMetadataLookupS32(&status, backgroundFile->readout->analysis, "XBIN");
-            assert (status == true);
-            DY = psMetadataLookupS32(&status, backgroundFile->readout->analysis, "YBIN");
-            assert (status == true);
-            dx = psMetadataLookupS32(&status, backgroundFile->readout->analysis, "x0");
-            assert (status == true);
-            dy = psMetadataLookupS32(&status, backgroundFile->readout->analysis, "y0");
-            assert (status == true);
-        }
-    }
+    assert(background != NULL);
+    assert(background->analysis != NULL);
+    int DX = psMetadataLookupS32(&status, background->analysis, "XBIN");
+    assert (status == true);
+    int DY = psMetadataLookupS32(&status, background->analysis, "YBIN");
+    assert (status == true);
+    int dx = psMetadataLookupS32(&status, background->analysis, "x0");
+    assert (status == true);
+    int dy = psMetadataLookupS32(&status, background->analysis, "y0");
+    assert (status == true);
 
     bool IGNORE_GROWTH = psMetadataLookupBool (&status, recipe, "IGNORE_GROWTH");
@@ -47 +40 @@
         if (status) Nap ++;
 
-        source->sky = 0;
-#if 0
-        source->sky += source->moments->Sky;
-#endif
-
-        if (background != NULL) {
-            source->sky += psImageUnbinPixel(source->peak->x, source->peak->y, background, DX, DY, dx, dy);
-            if (isnan(source->sky) && false) {
-                psError(PSPHOT_ERR_SKY, false, "Setting pmSource.sky");
-                psErrorStackPrint(NULL, " ");
-                psErrorClear();
-            }
+        source->sky = psImageUnbinPixel(source->peak->x, source->peak->y, background->image, DX, DY, dx, dy);
+        if (isnan(source->sky) && false) {
+          psError(PSPHOT_ERR_SKY, false, "Setting pmSource.sky");
+          psErrorStackPrint(NULL, " ");
+          psErrorClear();
         }
     }   

trunk/psphot/src/psphotOutput.c

@@ -1 +1 @@
 # include "psphot.h"
+
+pmReadout *psphotSelectBackground (pmConfig *config, pmFPAview *view) {
+
+    bool status;
+    pmReadout *background;    
+
+    pmFPAfile *file = psMetadataLookupPtr (&status, config->files, "PSPHOT.BACKMDL");
+    if (!file) return NULL;
+    if (file->mode == PM_FPA_MODE_INTERNAL) {
+        background = file->readout;
+    } else {
+        background = pmFPAviewThisReadout (view, file->fpa);
+    }
+    return background;
+}
+
+bool psphotDumpConfig (pmConfig *config) {
+
+  psMetadataConfigWrite (config->site, "site.md");
+  psMetadataConfigWrite (config->camera, "camera.md");
+  psMetadataConfigWrite (config->recipes, "recipes.md");
+  psMetadataConfigWrite (config->arguments, "arguments.md");
+  psMetadataConfigWrite (config->files, "files.md");
+  return true;
+}
 
 int psphotSaveImage (psMetadata *header, psImage *image, char *filename) {

trunk/psphot/src/psphotReadout.c

@@ -32 +32 @@
     // generate a background model (median, smoothed image)
     psphotImageMedian (config, view);
+
+    pmReadout *background = psphotSelectBackground (config, view);
 
     // find the peaks in the image
@@ -111 +113 @@
 
     // calculate source magnitudes
-    psphotMagnitudes(sources, recipe, psf, config);
+    psphotMagnitudes(sources, recipe, psf, background);
 
     // replace background in residual image