Changeset 29489

Timestamp:

Oct 20, 2010, 8:48:51 AM (16 years ago)

Author:

eugene

Message:

add photometry mode PSFONLY to avoid excess calculations before they are needed

Location:

branches/eam_branches/ipp-20100823/psModules/src/objects

Files:

• pmSourcePhotometry.c (modified) (3 diffs)
• pmSourcePhotometry.h (modified) (1 diff)

branches/eam_branches/ipp-20100823/psModules/src/objects/pmSourcePhotometry.c

@@ -76 +76 @@
 
 // XXX masked region should be (optionally) elliptical
+// if mode is PM_SOURCE_PHOT_PSFONLY, we skip all other magnitudes
 bool pmSourceMagnitudes (pmSource *source, pmPSF *psf, pmSourcePhotometryMode mode, psImageMaskType maskVal, psImageMaskType markVal)
 {
@@ -117 +118 @@
     // measure PSF model photometry
     // XXX TEST: do not use flux scale
+    // XXX NOTE: turn this back on?
     if (0 && psf->FluxScale) {
         // the source peak pixel is guaranteed to be on the image, and only minimally different from the source center
@@ -128 +130 @@
         status = pmSourcePhotometryModel (&source->psfMag, &source->psfFlux, source->modelPSF);
         source->psfFluxErr = source->psfFlux * (source->modelPSF->dparams->data.F32[PM_PAR_I0] / source->modelPSF->params->data.F32[PM_PAR_I0]);
+    }
+
+    if (mode == PM_SOURCE_PHOT_PSFONLY) {
+        return true;
     }
 

branches/eam_branches/ipp-20100823/psModules/src/objects/pmSourcePhotometry.h

@@ -35 +35 @@
     PM_SOURCE_PHOT_INTERP    = 0x0008,
     PM_SOURCE_PHOT_DIFFSTATS = 0x0010,
+    PM_SOURCE_PHOT_PSFONLY   = 0x0020,
 } pmSourcePhotometryMode;