Changeset 29060 for branches/sc_branches/trunkTest/psModules/src/objects/pmSourceIO_RAW.c

Timestamp:

Aug 26, 2010, 9:18:39 AM (16 years ago)

Author:

Serge CHASTEL

Message:

Merging trunk in branch

Location:

branches/sc_branches/trunkTest

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects/pmSourceIO_RAW.c (modified) (3 diffs)

branches/sc_branches/trunkTest/psModules/src/objects/pmSourceIO_RAW.c

@@ -28 +28 @@
 #include "pmFPAfile.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 "pmGrowthCurve.h"
-#include "pmResiduals.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 "pmSourcePhotometry.h"
+#include "pmPSFtry.h"
+
 #include "pmSourceIO.h"
 
@@ -120 +128 @@
                  source[0].peak->SN,
                  source[0].apRadius,
-                 source[0].pixWeight,
+                 source[0].pixWeightNotBad,
                  model[0].nDOF,
                  model[0].nIter);
@@ -182 +190 @@
                  source[0].peak->SN,
                  source[0].apRadius,
-                 source[0].pixWeight,
+                 source[0].pixWeightNotBad,
                  model[0].nDOF,
                  model[0].nIter);