Changeset 15017 for trunk/psphot/src

Timestamp:

Sep 25, 2007, 12:05:51 PM (19 years ago)

Author:

eugene

Message:

no X for kapa; start of code to extend PSF star selection

Location:

trunk/psphot/src

Files:

• psphotCheckStarDistribution.c (added)
• psphotChoosePSF.c (modified) (4 diffs)
• psphotRadialPlot.c (modified) (1 diff)

trunk/psphot/src/psphotChoosePSF.c

@@ -62 +62 @@
 
     pmSourceFitModelInit (15, 0.01, PS_SQR(SKY_SIG), options->poissonErrorsPhotLMM);
+
+    // check that the identified psf stars sufficiently cover the region; if not, extend the
+    // limits somewhat
+    // psphotCheckStarDistribution (sources, options);
 
     psArray *stars = psArrayAllocEmpty (sources->n);
@@ -86 +90 @@
 
     // get the list pointers for the PSF_MODEL entries
-    psList *list = NULL;
-    psMetadataItem *mdi = psMetadataLookup (recipe, "PSF_MODEL");
-    if (mdi == NULL) psAbort("missing PSF_MODEL selection");
-
-    if (mdi->type == PS_DATA_STRING) {
-        list = psListAlloc(NULL);
-        psListAdd (list, PS_LIST_HEAD, mdi);
+    psArray *modelNames = NULL;
+    psMetadataItem *item = psMetadataLookup (recipe, "PSF_MODEL");
+    if (item == NULL) psAbort("missing PSF_MODEL selection");
+
+    if (item->type == PS_DATA_STRING) {
+        modelNames = psArrayAlloc(1);
+        modelNames->data[0] = psStringCopy (item->data.V);
     } else {
-        if (mdi->type != PS_DATA_METADATA_MULTI) psAbort("missing PSF_MODEL selection");
-        list = psMemIncrRefCounter(mdi->data.list);
+        if (item->type != PS_DATA_METADATA_MULTI) psAbort("missing PSF_MODEL selection");
+        modelNames = psListToArray (item->data.list);
     }
 
     // set up an array to store the results
-    psArray *models = psArrayAlloc (list->n);
+    psArray *models = psArrayAlloc (modelNames->n);
 
     // try each model option listed in config
-    psListIterator *iter = psListIteratorAlloc (list, PS_LIST_HEAD, FALSE);
-    for (int i = 0; i < models->n; i++) {
-        psMetadataItem *item = psListGetAndIncrement (iter);
-        char *modelName = item->data.V;
+    for (int i = 0; i < modelNames->n; i++) {
+        char *modelName = modelNames->data[i];
         models->data[i] = pmPSFtryModel (stars, modelName, options, maskVal, mark);
     }
-
-    psFree (iter);
-    psFree (list);
-    psFree (stars);
 
     // select the best of the models
@@ -120 +118 @@
         pmPSFtry *try = models->data[i];
         if (try == NULL) {
-            psError(PSPHOT_ERR_PSF, false, "PSF model %d is NULL", i);
+            psTrace ("psphot", 3, "PSF model %d is NULL", i);
             continue;
         }
@@ -132 +130 @@
     // use the best model:
     if (bestN < 0) {
-        psError (PSPHOT_ERR_DATA, false, "Failed to fit any models when choosing PSF");
         psFree (models);
-        return NULL;
-    }
+        psFree (stars);
+
+        // XXX optionally give up here
+        // generate a psf model using the first selection
+        psError(PSPHOT_ERR_PSF, false, "Failed to fit any models when choosing PSF");
+        psErrorStackPrint (stderr, "Using guess PSF model");
+        psErrorClear ();
+        
+        // unset the PSFSTAR flags (none are used):
+        for (int i = 0; i < sources->n; i++) {
+            pmSource *source = sources->data[i];
+            source->mode &= ~PM_SOURCE_MODE_PSFSTAR;
+        }
+
+        // XXX set sxx, etc from FWHM in recipe
+        pmPSF *psf = pmPSFBuildSimple (modelNames->data[0], 1.0, 1.0, 0.0, 1.0);
+        psf->fieldNx = readout->image->numCols;
+        psf->fieldNy = readout->image->numRows;
+        psFree (modelNames);
+
+        bool status = true;
+        status &= psphotMakeFluxScale (readout->image, recipe, psf);
+        status &= psphotPSFstats (readout, recipe, psf);
+        if (!status) {
+            psError(PSPHOT_ERR_PSF, false, "Failed to fit any models when choosing PSF");
+            psFree (psf);
+            return NULL;
+        }
+
+        // XXX set DSX_MEAN, etc?
+        return psf;
+    }
+
+    psFree (modelNames);
+    psFree (stars);
 
     pmPSFtry *try = models->data[bestN];
-
-    // print/dump psf parameters
-    if (psTraceGetLevel("psphot") >= 5) {
-        for (int i = PM_PAR_SXX; i < try->psf->params->n; i++) {
-            // XXX re-write the output or some other status info
-        }
-    }
 
     // measure and save the median value of dparams[PM_PAR_SXX],dparams[PM_PAR_SYY]

trunk/psphot/src/psphotRadialPlot.c

@@ -24 +24 @@
     // XXX 'showWindow = false' is broken
     if (*kapa == 0) {
-        *kapa = pmKapaOpen (true);
+        *kapa = pmKapaOpen (false);
         KapaResize (*kapa, 500, 500);
         unlink (filename);