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

trunk/psphot/src/psphotModelTest.c

@@ -3 +3 @@
 
 // XXX consider this function : add more test information?
-bool psphotModelTest (pmReadout *readout, psMetadata *recipe) {
+bool psphotModelTest (pmReadout *readout, psMetadata *recipe, psMaskType maskVal, psMaskType mark) {
 
     bool status;
@@ -94 +94 @@
 
     // find the local sky
-    status = pmSourceLocalSky (source, PS_STAT_SAMPLE_MEDIAN, INNER);
+    status = pmSourceLocalSky (source, PS_STAT_SAMPLE_MEDIAN, INNER, maskVal, mark);
     if (!status) psAbort("pmSourceLocalSky error");
 
@@ -159 +159 @@
 
     // define the pixels used for the fit
-    psImageKeepCircle (source->maskObj, xObj, yObj, RADIUS, "OR", PM_MASK_MARK);
+    psImageKeepCircle (source->maskObj, xObj, yObj, RADIUS, "OR", mark);
 
     char *fitset = psMetadataLookupStr (&status, recipe, "TEST_FIT_SET");
     if (status) {
-        status = psphotFitSet (source, model, fitset, fitMode);
+        status = psphotFitSet (source, model, fitset, fitMode, maskVal);
         exit (0);
     }
 
-    status = pmSourceFitModel (source, model, fitMode);
+    status = pmSourceFitModel (source, model, fitMode, maskVal);
 
     // measure the source mags
     pmSourcePhotometryModel (&fitMag, model);
-    pmSourcePhotometryAper  (&obsMag, model, source->pixels, source->maskObj);
+    pmSourcePhotometryAper  (&obsMag, model, source->pixels, source->maskObj, maskVal);
     fprintf (stderr, "ap: %f, fit: %f, apmifit: %f\n", obsMag, fitMag, obsMag - fitMag);
 
@@ -178 +178 @@
 
     // subtract object, leave local sky
-    pmModelSub (source->pixels, source->maskObj, model, PM_MODEL_OP_FULL);
+    pmModelSub (source->pixels, source->maskObj, model, PM_MODEL_OP_FULL, maskVal);
 
     fprintf (stderr, "output parameters: \n");