Changeset 13900 for trunk/psphot/src/psphotRoughClass.c

Timestamp:

Jun 19, 2007, 4:40:44 PM (19 years ago)

Author:

Paul Price

Message:

Extensive changes to APIs to allow use of a nominated value to mask
against (the maskVal). Previously, the mask values were either
hard-coded (e.g., PM_MASK_SAT) or taken as anything non-zero. The
code is tested with psModules (which has similar changes) and does not
crash, but neither is it successful in marking all bad pixels. For
this reason, I have left the "gutter" pixels (cell gaps) set to 0
instead of NAN in pmFPAMosaic.

File:

• trunk/psphot/src/psphotRoughClass.c (modified) (4 diffs)

trunk/psphot/src/psphotRoughClass.c

@@ -2 +2 @@
 
 // 2006.02.02 : no leaks
-bool psphotRoughClass (psArray *sources, psMetadata *recipe, const bool findPsfClump) {
+bool psphotRoughClass (psArray *sources, psMetadata *recipe, const bool findPsfClump, psMaskType maskSat) {
 
     static pmPSFClump   psfClump;
@@ -10 +10 @@
 
     if (findPsfClump) {
-        psfClump = pmSourcePSFClump (sources, recipe);
+        psfClump = pmSourcePSFClump (sources, recipe);
     } else if (!havePsfClump) {
-        psError(PSPHOT_ERR_PROG, false, "You must find the PSF clump before reusing it");
+        psError(PSPHOT_ERR_PROG, false, "You must find the PSF clump before reusing it");
     } else {
-        ;
+        ;
     }
-    
-    havePsfClump = false;               // we don't know if it's valid
+
+    havePsfClump = false;               // we don't know if it's valid
     if (psfClump.X < 0) {
-        psError(PSPHOT_ERR_PROG, false, "programming error calling pmSourcePSFClump");
-        return false;
+        psError(PSPHOT_ERR_PROG, false, "programming error calling pmSourcePSFClump");
+        return false;
     }
     if (!psfClump.X || !psfClump.Y) {
-        psError(PSPHOT_ERR_DATA, true, "Failed to find a valid PSF clump");
-        return false;
+        psError(PSPHOT_ERR_DATA, true, "Failed to find a valid PSF clump");
+        return false;
     }
     psLogMsg ("psphot", 3, "psf clump  X,  Y: %f, %f\n", psfClump.X, psfClump.Y);
@@ -30 +30 @@
 
     // group into STAR, COSMIC, EXTENDED, SATURATED, etc.
-    if (!pmSourceRoughClass (sources, recipe, psfClump)) {
-        psError(PSPHOT_ERR_PROG, false, "programming error calling pmSourceRoughClass");
-        return false;
+    if (!pmSourceRoughClass (sources, recipe, psfClump, maskSat)) {
+        psError(PSPHOT_ERR_PROG, false, "programming error calling pmSourceRoughClass");
+        return false;
     }
 
@@ -40 +40 @@
     psLogMsg ("psphot.roughclass", PS_LOG_INFO, "rough classification: %f sec\n", psTimerMark ("psphot"));
 
-    havePsfClump = true;                        // we have set psfClump
-    
+    havePsfClump = true;                        // we have set psfClump
+
     return true;
 }