Changeset 14799 for trunk/psphot/src/psphotModelTest.c

Timestamp:

Sep 10, 2007, 9:15:36 AM (19 years ago)

Author:

Paul Price

Message:

Fixing uninitialised variable warning.

File:

• trunk/psphot/src/psphotModelTest.c (modified) (6 diffs)

trunk/psphot/src/psphotModelTest.c

@@ -6 +6 @@
 
     bool status;
-    int modelType;
+    int modelType = -1;
     float obsMag, fitMag, value;
     char name[64];
@@ -63 +63 @@
     // in fitMode, psf sets the model type
     if (fitMode == PM_SOURCE_FIT_PSF) {
-        psf = psphotLoadPSF (config, view, recipe);
+        psf = psphotLoadPSF (config, view, recipe);
         if (!psf) psAbort("PSF_INPUT_FILE not supplied");
         modelType = psf->type;
-        source->type = PM_SOURCE_TYPE_STAR;
+        source->type = PM_SOURCE_TYPE_STAR;
     }
     if (fitMode == PM_SOURCE_FIT_EXT) {
@@ -91 +91 @@
         modelType = pmModelClassGetType (modelName);
         if (modelType < 0) psAbort("unknown model %s", modelName);
-        source->type = PM_SOURCE_TYPE_EXTENDED;
+        source->type = PM_SOURCE_TYPE_EXTENDED;
     }
     if (fitMode == PM_SOURCE_FIT_PSF_X_EXT) {
-        // we need to load BOTH a psf and an ext model
-        psf = psphotLoadPSF (config, view, recipe);
+        // we need to load BOTH a psf and an ext model
+        psf = psphotLoadPSF (config, view, recipe);
         if (!psf) psAbort("PSF_INPUT_FILE not supplied");
 
@@ -120 +120 @@
         modelType = pmModelClassGetType (modelName);
         if (modelType < 0) psAbort("unknown model %s", modelName);
-        source->type = PM_SOURCE_TYPE_EXTENDED;
+        source->type = PM_SOURCE_TYPE_EXTENDED;
     }
 
@@ -150 +150 @@
     int nParams = pmModelClassParameterCount (modelType);
     psF32 *params = model->params->data.F32;
-    params[PM_PAR_XPOS] = xObj; // XXX use the user-supplied value, 
+    params[PM_PAR_XPOS] = xObj; // XXX use the user-supplied value,
     params[PM_PAR_YPOS] = yObj; // XXX or use the centroid
     for (int i = 0; i < nParams; i++) {
@@ -199 +199 @@
 
     if (fitMode == PM_SOURCE_FIT_PSF_X_EXT) {
-        // build the psf for the object
-        source->modelPSF = pmModelFromPSF (model, psf);
-        source->modelEXT = model;
-        status = psphotPSFConvModel (source, recipe, maskVal);
-        model = source->modelConv;
-        params = model->params->data.F32;
+        // build the psf for the object
+        source->modelPSF = pmModelFromPSF (model, psf);
+        source->modelEXT = model;
+        status = psphotPSFConvModel (source, recipe, maskVal);
+        model = source->modelConv;
+        params = model->params->data.F32;
     } else {
-        status = pmSourceFitModel (source, model, fitMode, maskVal);
+        status = pmSourceFitModel (source, model, fitMode, maskVal);
     }