Changeset 25388

Timestamp:

Sep 15, 2009, 3:45:42 PM (17 years ago)

Author:

eugene

Message:

lots of cleanups

File:

• branches/eam_branches/20090715/psphot/src/psphotVisual.c (modified) (5 diffs)

branches/eam_branches/20090715/psphot/src/psphotVisual.c

@@ -166 +166 @@
 bool psphotVisualShowImage (pmReadout *readout) {
 
-    // if (!pmVisualIsVisual()) return true;
+    if (!pmVisualIsVisual()) return true;
 
     int kapa = psphotKapaChannel (1);
@@ -1078 +1078 @@
         pmSource *source = sources->data[i];
 
-        bool keep = false;
-        keep |= (source->mode & PM_SOURCE_MODE_SATSTAR);
-        if (!keep) continue;
+        // only show "real" saturated stars (not defects)
+        if (!(source->mode & PM_SOURCE_MODE_SATSTAR)) continue;;
+        if (source->mode & PM_SOURCE_MODE_DEFECT) continue;;
 
         // how does this subimage get placed into the output image?
@@ -1123 +1123 @@
         pmSource *source = sources->data[i];
 
-        bool keep = false;
-        if (source->mode & PM_SOURCE_MODE_SATSTAR) {
-            nSAT ++;
-            keep = true;
-        }
-        if (!keep) continue;
+        // only show "real" saturated stars (not defects)
+        if (!(source->mode & PM_SOURCE_MODE_SATSTAR)) continue;;
+        if (source->mode & PM_SOURCE_MODE_DEFECT) continue;;
+        nSAT ++;
 
         if (Xo + DX > NX) {
@@ -1508 +1506 @@
 bool psphotVisualShowSourceSize (pmReadout *readout, psArray *sources) {
 
-    // if (!pmVisualIsVisual()) return true;
+    if (!pmVisualIsVisual()) return true;
 
     int myKapa = psphotKapaChannel (1);
@@ -1541 +1539 @@
     KapaSection section;
 
-    // if (!pmVisualIsVisual()) return true;
+    if (!pmVisualIsVisual()) return true;
 
     int myKapa = psphotKapaChannel (2);