Changeset 6556 for branches/rel10_ifa/psModules/src/objects/pmSourceFitModel.c

Timestamp:

Mar 8, 2006, 5:14:23 PM (20 years ago)

Author:

magnier

Message:

major rework of objects code

File:

• branches/rel10_ifa/psModules/src/objects/pmSourceFitModel.c (modified) (4 diffs)

branches/rel10_ifa/psModules/src/objects/pmSourceFitModel.c

@@ -1 @@
-/** @file  pmObjects.c
+/** @file  pmSourceFitModel.c
  *
- *  This file will ...
+ *  fit single source models to image pixels
  *
+ *  @author EAM, IfA
  *  @author GLG, MHPCC
- *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.1.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-07 06:33:35 $
+ *  @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-09 03:14:23 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -17 +17 @@
 #include <string.h>
 #include "pslib.h"
-#include "pmObjects.h"
+#include "pmHDU.h"
+#include "pmFPA.h"
+#include "pmPeaks.h"
+#include "pmMoments.h"
+#include "pmGrowthCurve.h"
+#include "pmModel.h"
+#include "pmPSF.h"
+#include "pmSource.h"
 #include "pmModelGroup.h"
+#include "pmSourceFitModel.h"
 
 // save a static values so they may be set externally
@@ -169 +177 @@
     }
 
-    source->mode |= PM_SOURCE_FITTED;
+    source->mode |= PM_SOURCE_MODE_FITTED;
 
     psFree(x);
@@ -186 +194 @@
     return(rc);
 }
-
-pmModel *pmSourceSelectModel (pmSource *source)
-{
-    switch (source->type) {
-    case PM_SOURCE_STAR:
-        return source->modelPSF;
-
-    case PM_SOURCE_EXTENDED:
-        return source->modelEXT;
-
-    default:
-        return NULL;
-    }
-    return NULL;
-}
-
-/******************************************************************************
-    pmSourceModelGuess(source, model): This function allocates a new
-    pmModel structure based on the given modelType specified in the argument list.  
-    The corresponding pmModelGuess function is returned, and used to 
-    supply the values of the params array in the pmModel structure.  
-     
-    XXX: Many parameters are based on the src->moments structure, which is in
-    image, not subImage coords.  Therefore, the calls to the model evaluation
-    functions will be in image, not subImage coords.  Remember this.
-*****************************************************************************/
-pmModel *pmSourceModelGuess(pmSource *source,
-                            pmModelType modelType)
-{
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
-    PS_ASSERT_PTR_NON_NULL(source->moments, false);
-    PS_ASSERT_PTR_NON_NULL(source->peak, false);
-
-    pmModel *model = pmModelAlloc(modelType);
-
-    pmModelGuessFunc modelGuessFunc = pmModelGuessFunc_GetFunction(modelType);
-    modelGuessFunc(model, source);
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
-    return(model);
-}
-