Changeset 17396 for trunk/psModules/src/objects/pmSource.c

Timestamp:

Apr 8, 2008, 8:36:06 AM (18 years ago)

Author:

eugene

Message:

merging from eam_branch_20080324 : psphot work on extended source fitting and related I/O functions

File:

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

trunk/psModules/src/objects/pmSource.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-03-19 00:51:09 $
+ *  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-04-08 18:35:38 $
  *
  *  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->extpars);
     psFree(tmp->blends);
     psTrace("psModules.objects", 5, "---- end ----\n");
@@ -107 +108 @@
     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 +948 @@
         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;
@@ -1015 +1015 @@
   if (!strcasecmp (name, "DEFECT"    )) return PM_SOURCE_MODE_DEFECT;
   if (!strcasecmp (name, "SATURATED" )) return PM_SOURCE_MODE_SATURATED;
-  if (!strcasecmp (name, "CRLIMIT"   )) return PM_SOURCE_MODE_CRLIMIT;
+  if (!strcasecmp (name, "CRLIMIT"   )) return PM_SOURCE_MODE_CR_LIMIT;
+  if (!strcasecmp (name, "EXTLIMIT"  )) return PM_SOURCE_MODE_EXT_LIMIT;
   if (!strcasecmp (name, "SUBTRACTED")) return PM_SOURCE_MODE_SUBTRACTED;
   return PM_SOURCE_MODE_DEFAULT;
@@ -1036 +1037 @@
     case PM_SOURCE_MODE_DEFECT     : return psStringCopy ("DEFECT"    );
     case PM_SOURCE_MODE_SATURATED  : return psStringCopy ("SATURATED" );
-    case PM_SOURCE_MODE_CRLIMIT    : return psStringCopy ("CRLIMIT");
+    case PM_SOURCE_MODE_CR_LIMIT   : return psStringCopy ("CRLIMIT"   );
+    case PM_SOURCE_MODE_EXT_LIMIT  : return psStringCopy ("EXTLIMIT"  );
     case PM_SOURCE_MODE_SUBTRACTED : return psStringCopy ("SUBTRACTED");
     default: