Changeset 17396 for trunk/psphot/src/psphotSourceFits.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/psphot/src/psphotSourceFits.c (modified) (3 diffs)

trunk/psphot/src/psphotSourceFits.c

@@ -220 +220 @@
     pmSource *tmpSrc = pmSourceAlloc ();
 
-    pmModel *EXT = psphotFitEXT (readout, source, maskVal);
+    pmModel *EXT = psphotFitEXT (readout, source, modelTypeEXT, maskVal);
     okEXT = psphotEvalEXT (tmpSrc, EXT);
     chiEXT = EXT->chisq / EXT->nDOF;
@@ -267 +267 @@
     // save new model
     source->modelEXT = EXT;
+    source->type = PM_SOURCE_TYPE_EXTENDED;
+    source->mode |= PM_SOURCE_MODE_EXTMODEL;
 
     // build cached model and subtract
@@ -349 +351 @@
 }
 
-pmModel *psphotFitEXT (pmReadout *readout, pmSource *source, psMaskType maskVal) {
+pmModel *psphotFitEXT (pmReadout *readout, pmSource *source, pmModelType modelType, psMaskType maskVal) {
 
     NfitEXT ++;
 
     // use the source moments, etc to guess basic model parameters
-    pmModel *EXT = pmSourceModelGuess (source, modelTypeEXT);
+    pmModel *EXT = pmSourceModelGuess (source, modelType);
     PS_ASSERT (EXT, NULL);