Changeset 5643 for trunk/psphot/src/psphotFixedPSF.c

Timestamp:

Nov 30, 2005, 2:32:16 PM (21 years ago)

Author:

eugene

Message:

adding fixed-psf fitting

File:

• trunk/psphot/src/psphotFixedPSF.c (modified) (4 diffs)

trunk/psphot/src/psphotFixedPSF.c

@@ -3 +3 @@
 // fit psf model to all objects with centroid fixed 
 
-bool psphotFitFixedPSF (eamReadout *imdata, psMetadata *config, psArray *sources, pmPSF *psf, psStats *sky) 
+bool psphotFixedPSF (eamReadout *imdata, psMetadata *config, psArray *sources, pmPSF *psf, psStats *sky) 
 { 
     bool  status;
     float x;
     float y;
+    float Sky;
     int   Nfit = 0;
-    int   Nsub = 0;
-    int   Niter = 0;
 
     psTimerStart ("psphot");
 
     // we may set this differently here from the value used to mark likely saturated stars
-    float SATURATION   = psMetadataLookupF32 (&status, config, "SATURATION");
     float OUTER_RADIUS = psMetadataLookupF32 (&status, config, "SKY_OUTER_RADIUS");
 
-    float PSF_MIN_SN       = psMetadataLookupF32 (&status, config, "PSF_MIN_SN");
-    float PSF_MAX_CHI      = psMetadataLookupF32 (&status, config, "PSF_MAX_CHI");
     float PSF_FIT_NSIGMA   = psMetadataLookupF32 (&status, config, "PSF_FIT_NSIGMA");
     float PSF_FIT_PADDING  = psMetadataLookupF32 (&status, config, "PSF_FIT_PADDING");
-    float PSF_SHAPE_NSIGMA = psMetadataLookupF32 (&status, config, "PSF_SHAPE_NSIGMA");
 
     // set the object surface-brightness limit for fitted pixels
@@ -45 +40 @@
         // set PSF parameters for this model
         pmModel *model = pmModelFromPSF (modelFLT, psf);
+        // model->params->data.F32[2] = source->peak->x;
+        // model->params->data.F32[3] = source->peak->y;
         x = model->params->data.F32[2];
         y = model->params->data.F32[3];
@@ -69 +66 @@
 
         if (!status || (model->params->data.F32[1] < 0)) {
-          psLogMsg ("psphot", 5, "PSF fit failed for %f, %f (%d iterations)\n", x, y, model->nIter);
+          psLogMsg ("psphot", 5, "PSF fit failed for %f, %f (peak %f\n", x, y, model->params->data.F32[1]);
           source->type = PM_SOURCE_FAIL_FIT_PSF;  // better choice?
           psFree (model);
@@ -77 +74 @@
         // model succeeded : tentatively keep it
         source->modelPSF = model;
-        Niter += model[0].nIter;
         Nfit ++;
 
         // subtract object, leave local sky
-        sky = model->params->data.F32[0];
+        Sky = model->params->data.F32[0];
         model->params->data.F32[0] = 0;
         pmSourceSubModel (source->pixels, source->mask, source->modelPSF, false);
-        model->params->data.F32[0] = sky;
+        model->params->data.F32[0] = Sky;
     }
 
-    psLogMsg ("psphot", 3, "fit fixed PSF models: %f sec for %d objects (%d total iterations)\n", psTimerMark ("psphot"), Nfit, Niter);
+    psLogMsg ("psphot", 3, "fit fixed PSF models: %f sec for %d objects\n", psTimerMark ("psphot"), Nfit);
     return (true);
 }