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

Timestamp:

Jan 20, 2006, 8:57:16 PM (20 years ago)

Author:

eugene

Message:

modifications to support psphot on pmReadout with full IPP config files

File:

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

trunk/psphot/src/psphotChoosePSF.c

@@ -34 +34 @@
 
     // get the list pointers for the PSF_MODEL entries
+    psList *list = NULL;
     psMetadataItem *mdi = psMetadataLookup (config, "PSF_MODEL");
     if (mdi == NULL) psAbort ("psphotChoosePSF", "missing PSF_MODEL selection");
-
-    psList *list = (psList *) mdi->data.list;
-    psListIterator *iter = psListIteratorAlloc (list, PS_LIST_HEAD, FALSE); 
+    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);
+    }
 
     // set up an array to store the results
@@ -44 +49 @@
 
     // try each model option listed in config
+    psListIterator *iter = psListIteratorAlloc (list, PS_LIST_HEAD, FALSE); 
     for (int i = 0; i < models->n; i++) { 
 
@@ -54 +60 @@
     }
     psFree (iter);
-    // psFree (list); XXX is list freed with iter?
+    psFree (list);
     psFree (stars);