Changeset 17308

Timestamp:

Apr 2, 2008, 8:01:04 PM (18 years ago)

Author:

eugene

Message:

remove modelConv, add modelFits

File:

• branches/eam_branch_20080324/psModules/src/objects/pmSource.c (modified) (4 diffs)

branches/eam_branch_20080324/psModules/src/objects/pmSource.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.51.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-04-02 21:16:16 $
+ *  @version $Revision: 1.51.2.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-04-03 06:01:04 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -50 +50 @@
     psFree(tmp->modelPSF);
     psFree(tmp->modelEXT);
-    psFree(tmp->modelConv);
+    psFree(tmp->modelFits);
     psFree(tmp->blends);
     psTrace("psModules.objects", 5, "---- end ----\n");
@@ -107 +107 @@
     source->modelPSF = NULL;
     source->modelEXT = NULL;
-    source->modelConv = NULL;
+    source->modelFits = NULL;
     source->type = PM_SOURCE_TYPE_UNKNOWN;
     source->mode = PM_SOURCE_MODE_DEFAULT;
@@ -947 +947 @@
         return model;
 
-// XXX when should I return the modelConv ??
+        // the 'best' extended model is saved in source->modelEXT (may be a pointer to one of
+        // the elements of source->modelFits)
       case PM_SOURCE_TYPE_EXTENDED:
-        model = source->modelConv;
-        if (!model) {
-            model = source->modelEXT;
-        }
+        model = source->modelEXT;
         if (!model && source->modelPSF) {
+            // XXX raise an error or warning here?
             if (isPSF) {
                 *isPSF = true;