Changeset 6866 for trunk/psphot/src

Timestamp:

Apr 17, 2006, 7:24:11 AM (20 years ago)

Author:

eugene

Message:

adjustments for improved speed

Location:

trunk/psphot/src

Files:

• psphotApResid.c (modified) (3 diffs)
• psphotMagnitudes.c (modified) (1 diff)

trunk/psphot/src/psphotApResid.c

@@ -14 +14 @@
     // S/N limit to perform full non-linear fits
     float FIT_SN_LIM = psMetadataLookupF32 (&status, recipe, "FULL_FIT_SN_LIM");
+
+    // set limits on the aperture magnitudes 
+    pmSourceMagnitudesInit (recipe);
 
     // measure the aperture loss as a function of radius for PSF
@@ -40 +43 @@
         if (source->mode &  PM_SOURCE_MODE_POOR) continue;
 
+        model = source->modelPSF;
+        if (model == NULL) continue;
+
         // XXX tune independently?
         if (source->moments->SN < 2*FIT_SN_LIM) continue;
 
         // get growth-corrected, apTrend-uncorrected magnitudes in scaled apertures
-        model = pmSourceMagnitudes (source, psf, true, false);
-        if (model == NULL) continue;
+        if (!pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH)) continue;
 
         apResid->data.F64[Npsf] = source->apMag - source->psfMag;
@@ -225 +230 @@
     psf->ApTrend->coeff[0][0][1][0] = 0;
     psf->ApTrend->coeff[0][0][0][1] = 0;
-    psf->nApResid = residStats->clippedNvalues;
+    psf->nApResid = Npsf;
 
     // save results for later output

trunk/psphot/src/psphotMagnitudes.c

@@ -3 +3 @@
 bool psphotMagnitudes (psArray *sources, psMetadata *recipe, pmPSF *psf) {
 
+    bool status = false;
+    int Nap = 0;
+
     psTimerStart ("psphot");
+
+    pmSourceMagnitudesInit (recipe);
 
     for (int i = 0; i < sources->n; i++) {
         pmSource *source = (pmSource *) sources->data[i];
-        pmSourceMagnitudes (source, psf, true, true);
+        status = pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_APCORR | PM_SOURCE_PHOT_WEIGHT);
+        // status = pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_APCORR);
+        if (status) Nap ++;
     }   
 
-    psLogMsg ("psphot.magnitudes", 4, "measure magnitudes : %f sec for %d objects\n", psTimerMark ("psphot"), sources->n);
+    psLogMsg ("psphot.magnitudes", 4, "measure magnitudes : %f sec for %d objects (%d with apertures)\n", psTimerMark ("psphot"), sources->n, Nap);
     return true;
 }