Changeset 29606

Timestamp:

Oct 29, 2010, 10:59:01 AM (16 years ago)

Author:

eugene

Message:

do not completely trust the header/concept value for saturation: minimum allowed set in recipe (40k default)

Location:

trunk/psphot/src

Files:

• psphotDeblendSatstars.c (modified) (1 diff)
• psphotEvalPSF.c (modified) (1 diff)

trunk/psphot/src/psphotDeblendSatstars.c

@@ -53 +53 @@
 
     pmCell *cell = readout->parent;
-    float SATURATION = 0.75*psMetadataLookupF32 (&status, cell->concepts, "CELL.SATURATION");
+
+    float SATURATION = NAN;
+
+    // do not completely trust the values in the header...
+    float CELL_SATURATION = psMetadataLookupF32 (&status, cell->concepts, "CELL.SATURATION");
+    float MIN_SATURATION = psMetadataLookupF32 (&status, recipe, "DEBLEND_MIN_SATURATION");
+    if (!status || !isfinite(MIN_SATURATION)) {
+        MIN_SATURATION = 40000.0;
+    }
+    if (!isfinite(CELL_SATURATION)) {
+        SATURATION = MIN_SATURATION;
+    } else {
+        SATURATION = PS_MAX(MIN_SATURATION, CELL_SATURATION);
+    }
     float SAT_TEST_LEVEL = 0.5*SATURATION;
 

trunk/psphot/src/psphotEvalPSF.c

@@ -19 +19 @@
     // XXX do we need to set this differently from the value used to mark saturated pixels?
     pmCell *cell     = readout->parent;
-    SATURATION       = psMetadataLookupF32 (&status, cell->concepts, "CELL.SATURATION");
+
+    // do not completely trust the values in the header...
+    float CELL_SATURATION = psMetadataLookupF32 (&status, cell->concepts, "CELL.SATURATION");
+    float MIN_SATURATION = psMetadataLookupF32 (&status, recipe, "DEBLEND_MIN_SATURATION");
+    if (!status || !isfinite(MIN_SATURATION)) {
+        MIN_SATURATION = 40000.0;
+    }
+    if (!isfinite(CELL_SATURATION)) {
+        SATURATION = MIN_SATURATION;
+    } else {
+        SATURATION = PS_MAX(MIN_SATURATION, CELL_SATURATION);
+    }
+
     PSF_MIN_SN       = psMetadataLookupF32 (&status, recipe, "PSF_MIN_SN");
     PSF_MAX_CHI      = psMetadataLookupF32 (&status, recipe, "PSF_MAX_CHI");