Changeset 28643 for branches/eam_branches/ipp-20100621/psModules/src/objects/pmPSF.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/pmPSF.c (modified) (3 diffs)

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

@@ -25 +25 @@
 #include "pmHDU.h"
 #include "pmFPA.h"
+#include "pmFPAMaskWeight.h"
+#include "psVectorBracket.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 "pmModelClass.h"
-#include "pmModelUtils.h"
-#include "pmSourcePhotometry.h"
-#include "pmFPAMaskWeight.h"
-#include "psVectorBracket.h"
+#include "pmPSFtry.h"
+#include "pmDetections.h"
+
 #include "pmErrorCodes.h"
 
@@ -54 +63 @@
 
     psFree (options->stats);
+    psFree (options->fitOptions);
     return;
 }
@@ -65 +75 @@
 
     options->stats         = NULL;
+    options->fitOptions    = NULL; // XXX this has to be set before calling pmPSF fit functions
 
     options->psfTrendMode  = PM_TREND_NONE;