Changeset 13900 for trunk/psphot/src/psphotGuessModels.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/psphotGuessModels.c (modified) (3 diffs)

trunk/psphot/src/psphotGuessModels.c

@@ -17 +17 @@
 
 // construct an initial PSF model for each object
-bool psphotGuessModels (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf) {
+bool psphotGuessModels (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf, psMaskType maskVal) {
 
   psTimerStart ("psphot");
@@ -57 +57 @@
     pmModel *modelPSF = pmModelFromPSF (modelEXT, psf);
     if (modelPSF == NULL) {
-        psError(PSPHOT_ERR_PSF, false,
-                "Failed to determine PSF model at r,c = (%d,%d); trying centre of image",
-                source->peak->y, source->peak->x);
-        //
-        // Try the centre of the image
-        //
-        modelEXT->params->data.F32[PM_PAR_XPOS] = 0.5*readout->image->numCols;
-        modelEXT->params->data.F32[PM_PAR_YPOS] = 0.5*readout->image->numRows;
-        modelPSF = pmModelFromPSF (modelEXT, psf);
-        if (modelPSF == NULL) {
-            psError(PSPHOT_ERR_PSF, false,
-                    "Failed to determine PSF model at centre of image");
-            psFree(modelEXT);
-            return false;
-        }
+        psError(PSPHOT_ERR_PSF, false,
+                "Failed to determine PSF model at r,c = (%d,%d); trying centre of image",
+                source->peak->y, source->peak->x);
+        //
+        // Try the centre of the image
+        //
+        modelEXT->params->data.F32[PM_PAR_XPOS] = 0.5*readout->image->numCols;
+        modelEXT->params->data.F32[PM_PAR_YPOS] = 0.5*readout->image->numRows;
+        modelPSF = pmModelFromPSF (modelEXT, psf);
+        if (modelPSF == NULL) {
+            psError(PSPHOT_ERR_PSF, false,
+                    "Failed to determine PSF model at centre of image");
+            psFree(modelEXT);
+            return false;
+        }
 
-        source->mode |= PM_SOURCE_MODE_BADPSF;
+        source->mode |= PM_SOURCE_MODE_BADPSF;
     }
     psFree (modelEXT);
@@ -85 +85 @@
     source->modelPSF->residuals = psf->residuals;
 
-    pmSourceCacheModel (source);
+    pmSourceCacheModel (source, maskVal);
   }
   psLogMsg ("psphot.models", 4, "built models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot"));