Changeset 28643 for branches/eam_branches/ipp-20100621/psModules/src/objects/pmPSFtryModel.c

Timestamp:

Jul 9, 2010, 10:56:32 AM (16 years ago)

Author:

eugene

Message:

changed pmSourceFitModel and related APIs to pass a structure of fit options; this lets us change the options between soruces within the multithreaded context; also re-organized the include orders to avoid conflicts

File:

• branches/eam_branches/ipp-20100621/psModules/src/objects/pmPSFtryModel.c (modified) (2 diffs)

branches/eam_branches/ipp-20100621/psModules/src/objects/pmPSFtryModel.c

@@ -19 +19 @@
 #include "pmFPA.h"
 #include "pmFPAMaskWeight.h"
+
+#include "pmTrend2D.h"
+#include "pmResiduals.h"
+#include "pmGrowthCurve.h"
 #include "pmSpan.h"
+#include "pmFootprintSpans.h"
 #include "pmFootprint.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
-#include "pmResiduals.h"
-#include "pmGrowthCurve.h"
-#include "pmTrend2D.h"
+#include "pmModelFuncs.h"
+#include "pmModel.h"
+#include "pmModelUtils.h"
+#include "pmModelClass.h"
+#include "pmSourceMasks.h"
+#include "pmSourceExtendedPars.h"
+#include "pmSourceDiffStats.h"
+#include "pmSource.h"
+#include "pmSourceFitModel.h"
 #include "pmPSF.h"
-#include "pmModel.h"
-#include "pmSource.h"
-#include "pmSourceUtils.h"
 #include "pmPSFtry.h"
-#include "pmModelClass.h"
-#include "pmModelUtils.h"
-#include "pmSourceFitModel.h"
-#include "pmSourcePhotometry.h"
+#include "pmDetections.h"
+
 #include "pmSourceVisual.h"
 
@@ -49 +55 @@
 pmPSFtry *pmPSFtryModel (const psArray *sources, const char *modelName, pmPSFOptions *options, psImageMaskType maskVal, psImageMaskType markVal)
 {
+    assert (options->fitOptions);
+
     // validate the requested model name
     options->type = pmModelClassGetType (modelName);