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

Timestamp:

Oct 13, 2006, 11:22:09 AM (20 years ago)

Author:

Paul Price

Message:

Fixing psLib APIs following clean-up.

File:

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

trunk/psphot/src/psphotModelTest.c

@@ -25 +25 @@
     char *fitModeWord = psMetadataLookupStr (&status, recipe, "TEST_FIT_MODE");
     if (!status) {
-        fitModeWord = DEFAULT_MODE;
+        fitModeWord = DEFAULT_MODE;
     }
     fitMode = PM_SOURCE_FIT_EXT;
@@ -32 +32 @@
     // in fitMode, psf sets the model type
     if (fitMode == PM_SOURCE_FIT_PSF) {
-        char *psfFile = psMetadataLookupStr (&status, recipe, "PSF_INPUT_FILE");
-        if (!status) psAbort ("psphotModelTest", "PSF_INPUT_FILE not supplied");
-        psMetadata *psfData = psMetadataConfigRead(NULL, &Nfail, psfFile, FALSE);
-        psf = pmPSFfromMD (psfData);
-        modelType = psf->type;
+        char *psfFile = psMetadataLookupStr (&status, recipe, "PSF_INPUT_FILE");
+        if (!status) psAbort ("psphotModelTest", "PSF_INPUT_FILE not supplied");
+        psMetadata *psfData = psMetadataConfigRead(NULL, &Nfail, psfFile, FALSE);
+        psf = pmPSFfromMetadata (psfData);
+        modelType = psf->type;
     } else {
-        // find the model: supplied by user or first in the PSF_MODEL list
-        char *modelName  = psMetadataLookupStr (&status, recipe, "TEST_FIT_MODEL");
-        if (modelName == NULL) {
-            // get the list pointers for the PSF_MODEL entries
+        // find the model: supplied by user or first in the PSF_MODEL list
+        char *modelName  = psMetadataLookupStr (&status, recipe, "TEST_FIT_MODEL");
+        if (modelName == NULL) {
+            // get the list pointers for the PSF_MODEL entries
 
-            psList *list = NULL;
-            psMetadataItem *mdi = psMetadataLookup (recipe, "PSF_MODEL");
-            if (mdi == NULL) psAbort ("psphotModelTest", "missing PSF_MODEL selection");
-            if (mdi->type == PS_DATA_STRING) {
-                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);
-            }
+            psList *list = NULL;
+            psMetadataItem *mdi = psMetadataLookup (recipe, "PSF_MODEL");
+            if (mdi == NULL) psAbort ("psphotModelTest", "missing PSF_MODEL selection");
+            if (mdi->type == PS_DATA_STRING) {
+                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);
+            }
 
-            // take the first list element
-            item = psListGet (list, PS_LIST_HEAD);
-            modelName = item->data.V;
-        }
-        modelType = pmModelSetType (modelName);
-        if (modelType < 0) psAbort ("fitsource", "unknown model %s", modelName);
+            // take the first list element
+            item = psListGet (list, PS_LIST_HEAD);
+            modelName = item->data.V;
+        }
+        modelType = pmModelSetType (modelName);
+        if (modelType < 0) psAbort ("fitsource", "unknown model %s", modelName);
     }
 
@@ -65 +65 @@
     float INNER = psMetadataLookupF32 (&status, recipe, "TEST_FIT_INNER_RADIUS");
     if (!status) {
-        INNER = psMetadataLookupF32 (&status, recipe, "SKY_INNER_RADIUS");
+        INNER = psMetadataLookupF32 (&status, recipe, "SKY_INNER_RADIUS");
     }
 
     float OUTER = psMetadataLookupF32 (&status, recipe, "TEST_FIT_OUTER_RADIUS");
     if (!status) {
-        OUTER = psMetadataLookupF32 (&status, recipe, "SKY_OUTER_RADIUS");
+        OUTER = psMetadataLookupF32 (&status, recipe, "SKY_OUTER_RADIUS");
     }
 
     float RADIUS = psMetadataLookupF32 (&status, recipe, "TEST_FIT_RADIUS");
     if (!status) {
-        RADIUS = psMetadataLookupF32 (&status, recipe, "PSF_FIT_RADIUS");
+        RADIUS = psMetadataLookupF32 (&status, recipe, "PSF_FIT_RADIUS");
     }
 
     float mRADIUS = psMetadataLookupF32 (&status, recipe, "TEST_MOMENTS_RADIUS");
     if (!status) {
-        mRADIUS = psMetadataLookupF32 (&status, recipe, "PSF_MOMENTS_RADIUS");
+        mRADIUS = psMetadataLookupF32 (&status, recipe, "PSF_MOMENTS_RADIUS");
     }
 
@@ -117 +117 @@
     psF32 *params = model->params->data.F32;
     for (int i = 0; i < nParams; i++) {
-        if (i == 2) {
-            params[i] = xObj;
-            continue;
-        }
-        if (i == 3) {
-            params[i] = yObj;
-            continue;
-        }
-        sprintf (name, "TEST_FIT_PAR%d", i);
-        value = psMetadataLookupF32 (&status, recipe, name);
-        if (status) {
-            params[i] = value;
-        }
+        if (i == 2) {
+            params[i] = xObj;
+            continue;
+        }
+        if (i == 3) {
+            params[i] = yObj;
+            continue;
+        }
+        sprintf (name, "TEST_FIT_PAR%d", i);
+        value = psMetadataLookupF32 (&status, recipe, name);
+        if (status) {
+            params[i] = value;
+        }
     }
 
@@ -136 +136 @@
 
     if (fitMode == PM_SOURCE_FIT_PSF) {
-        pmModel *modelPSF = pmModelFromPSF (model, psf);
-        psFree (model);
-        model = modelPSF;
-        params = model->params->data.F32;
+        pmModel *modelPSF = pmModelFromPSF (model, psf);
+        psFree (model);
+        model = modelPSF;
+        params = model->params->data.F32;
     }
 
@@ -154 +154 @@
     fprintf (stderr, "input parameters: \n");
     for (int i = 0; i < nParams; i++) {
-        fprintf (stderr, "%d : %f\n", i, params[i]);
+        fprintf (stderr, "%d : %f\n", i, params[i]);
     }
 
@@ -162 +162 @@
     char *fitset = psMetadataLookupStr (&status, recipe, "TEST_FIT_SET");
     if (status) {
-        status = psphotFitSet (source, model, fitset, fitMode);
-        exit (0);
+        status = psphotFitSet (source, model, fitset, fitMode);
+        exit (0);
     }
 
@@ -178 +178 @@
     // subtract object, leave local sky
     pmModelSub (source->pixels, source->mask, model, false, false);
-    
+
     fprintf (stderr, "output parameters: \n");
     for (int i = 0; i < nParams; i++) {
-        fprintf (stderr, "%d : %f\n", i, params[i]);
+        fprintf (stderr, "%d : %f\n", i, params[i]);
     }
 
-    // write out 
+    // write out
     psphotSaveImage (NULL, source->pixels, "resid.fits");
     psphotSaveImage (NULL, source->mask, "mask.fits");