Changeset 33415 for branches/meh_branches/ppstack_test/psModules/src/imcombine/pmSubtractionStamps.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/imcombine/pmSubtractionStamps.c (modified) (10 diffs)

branches/meh_branches/ppstack_test/psModules/src/imcombine/pmSubtractionStamps.c

@@ -127 +127 @@
                 continue;
             }
+            //MEH hack to limit bright end test
+//            if ((image1 && image1->data.F32[y][x] > 2000) ||
+//                (image2 && image2->data.F32[y][x] > 2000 )) {
+//              fprintf (stderr, "%f,%f : thresh\n",image1->data.F32[y][x],image2->data.F32[y][x]);
+//                continue;
+//            }
 
             if (subMask && subMask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] &
@@ -188 +194 @@
 }
 
-void pmSubtractionStampPrint(FILE *ds9, float x, float y, float size, const char *color)
+// MEH adding text to ds9
+void pmSubtractionStampPrint(FILE *ds9, float x, float y, float size, const char *color, const char *ds9text)
 {
     if (!ds9regions || !ds9) {
@@ -196 +203 @@
     if (color && strlen(color) > 0) {
         fprintf(ds9, " # color=%s", color);
+    }
+    if (ds9text && strlen(ds9text) > 0) {
+        fprintf(ds9, " text={%s}", ds9text);
     }
     fprintf(ds9, "\n");
@@ -486 +496 @@
                                              normFrac, sysErr, skyErr);
     }
-
+    //MEH - stamps.dat will repeatedly be overwritten - out to trace may be btter -- see end for summary 
     // XXX TEST : dump all stars in the stamps here
-    if (0) {
+    if (1) {
         FILE *f = fopen ("stamp.dat", "w");
         for (int i = 0; i < stamps->num; i++) {
@@ -589 +599 @@
                 stamp->status = PM_SUBTRACTION_STAMP_FOUND;
                 numFound++;
-                psTrace("psModules.imcombine", 5, "Found stamp in subregion %d: %d,%d\n",
-                        i, (int)stamp->x, (int)stamp->y);
+//                psTrace("psModules.imcombine", 5, "Found stamp in subregion %d: %d,%d\n",
+//                        i, (int)stamp->x, (int)stamp->y);
+                //MEH adding int flux to say something about the source 
+                psTrace("psModules.imcombine", 5, "Found stamp in subregion %d: %d,%d  Flux: %d\n",
+                        i, (int)stamp->x, (int)stamp->y, (int)stamp->flux);
             } else {
                 stamp->status = PM_SUBTRACTION_STAMP_NONE;
@@ -666 +679 @@
             psTrace("psModules.imcombine", 9, "Rejecting input stamp (%d,%d) because outside region",
                     xPix, yPix);
-            pmSubtractionStampPrint(ds9, xPix, yPix, footprint, "red");
+            pmSubtractionStampPrint(ds9, xPix, yPix, footprint, "red", "");
             continue;
         }
-
+        //MEH - are all using -0.5? seen some seem shifted
         // fprintf (stderr, "stamp: %5.1f %5.1f == %d %d\n", xStamp, yStamp, xPix, yPix);
 
@@ -692 +705 @@
                 psTrace("psModules.imcombine", 9, "Putting input stamp (%d,%d) into subregion %d",
                         xPix, yPix, j);
-                pmSubtractionStampPrint(ds9, xPix, yPix, footprint, "green");
+                pmSubtractionStampPrint(ds9, xPix, yPix, footprint, "green", "");
             }
         }
@@ -699 +712 @@
             psTrace("psModules.imcombine", 9, "Unable to find subregion for stamp (%d,%d)",
                     xPix, yPix);
-            pmSubtractionStampPrint(ds9, xPix, yPix, footprint, "yellow");
+            pmSubtractionStampPrint(ds9, xPix, yPix, footprint, "yellow", "");
         }
     }
@@ -865 +878 @@
         }
     }
-
-#if 0
+//MEH
+#if 1
     {
         psFits *fits = NULL;
@@ -1156 +1169 @@
                 float sysErr = 0.25 * PS_SQR(stamps->sysErr); // Systematic error
                 float skyErr = stamps->skyErr;
+                //MEH - image2 not used if not adding to additional.. also these are never freed here, but upstream/downstream?
                 psKernel *image1 = stamp->image1, *image2 = stamp->image2; // Input images
+                //psKernel *image2 = stamp->image2; // Input images
                 for (int y = -size; y <= size; y++) {
                     for (int x = -size; x <= size; x++) {
+                        //MEH -- if conv to model then what does sys and weight mean for both?
+                        // w1+w2 vs 1/var1+1/var2.. depends on what the weight is for?
+                        // why additional ^2? 
                         float additional = image1->kernel[y][x] + image2->kernel[y][x];
-                        weight->kernel[y][x] = 1.0 / (skyErr + var->kernel[y][x] + sysErr * PS_SQR(additional));
+                        //float additional = image2->kernel[y][x];
+//                        weight->kernel[y][x] = 1.0 / (skyErr + var->kernel[y][x] + sysErr * PS_SQR(additional));
+                        weight->kernel[y][x] = 1.0 / (skyErr + 1000.0*var->kernel[y][x] + sysErr * PS_SQR(additional));
                     }
                 }
+                psLogMsg("psModules.imcombine", PS_LOG_DETAIL, "TESTING:: Stamp %d (%.1f,%.1f) weight: %f var: %.1f sysErr: %.2f im1: %.0f im2: %.0f \n", 
+                         i, stamp->x, stamp->y, weight->kernel[0][0],var->kernel[0][0],sysErr,image2->kernel[0][0],image1->kernel[0][0]);
+
             } else {
                 for (int y = -size; y <= size; y++) {
                     for (int x = -size; x <= size; x++) {
-                        weight->kernel[y][x] = 1.0 / var->kernel[y][x];
+//                        weight->kernel[y][x] = 1.0 / var->kernel[y][x];
+                        weight->kernel[y][x] = 1.0 / (1000.0*var->kernel[y][x]);
                     }
                 }