Changeset 32129

Timestamp:

Aug 18, 2011, 6:38:43 PM (15 years ago)

Author:

mhuber

Message:

first test changes for convol choice

File:

• branches/meh_branches/ppsub_test/psModules/src/imcombine/pmSubtractionVisual.c (modified) (7 diffs)

branches/meh_branches/ppsub_test/psModules/src/imcombine/pmSubtractionVisual.c

@@ -77 +77 @@
 
     psImage *convKernels = pmSubtractionKernelsImageMosaic(kernels);
-    pmVisualScaleImage(kapa4, convKernels, "Convolution_Kernels", 0, true);
+    //MEH
+    //pmVisualScaleImage(kapa4, convKernels, "Convolution_Kernels", 0, true);
+    pmVisualNScaleImage(kapa4, convKernels, "Convolution_Kernels", 0, true, 5.0);
     pmVisualAskUser(&plotConvKernels);
     psFree(convKernels);
@@ -153 +155 @@
         stampNum++;
     }
-    pmVisualScaleImage(kapa1, canvas, "Subtraction_Stamps", 0, true);
+    //MEH - range can be from ref so large range by default then
+    //pmVisualScaleImage(kapa1, canvas, "Subtraction_Stamps", 0, true);
+    pmVisualNScaleImage(kapa1, canvas, "Subtraction_Stamps", 0, true, 0.1);
     psFree(canvas);
 
@@ -230 +234 @@
 
     psImage *canvas32 = pmVisualImageToFloat(canvas);
-    pmVisualScaleImage(kapa1, canvas32, "Least_Squares", 0, true);
+    //pmVisualScaleImage(kapa1, canvas32, "Least_Squares", 0, true);
+    //MEH - normalized to maxValue already
+    pmVisualNScaleImage(kapa1, canvas32, "Least_Squares", 0, true, 1.0);
 
     if (0) {
@@ -338 +344 @@
 
     psImage *canvas32 = pmVisualImageToFloat(canvas);
-    pmVisualRangeImage(kapa2, canvas32, "Least_Squares", 0, -100.0, 100.0);
+    //pmVisualRangeImage(kapa2, canvas32, "Least_Squares", 0, -100.0, 100.0);
+    //MEH
+    pmVisualRangeImage(kapa2, canvas32, "Least_Squares_Resid", 0, -100.0, 100.0);
 
     if (0) {
@@ -415 +423 @@
         // fprintf (stderr, "kernel %d, sum %f\n", i, sum);
     }                                                    
-        
-    pmVisualScaleImage(kapa1, output, "Image", 0, true);
+
+    //MEH
+    //pmVisualScaleImage(kapa1, output, "Image", 0, true);
+    pmVisualNScaleImage(kapa1, output, "Image", 0, true, 1.0);
     psFree(output);
     pmVisualAskUser(&plotImage);
@@ -561 +571 @@
 static bool plotStampLocations(pmSubtractionStampList *stamps, pmReadout *ro) {
 
-    if (!pmVisualScaleImage(kapa2, ro->image, "Stamp_master_image", 0, true)) {
+    //MEH
+  if (!pmVisualNScaleImage(kapa2, ro->image, "Stamp_master_image", 0, true, 0.5)) {  
+      //if (!pmVisualScaleImage(kapa2, ro->image, "Stamp_master_image", 0, true)) {
         fprintf(stderr, "Cannot display postage stamp master image. Skipping \n");
         return false;
@@ -831 +843 @@
     KiiEraseOverlay (kapa2, "red");
 
-    pmVisualShowImage(kapa1, targetImage, "Target", 0, -200.0, 400.0);
-    pmVisualShowImage(kapa1, sourceImage, "Source", 1, -200.0, 400.0);
-    pmVisualShowImage(kapa1, convolutionImage, "Convolution", 2, -200.0, 400.0);
+    //MEH
+    //pmVisualShowImage(kapa1, targetImage, "Target", 0, -200.0, 400.0);
+    pmVisualNScaleImage(kapa1, targetImage, "Target", 0, true, 0.1);
+    //pmVisualShowImage(kapa1, sourceImage, "Source", 1, -200.0, 400.0);
+    pmVisualNScaleImage(kapa1, sourceImage, "Source", 1, true, 0.1);
+    //pmVisualShowImage(kapa1, convolutionImage, "Convolution", 2, -200.0, 400.0);
+    pmVisualNScaleImage(kapa1, convolutionImage, "Convolution", 2, true, 2.0);
     KiiCenter (kapa1, 0.5*targetImage->numCols, 0.5*targetImage->numRows, 1);
 
-    pmVisualScaleImage(kapa2, fresidualImage, "Frac.Residual", 2, true);
-    pmVisualShowImage(kapa2, differenceImage, "Difference", 0, -200.0, 400.0);
-    pmVisualShowImage(kapa2, residualImage, "Residual", 1, -200.0, 400.0);
+    //pmVisualScaleImage(kapa2, fresidualImage, "Frac.Residual", 2, true);
+    pmVisualNScaleImage(kapa2, fresidualImage, "Frac.Residual", 2, true, 2.0);
+    //pmVisualShowImage(kapa2, differenceImage, "Difference", 0, -200.0, 400.0);
+    pmVisualNScaleImage(kapa2, differenceImage, "Difference", 0, true, 1.0);
+    //pmVisualShowImage(kapa2, residualImage, "Residual", 1, -200.0, 400.0);
+    pmVisualNScaleImage(kapa2, residualImage, "Residual", 1, true, 1.0);
     KiiCenter (kapa2, 0.5*residualImage->numCols, 0.5*residualImage->numRows, 1);