Changeset 28435 for branches/eam_branches/ipp-20100621/psModules

Timestamp:

Jun 23, 2010, 2:03:31 PM (16 years ago)

Author:

eugene

Message:

add visual facility management a la psTrace

Location:

branches/eam_branches/ipp-20100621/psModules/src

Files:

• config/pmConfig.c (modified) (2 diffs)
• extras/Makefile.am (modified) (2 diffs)
• extras/pmVisualUtils.c (added)
• extras/pmVisualUtils.h (added)
• objects/pmSourceVisual.c (modified) (6 diffs)
• psmodules.h (modified) (1 diff)

branches/eam_branches/ipp-20100621/psModules/src/config/pmConfig.c

@@ -32 +32 @@
 
 #include "pmConfig.h"
+#include "pmVisualUtils.h"
 
 #ifdef HAVE_NEBCLIENT
@@ -638 +639 @@
         psArgumentVerbosity(argc, argv);
         // XXX: substitute the string for the default log level for "2".
+    }
+
+    // Set the visualization levels
+    // argument format is: -visual (facil) (level)
+    while ((argNum = psArgumentGet(*argc, argv, "-visual"))) {
+        if ( (*argc < argNum + 3) ) {
+            psError(PS_ERR_IO, true, "-visual switch specified without facility and level.");
+            return NULL;
+        }
+        psArgumentRemove(argNum, argc, argv);
+        pmVisualSetLevel(argv[argNum], atoi(argv[argNum+1]));
+        psArgumentRemove(argNum, argc, argv);
+        psArgumentRemove(argNum, argc, argv);
+    }
+    if ((argNum = psArgumentGet(*argc, argv, "-visual-all"))) {
+        pmVisualSetLevel(".", 10);
+    }
+    if ((argNum = psArgumentGet(*argc, argv, "-visual-levels"))) {
+        pmVisualPrintLevels(stdout);
     }
 

branches/eam_branches/ipp-20100621/psModules/src/extras/Makefile.am

@@ -9 +9 @@
         pmKapaPlots.c \
         pmVisual.c \
+        pmVisualUtils.c \
         ippStages.c
 
@@ -17 +18 @@
         pmKapaPlots.h \
         pmVisual.h \
+        pmVisualUtils.h \
         ippDiffMode.h \
         ippStages.h

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

@@ -13 +13 @@
 #include <kapa.h>
 #include "pmVisual.h"
+#include "pmVisualUtils.h"
 
 // functions used to visualize the analysis as it goes
@@ -34 +35 @@
     Graphdata graphdata;
 
-    if (!pmVisualIsVisual()) return true;
+    if (!pmVisualTestLevel("psphot.psf.metric", 2)) return true;
 
     if (kapa1 == -1) {
@@ -118 +119 @@
     Graphdata graphdata;
 
-    if (!pmVisualIsVisual()) return true;
+    if (!pmVisualTestLevel("psphot.psf.subpix", 3)) return true;
 
     if (kapa1 == -1) {
@@ -280 +281 @@
 bool pmSourceVisualShowModelFits (pmPSF *psf, psArray *sources, psImageMaskType maskVal) {
 
-    if (!pmVisualIsVisual()) return true;
+    if (!pmVisualTestLevel("psphot.psf.fits", 2)) return true;
 
     if (kapa2 == -1) {
@@ -360 +361 @@
 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 +406 @@
     Graphdata graphdata;
 
-    if (!pmVisualIsVisual() || !plotPSF) return true;
+    if (!plotPSF) return true;
+    if (!pmVisualTestLevel("psphot.psf.resid", 2)) return true;
 
     if (kapa1 == -1) {

branches/eam_branches/ipp-20100621/psModules/src/psmodules.h

@@ -10 +10 @@
 #include <pmKapaPlots.h>
 #include <pmVisual.h>
+#include <pmVisualUtils.h>
 #include <ippStages.h>
 #include <ippDiffMode.h>