Changeset 31153 for trunk/psModules/src/extras

Timestamp:

Apr 4, 2011, 1:04:41 PM (15 years ago)

Author:

eugene

Message:

updates to pmPeak to better distinguish peak flux versions; updates to visualization; add bits for substantial suspect masking; consolidate assignment of source position and flux based on peak, moments, etc; improve footprint culling process; fix PSF_QF and PSF_QF_PERFECT calculations; fix source model chisq values

Location:

trunk/psModules

Files:

• . (modified) (1 prop)
• src/extras/pmVisual.c (modified) (3 diffs)
• src/extras/pmVisualUtils.c (modified) (3 diffs)

trunk/psModules

@@ -28 +28 @@
 ChangeLog
 psmodules-*.tar.*
+a.out.dSYM

@@ -28 +28 @@
 ChangeLog
 psmodules-*.tar.*
+a.out.dSYM

trunk/psModules/src/extras/pmVisual.c

@@ -1 @@
-/** The following are a collection of core procedures to aid the creation of visaual diagnostics
+/** The following are a collection of core procedures to aid the creation of visual diagnostics
  *  @author Chris Beaumont, IfA
  *  @date January 23, 2008
@@ -80 +80 @@
 
 bool pmVisualInitWindow (int *kapid, char *name) {
+
     if (*kapid == -1) {
         *kapid = KapaOpenNamedSocket("kapa", name);
         if (*kapid == -1) {
-            fprintf (stderr, "Failure to open kapa.\n");
-            isVisual = false;
+            fprintf (stderr, "Failure to open kapa; visual mode disabled.\n");
+            pmVisualSetVisual(false);
             return false;
         }
@@ -255 +256 @@
     }
 
+    if (increasing) {
+        fprintf (stderr, "plotting points scaled from %f to %f\n", zmin, zmax);
+    } else {
+        fprintf (stderr, "plotting points scaled from %f to %f\n", zmax, zmin);
+    }
+
     float range = zmax - zmin;
     if (range == 0.0) {

trunk/psModules/src/extras/pmVisualUtils.c

@@ -16 +16 @@
 #include <pslib.h>
 
+#include <pmVisual.h>
 #include <pmVisualUtils.h>
 
@@ -89 +90 @@
     }
 
+    // turn on overall visualization
+    pmVisualSetVisual(true);
+
     // If the component name has no leading dot, then supply it.
     if (comp[0] != '.') {
@@ -145 +149 @@
     PS_ASSERT_STRING_NON_EMPTY(func, false);
 
-   // return true if level is set to be shown
+    // if visualization is turned off, just skip
+    if (!pmVisualIsVisual()) return false;
+
+    // return true if level is set to be shown
     FACILITY(facility, func, name);
+
     bool valid = level <= getLevel(facility);
 

@@ -28 +28 @@
 ChangeLog
 psmodules-*.tar.*
+a.out.dSYM