Changeset 26664 for trunk/ppbgrestore/src

Timestamp:

Jan 22, 2010, 4:54:06 AM (16 years ago)

Author:

bills

Message:

need to define the background image differently so that it gets a
separate fpa from the input work in progress

Location:

trunk/ppbgrestore/src

Files:

• ppbgrestoreCleanup.c (modified) (1 diff)
• ppbgrestoreLoop.c (modified) (3 diffs)
• ppbgrestoreParseCamera.c (modified) (1 diff)

trunk/ppbgrestore/src/ppbgrestoreCleanup.c

@@ -22 +22 @@
     // fprintf(stderr, "Found %d leaks at %s\n", psMemCheckLeaks (0, NULL, NULL, false), "ppImage");
 
-    fprintf(stderr, "Found %d leaks at %s\n", psMemCheckLeaks (0, NULL, stdout, false), "ppbgrestore");
+//    fprintf(stderr, "Found %d leaks at %s\n", psMemCheckLeaks (0, NULL, stdout, false), "ppbgrestore");
 
 }

trunk/ppbgrestore/src/ppbgrestoreLoop.c

@@ -104 +104 @@
             return false;
         }
-        pmReadout *backgroundRO = pmFPAviewThisReadout(&roView, background->fpa);
-//        pmReadout *backgroundRO = pmFPAfileDefineInternal (config->files, "PSPHOT.BACKGND", image->numCols, image->numRows, PS_TYPE_F32);
+        pmReadout *backgroundRO;
+#define USE_CELL
+#ifdef USE_CELL
+        pmCell *backgroundCell = pmFPAviewThisCell(&roView, background->fpa);
+        backgroundRO = pmReadoutAlloc(backgroundCell);
+#else
+        backgroundRO = pmFPAviewThisReadout(&roView, background->fpa);
+//        backgroundRO = pmFPAfileDefineInternal (config->files, "PSPHOT.BACKGND", image->numCols, image->numRows, PS_TYPE_F32);
+#endif
         backgroundRO->image = psImageAlloc(image->numCols, image->numRows, PS_TYPE_F32);
+        backgroundRO->data_exists = true;
+        backgroundRO->parent->data_exists = true;
+        backgroundRO->parent->parent->data_exists = true;
 
         // linear interpolation to full-scale
@@ -120 +130 @@
         int numCols = image->numCols, numRows = image->numRows; // Size of image
         long nancount = 0;
+        long naninputs = 0;
         long finitecount = 0;
         for (int y = 0; y < numRows; y++) {
@@ -140 +151 @@
                 } else if (isfinite(imageval)) {
                     // XXX: TODO:following ppImage we should not modify pixels that are masked.
-                    image->data.F32[y][x] += bgvalue;
-                }
+                    image->data.F32[y][x] = imageval + bgvalue;
+                } else {
+                    naninputs++;
+                }
             }
+        }
+        if (naninputs) {
+            printf("%ld infinite pixels found in input image\n", naninputs);
         }
         if (nancount) {

trunk/ppbgrestore/src/ppbgrestoreParseCamera.c

@@ -27 +27 @@
         return NULL;
     }
-    pmFPAfile *outBG = pmFPAfileDefineOutput(config, input->fpa, "PPBGRESTORE.BACKGROUND");
+    // pmFPAfile *outBG = pmFPAfileDefineOutput(config, NULL, "PPBGRESTORE.BACKGROUND");
+    pmFPAfile *outBG = pmFPAfileDefineFromFPA(config, input->fpa, 1, 1, "PPBGRESTORE.BACKGROUND");
     if (!outBG) {
         psError(PS_ERR_IO, false, _("Unable to generate bacgkround file from PPBGRESTORE.BACKGROUND"));