Changeset 9807

Timestamp:

Oct 31, 2006, 9:37:39 AM (20 years ago)

Author:

eugene

Message:

added ignore option to psphotGrowthCurve

Location:

trunk/psphot/src

Files:

• psphot.h (modified) (1 diff)
• psphotApResid.c (modified) (3 diffs)
• psphotGrowthCurve.c (modified) (3 diffs)

trunk/psphot/src/psphot.h

@@ -51 +51 @@
 int             psphotSortBySN (const void **a, const void **b);
 int             psphotSortByY (const void **a, const void **b);
-bool            psphotGrowthCurve (pmReadout *readout, pmPSF *psf);
+bool            psphotGrowthCurve (pmReadout *readout, pmPSF *psf, bool ignore);
 void            psphotTestArguments (int *argc, char **argv);
 bool            psphotMaskReadout (pmReadout *readout, psMetadata *recipe);

trunk/psphot/src/psphotApResid.c

@@ -25 +25 @@
     // S/N limit to perform full non-linear fits
     float MAX_AP_OFFSET = psMetadataLookupF32 (&status, recipe, "MAX_AP_OFFSET");
+    bool  IGNORE_GROWTH = psMetadataLookupBool (&status, recipe, "IGNORE_GROWTH");
 
     // set limits on the aperture magnitudes
@@ -32 +33 @@
     float REF_RADIUS = psMetadataLookupF32 (&status, recipe, "PSF_REF_RADIUS");
     psf->growth = pmGrowthCurveAlloc (3.0, 100.0, REF_RADIUS);
-    psphotGrowthCurve (readout, psf);
+
+    psphotGrowthCurve (readout, psf, IGNORE_GROWTH);
 
     psVector *mask    = psVectorAllocEmpty (300, PS_TYPE_U8);
@@ -67 +69 @@
 
         flux->data.F64[Npsf]    = pow(10.0, -0.4*source->psfMag);
-        r2rflux->data.F64[Npsf] = PS_SQR(model->radiusTMP) / flux->data.F64[Npsf];
+        r2rflux->data.F64[Npsf] = PS_SQR(model->radiusFit) / flux->data.F64[Npsf];
 
         mask->data.U8[Npsf] = 0;

trunk/psphot/src/psphotGrowthCurve.c

@@ -5 +5 @@
 //     the 'center' option
 
-bool psphotGrowthCurve (pmReadout *readout, pmPSF *psf) {
+// XXX add a option to turn off the curve-of-growth (ie, make the apMag = fitMag everywhere);
+
+bool psphotGrowthCurve (pmReadout *readout, pmPSF *psf, bool ignore) {
 
     // bool status;
@@ -31 +33 @@
     pmModel *model = pmModelFromPSF (modelRef, psf);
 
+    // measure the fitMag for this model
+    pmSourcePhotometryModel (&fitMag, model);
+    psf->growth->fitMag = fitMag;
+
     // generate working image for this source
     psRegion region = {xc - dx, xc + dx, yc - dy, yc + dy};
@@ -46 +52 @@
 
         psImageKeepCircle (mask, xc, yc, radius, "OR", PM_MASK_MARK);
+        pmModelAdd (image, mask, model, false, false);
+        pmSourcePhotometryAper (&apMag, model, image, mask);
+        psImageKeepCircle (mask, xc, yc, radius, "AND", PS_NOT_U8(PM_MASK_MARK));
 
-        pmModelAdd (image, mask, model, false, false);
-
-        pmSourcePhotometryAper (&apMag, model, image, mask);
-
-        psImageKeepCircle (mask, xc, yc, radius, "AND", PS_NOT_U8(PM_MASK_MARK));
-        psf->growth->apMag->data.F32[i] = apMag;
+        // the 'ignore' mode is for testing
+        if (ignore) {
+            psf->growth->apMag->data.F32[i] = fitMag;
+        } else {
+            psf->growth->apMag->data.F32[i] = apMag;
+        }
     }
-
-    pmSourcePhotometryModel (&fitMag, model);
-    psf->growth->fitMag = fitMag;
 
     psf->growth->apRef = psVectorInterpolate (psf->growth->radius, psf->growth->apMag, psf->growth->refRadius);