Changeset 10138

Timestamp:

Nov 22, 2006, 4:27:40 AM (20 years ago)

Author:

rhl

Message:

Allowed psphotMagnitudes() access to background sky map

Location:

trunk/psphot/src

Files:

• psphotMagnitudes.c (modified) (3 diffs)
• psphotReadout.c (modified) (1 diff)

trunk/psphot/src/psphotMagnitudes.c

@@ -1 +1 @@
 # include "psphot.h"
 
-bool psphotMagnitudes (psArray *sources, psMetadata *recipe, pmPSF *psf) {
-
+bool psphotMagnitudes(psArray *sources,
+                      psMetadata *recipe,
+                      pmPSF *psf,
+                      const pmConfig *config)
+{
     bool status = false;
     int Nap = 0;
@@ -9 +12 @@
 
     pmSourceMagnitudesInit (recipe);
+
+    // 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);
+        }
+    }
 
     bool IGNORE_GROWTH = psMetadataLookupBool (&status, recipe, "IGNORE_GROWTH");
@@ -21 +46 @@
         status = pmSourceMagnitudes (source, psf, photMode);
         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();
+            }
+        }
     }   
 

trunk/psphot/src/psphotReadout.c

@@ -111 +111 @@
 
     // calculate source magnitudes
-    psphotMagnitudes (sources, recipe, psf);
+    psphotMagnitudes(sources, recipe, psf, config);
 
     // replace background in residual image