Changeset 33445

Timestamp:

Mar 8, 2012, 4:02:53 PM (14 years ago)

Author:

bills

Message:

Fix a couple of psphotStack bugs

Location:

tags/ipp-20120216

Files:

• psModules/src/objects (modified) (1 prop)
• psModules/src/objects/pmPCMdata.c (modified) (1 diff)
• psModules/src/objects/pmSourceIO.c (modified) (1 diff)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotMergeSources.c (modified) (2 diffs)
• psphot/src/psphotStackImageLoop.c (modified) (1 prop)

tags/ipp-20120216/psModules/src/objects/pmPCMdata.c

@@ -136 +136 @@
             sum += value;
         }
+    }
+
+    if (!(sum > 0.0)) {
+        // Crazy PSF image print out some debugging information ...
+        fprintf(stderr, "invalid kernel sum %f found by pmPCMkernelFromPSF\n", sum);    for (int j = psf->yMin; j <= psf->yMax; j++) {
+            fprintf(stderr, "Row %d\n", j);
+            for (int i = psf->xMin; i <= psf->xMax; i++) {
+                double value = source->psfImage->data.F32[y0 + j][x0 + i];
+                fprintf(stderr, "  %d %f\n", i, value);
+            }
+        }
+        fflush(stderr);
+        // ... but avoid the asssertion two lines down by escaping
+        goto escape;
     }
     assert (sum > 0.0);

tags/ipp-20120216/psModules/src/objects/pmSourceIO.c

@@ -1069 +1069 @@
                 for (long i = sources->n -1; i >= 0; i--) {
                     pmSource *source = sources->data[i];
+                    if (source->seq < 0) {
+                        // This can happen cmf files that have been corrupted
+                        psError(PS_ERR_IO, true, "seq < 0 for source %ld in %s", i, file->origname);
+                        return false;
+                    }
                     if (source->seq > seq_max) {
                         seq_max = source->seq;

tags/ipp-20120216/psphot/src/psphotMergeSources.c

@@ -677 +677 @@
       if (sourceOut->modelPSF) {
         pmSourceRedefinePixels (sourceOut, readoutOut, sourceOut->peak->x, sourceOut->peak->y, sourceOut->modelPSF->fitRadius);
-      }
+      } else {
+        // if we have no pixels we can't use it to determine the psf so make sure this bit is off
+        sourceOut->tmpFlags &= ~PM_SOURCE_TMPF_CANDIDATE_PSFSTAR;
+       }
 
       // child sources have not been subtracted in this image, but this flag may be raised if
@@ -900 +903 @@
             // allocate image, weight, mask for the new image for each peak
             if (sourceOut->modelPSF) {
-              pmSourceRedefinePixels (sourceOut, readout, sourceOut->peak->x, sourceOut->peak->y, sourceOut->modelPSF->fitRadius);
-            }
+                pmSourceRedefinePixels (sourceOut, readout, sourceOut->peak->x, sourceOut->peak->y, 
+                                                                        sourceOut->modelPSF->fitRadius);
+            } else {
+                // if we have no pixels we can't use it to determine the psf so make sure this bit is off
+                sourceOut->tmpFlags &= ~PM_SOURCE_TMPF_CANDIDATE_PSFSTAR;
+            }
 
             // child sources have not been subtracted in this image, but this flag may be raised if