Changeset 29060 for branches/sc_branches/trunkTest/psModules/src/objects/pmSourceVisual.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/pmSourceVisual.c (modified) (7 diffs)

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

@@ -4 +4 @@
 
 #include <pslib.h>
+#include "pmHDU.h"
+#include "pmFPA.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 "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 "pmPSFtry.h"
-#include "pmSource.h"
+#include "pmDetections.h"
+
 #include "pmSourceVisual.h"
 
@@ -13 +33 @@
 #include <kapa.h>
 #include "pmVisual.h"
+#include "pmVisualUtils.h"
 
 // functions used to visualize the analysis as it goes
@@ -34 +55 @@
     Graphdata graphdata;
 
-    if (!pmVisualIsVisual()) return true;
+    if (!pmVisualTestLevel("psphot.psf.metric", 2)) return true;
 
     if (kapa1 == -1) {
@@ -118 +139 @@
     Graphdata graphdata;
 
-    if (!pmVisualIsVisual()) return true;
+    if (!pmVisualTestLevel("psphot.psf.subpix", 3)) return true;
 
     if (kapa1 == -1) {
@@ -280 +301 @@
 bool pmSourceVisualShowModelFits (pmPSF *psf, psArray *sources, psImageMaskType maskVal) {
 
-    if (!pmVisualIsVisual()) return true;
+    if (!pmVisualTestLevel("psphot.psf.fits", 2)) return true;
 
     if (kapa2 == -1) {
@@ -360 +381 @@
 bool pmSourceVisualShowModelFit (pmSource *source) {
 
-    if (!pmVisualIsVisual()) return true;
+    if (!pmVisualTestLevel("psphot.psf.fitresid", 2)) return true;
+
     if (!source->pixels) return false;
     if (!source->modelFlux) return false;
@@ -404 +426 @@
     Graphdata graphdata;
 
-    if (!pmVisualIsVisual() || !plotPSF) return true;
+    if (!plotPSF) return true;
+    if (!pmVisualTestLevel("psphot.psf.resid", 2)) return true;
 
     if (kapa1 == -1) {