Changeset 30753 for branches/eam_branches/ipp-20110213/psphot/src/psphotVisual.c

Timestamp:

Feb 24, 2011, 12:49:04 PM (15 years ago)

Author:

eugene

Message:

correct typo in logic for GuessModels; test option for large object moments (try harder); updates to visuals

File:

• branches/eam_branches/ipp-20110213/psphot/src/psphotVisual.c (modified) (6 diffs)

branches/eam_branches/ipp-20110213/psphot/src/psphotVisual.c

@@ -218 +218 @@
 }
 
-bool psphotVisualScaleImage (int kapaFD, psImage *inImage, psImage *inMask, const char *name, int channel) {
+bool psphotVisualScaleImage (int kapaFD, psImage *inImage, psImage *inMask, const char *name, float factor, int channel) {
 
     KiiImage image;
@@ -239 +239 @@
     strcpy (data.name, name);
     strcpy (data.file, name);
-    data.zero = stats->robustMedian - stats->robustStdev;
-    data.range = 5*stats->robustStdev;
+    data.zero = stats->robustMedian - factor*stats->robustStdev;
+
+    // XXX I we have a smoothed image, this make a much-too-tight display range
+    data.range = 5*factor*stats->robustStdev;
     data.logflux = 0;
 
@@ -283 +285 @@
     if (kapa == -1) return false;
 
+    float factor = 1.0;
+    if (readout->covariance) {
+        factor = psImageCovarianceFactorForAperture(readout->covariance, 10.0);
+    }
+
     psphotVisualShowMask (kapa, readout->mask, "mask", 2);
-    psphotVisualScaleImage (kapa, readout->variance, readout->mask, "variance", 1);
-    psphotVisualScaleImage (kapa, readout->image, readout->mask, "image", 0);
+    psphotVisualScaleImage (kapa, readout->variance, readout->mask, "variance", 1.0, 1);
+    psphotVisualScaleImage (kapa, readout->image, readout->mask, "image", sqrt(factor), 0);
 
     pmVisualAskUser(NULL);
@@ -303 +310 @@
     pmReadout *backgnd = READOUT_OR_INTERNAL(view, file);
 
-    psphotVisualScaleImage (kapa, backgnd->image, readout->mask, "backgnd", 2);
-    psphotVisualScaleImage (kapa, readout->image, readout->mask, "backsub", 0);
+    float factor = 1.0;
+    if (readout->covariance) {
+        factor = psImageCovarianceFactorForAperture(readout->covariance, 10.0);
+    }
+
+    psphotVisualScaleImage (kapa, backgnd->image, readout->mask, "backgnd", 1.0, 2);
+    psphotVisualScaleImage (kapa, readout->image, readout->mask, "backsub", sqrt(factor), 0);
 
     pmVisualAskUser(NULL);
@@ -1221 +1233 @@
     }
 
-    psphotVisualScaleImage (myKapa, outsat, NULL, "satstar", 2);
+    psphotVisualScaleImage (myKapa, outsat, NULL, "satstar", 1.0, 2);
 
     pmVisualAskUser(NULL);
@@ -2490 +2502 @@
     if (myKapa == -1) return false;
 
+    float factor = 1.0;
+    if (readout->covariance) {
+        factor = psImageCovarianceFactorForAperture(readout->covariance, 10.0);
+    }
+
     if (reshow) {
         psphotVisualShowMask (myKapa, readout->mask, "mask", 2);
-        psphotVisualScaleImage (myKapa, readout->variance, readout->mask, "variance", 1);
-    }
-    psphotVisualScaleImage (myKapa, readout->image, readout->mask, "resid", 0);
+        psphotVisualScaleImage (myKapa, readout->variance, readout->mask, "variance", 1.0, 1);
+    }
+    psphotVisualScaleImage (myKapa, readout->image, readout->mask, "resid", sqrt(factor), 0);
 
     pmVisualAskUser(NULL);