Changeset 14343

Timestamp:

Jul 20, 2007, 1:35:12 PM (19 years ago)

Author:

magnier

Message:

if modelConv exists, return it

File:

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

trunk/psModules/src/objects/pmSource.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-07-20 00:23:22 $
+ *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-07-20 23:35:12 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -882 +882 @@
 
     if (isPSF) {
-      *isPSF = false;
+        *isPSF = false;
     }
 
     switch (source->type) {
-    case PM_SOURCE_TYPE_STAR:
+      case PM_SOURCE_TYPE_STAR:
         model = source->modelPSF;
         if (model == NULL)
@@ -896 +896 @@
 
 // XXX when should I return the modelConv ??
-    case PM_SOURCE_TYPE_EXTENDED:
-        model = source->modelEXT;
+      case PM_SOURCE_TYPE_EXTENDED:
+        model = source->modelConv;
+        if (!model) {
+            model = source->modelEXT;
+        }
         if (!model && source->modelPSF) {
             if (isPSF) {
@@ -907 +910 @@
         break;
 
-    default:
+      default:
         return NULL;
     }