Changeset 12592 for trunk/psphot/src/psphotMagnitudes.c

Timestamp:

Mar 26, 2007, 5:36:18 PM (19 years ago)

Author:

eugene

Message:

using common psImageBinning tools

File:

• trunk/psphot/src/psphotMagnitudes.c (modified) (2 diffs)

trunk/psphot/src/psphotMagnitudes.c

@@ -18 +18 @@
     // Get enough information to return sky level
     assert(background != NULL);
-    assert(background->analysis != NULL);
-    int DX = psMetadataLookupS32(&status, background->analysis, "PSPHOT.BACKGROUND.XBIN");
-    assert (status == true);
-    int DY = psMetadataLookupS32(&status, background->analysis, "PSPHOT.BACKGROUND.YBIN");
-    assert (status == true);
-    int dx = psMetadataLookupS32(&status, background->analysis, "PSPHOT.BACKGROUND.XOFF");
-    assert (status == true);
-    int dy = psMetadataLookupS32(&status, background->analysis, "PSPHOT.BACKGROUND.YOFF");
+
+    // the binning details are saved on the analysis metadata 
+    psImageBinning *binning = psMetadataLookupPtr(&status, recipe, "PSPHOT.BACKGROUND.BINNING");
     assert (status == true);
 
@@ -40 +35 @@
         if (status) Nap ++;
 
-        source->sky = psImageUnbinPixel(source->peak->x, source->peak->y, background->image, DX, DY, dx, dy);
+        source->sky = psImageUnbinPixel(source->peak->x, source->peak->y, background->image, binning);
         if (isnan(source->sky) && false) {
           psError(PSPHOT_ERR_SKY, false, "Setting pmSource.sky");