Changeset 29060 for branches/sc_branches/trunkTest/psModules/src/psmodules.h

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/psmodules.h (modified) (4 diffs)

branches/sc_branches/trunkTest/psModules/src/psmodules.h

@@ -10 +10 @@
 #include <pmKapaPlots.h>
 #include <pmVisual.h>
+#include <pmVisualUtils.h>
 #include <ippStages.h>
 #include <ippDiffMode.h>
@@ -113 +114 @@
 
 // the following headers are from psModule:objects
+#include <pmTrend2D.h>
+#include <pmResiduals.h>
+#include <pmGrowthCurve.h>
+
 #include <pmSpan.h>
 #include <pmFootprintSpans.h>
@@ -119 +124 @@
 #include <pmDetections.h>
 #include <pmMoments.h>
+
+#include <pmModelFuncs.h>
+#include <pmModel.h>
+
+#include <pmSourceMasks.h>
 #include <pmSourceExtendedPars.h>
 #include <pmSourceDiffStats.h>
-#include <pmResiduals.h>
-#include <pmGrowthCurve.h>
-#include <pmTrend2D.h>
+#include <pmSource.h>
+#include <pmSourceFitModel.h>
 #include <pmPSF.h>
-#include <pmModel.h>
-#include <pmSourceMasks.h>
-#include <pmSource.h>
+#include <pmPSFtry.h>
 #include <pmPhotObj.h>
 #include <pmSourceUtils.h>
 #include <pmSourceIO.h>
 #include <pmSourceSky.h>
-#include <pmSourceFitModel.h>
 #include <pmSourceFitSet.h>
 #include <pmSourceContour.h>
 #include <pmSourcePlots.h>
 #include <pmPSF_IO.h>
-#include <pmPSFtry.h>
 #include <pmModelClass.h>
 #include <pmModelUtils.h>
@@ -144 +149 @@
 #include <pmSourceMatch.h>
 #include <pmDetEff.h>
+#include <pmPCMdata.h>
 
 // The following headers are from random locations, here because they cross bounds