Changeset 17396 for trunk/psModules/src/objects/pmSourcePhotometry.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/pmSourcePhotometry.c (modified) (2 diffs)

trunk/psModules/src/objects/pmSourcePhotometry.c

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-04-02 22:40:36 $
+ *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-04-08 18:35:38 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -119 +119 @@
     }
 
-    // measure EXT model photometry (do both modelEXT and modelConv or just the one?)
-    status = pmSourcePhotometryModel (&source->extMag, source->modelEXT);
+    // if we have a collection of model fits, one of them is a pointer to modelEXT?
+    // XXX not guaranteed
+    if (source->modelFits) {
+      for (int i = 0; i < source->modelFits->n; i++) {
+        pmModel *model = source->modelFits->data[i];
+        status = pmSourcePhotometryModel (&model->mag, model);
+      }
+      if (source->modelEXT) {
+        source->extMag = source->modelEXT->mag;
+      }
+    } else {
+      if (source->modelEXT) {
+        status = pmSourcePhotometryModel (&source->extMag, source->modelEXT);
+      }
+    }
 
     // for PSFs, correct both apMag and psfMag to same system, consistent with infinite flux star in aperture RADIUS