Changeset 8046 for trunk/psphot/src/psphotChoosePSF.c

Timestamp:

Aug 1, 2006, 4:15:32 PM (20 years ago)

Author:

Paul Price

Message:

Initialising values to avoid compiler error.

File:

• trunk/psphot/src/psphotChoosePSF.c (modified) (10 diffs)

trunk/psphot/src/psphotChoosePSF.c

@@ -2 +2 @@
 
 // try PSF models and select best option
-pmPSF *psphotChoosePSF (pmReadout *readout, psArray *sources, psMetadata *recipe) { 
+pmPSF *psphotChoosePSF (pmReadout *readout, psArray *sources, psMetadata *recipe) {
 
-    bool            status;
-    char           *modelName;
-    pmPSF          *psf = NULL;
-    pmPSFtry       *try = NULL;
-    psArray        *stars = NULL;
+    bool            status;
+    char           *modelName;
+    pmPSF          *psf = NULL;
+    pmPSFtry       *try = NULL;
+    psArray        *stars = NULL;
 
     psTimerStart ("psphot");
@@ -32 +32 @@
     // select the candidate PSF stars (pointers to original sources)
     for (int i = 0; (i < sources->n) && (stars->n < NSTARS); i++) {
-        pmSource *source = sources->data[i];
-        if (source->mode & PM_SOURCE_MODE_PSFSTAR) psArrayAdd (stars, 200, source);
+        pmSource *source = sources->data[i];
+        if (source->mode & PM_SOURCE_MODE_PSFSTAR) psArrayAdd (stars, 200, source);
     }
     psLogMsg ("psphot.pspsf", 4, "selected candidate %d PSF objects\n", stars->n);
@@ -47 +47 @@
 
     if (mdi->type == PS_DATA_STRING) {
-        list = psListAlloc(NULL);
-        psListAdd (list, PS_LIST_HEAD, mdi);
+        list = psListAlloc(NULL);
+        psListAdd (list, PS_LIST_HEAD, mdi);
     } else {
-        if (mdi->type != PS_DATA_METADATA_MULTI) psAbort ("psphotChoosePSF", "missing PSF_MODEL selection");
-        list = psMemIncrRefCounter(mdi->data.list);
+        if (mdi->type != PS_DATA_METADATA_MULTI) psAbort ("psphotChoosePSF", "missing PSF_MODEL selection");
+        list = psMemIncrRefCounter(mdi->data.list);
     }
 
@@ -59 +59 @@
 
     // 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);
-        modelName = item->data.V;
-        models->data[i] = pmPSFtryModel (stars, modelName, RADIUS, POISSON_ERRORS);
+    psListIterator *iter = psListIteratorAlloc (list, PS_LIST_HEAD, FALSE);
+    for (int i = 0; i < models->n; i++) {
+        psMetadataItem *item = psListGetAndIncrement (iter);
+        modelName = item->data.V;
+        models->data[i] = pmPSFtryModel (stars, modelName, RADIUS, POISSON_ERRORS);
     }
     psFree (iter);
@@ -75 +75 @@
     float bestM = try->psf->dApResid;
     for (int i = 1; i < models->n; i++) {
-        try = models->data[i];
-        float M = try->psf->dApResid;
-        if (M < bestM) {
-            bestM = M;
-            bestN = i;
-        }
+        try = models->data[i];
+        float M = try->psf->dApResid;
+        if (M < bestM) {
+            bestM = M;
+            bestN = i;
+        }
     }
-    
+
     // use the best model:
     try = models->data[bestN];
@@ -88 +88 @@
     // unset the PSFSTAR flag for stars not used for PSF model
     for (int i = 0; i < try->sources->n; i++) {
-        pmSource *source = try->sources->data[i];
-        if (try->mask->data.U8[i] & PSFTRY_MASK_EXT_FAIL) {
-            source->mode &= ~PM_SOURCE_MODE_PSFSTAR;
-        }
+        pmSource *source = try->sources->data[i];
+        if (try->mask->data.U8[i] & PSFTRY_MASK_EXT_FAIL) {
+            source->mode &= ~PM_SOURCE_MODE_PSFSTAR;
+        }
     }
 
@@ -130 +130 @@
     // get the model full-width at half-max
     psF64 FWHM_X = 2*modelRadiusFunc (modelPSF->params, 0.5);
-    
+
     shape.sx  = modelPSF->params->data.F32[4];
     shape.sy  = modelPSF->params->data.F32[5];
@@ -141 +141 @@
     psMetadataAdd (recipe, PS_LIST_TAIL, "FWHM_Y", PS_DATA_F32 | PS_META_REPLACE, "PSF FWHM Minor axis", FWHM_Y);
     psMetadataAdd (recipe, PS_LIST_TAIL, "ANGLE",  PS_DATA_F32 | PS_META_REPLACE, "PSF angle",           axes.theta);
-    
+
     psFree (modelEXT);
     psFree (modelPSF);
@@ -150 +150 @@
 bool psphotMomentsStats (pmReadout *readout, psMetadata *recipe, psArray *sources) {
 
-    // without the PSF model, we can only rely on the source->moments 
+    // without the PSF model, we can only rely on the source->moments
     // as a measure of the FWHM values
 
-    double FWHM_X, FWHM_Y, FWHM_T;
-    int FWHM_N;
+    double FWHM_X = 0.0, FWHM_Y = 0.0, FWHM_T = 0.0;
+    int FWHM_N = 0;
 
     psEllipseMoments moments;
     psEllipseAxes axes;
 
-    FWHM_N = 0;
-    FWHM_X = FWHM_Y = 0.0;
+    for (int i = 0; i < sources->n; i++) {
+        pmSource *source = sources->data[i];
+        if (!(source->mode & PM_SOURCE_MODE_PSFSTAR)) continue;
 
-    for (int i = 0; i < sources->n; i++) {
-        pmSource *source = sources->data[i];
-        if (!(source->mode & PM_SOURCE_MODE_PSFSTAR)) continue;
-        
-        // moments->Sx,Sy are roughly sigma_x,y
-        moments.x2 = PS_SQR(source->moments->Sx);
-        moments.y2 = PS_SQR(source->moments->Sy);
-        moments.xy = source->moments->Sxy;
+        // moments->Sx,Sy are roughly sigma_x,y
+        moments.x2 = PS_SQR(source->moments->Sx);
+        moments.y2 = PS_SQR(source->moments->Sy);
+        moments.xy = source->moments->Sxy;
 
-        axes = psEllipseMomentsToAxes (moments);
+        axes = psEllipseMomentsToAxes (moments);
 
-        FWHM_X += axes.major * 2.35;
-        FWHM_Y += axes.minor * 2.35;
-        FWHM_T += axes.theta;
-        FWHM_N ++;
+        FWHM_X += axes.major * 2.35;
+        FWHM_Y += axes.minor * 2.35;
+        FWHM_T += axes.theta;
+        FWHM_N ++;
     }
 
@@ -186 +183 @@
     psMetadataAdd (recipe, PS_LIST_TAIL, "FWHM_Y", PS_DATA_F32 | PS_META_REPLACE, "PSF FWHM Minor axis", FWHM_Y);
     psMetadataAdd (recipe, PS_LIST_TAIL, "ANGLE",  PS_DATA_F32 | PS_META_REPLACE, "PSF angle",           FWHM_T);
-    
+
     return true;
 }