Changeset 19986

Timestamp:

Oct 7, 2008, 6:22:05 PM (18 years ago)

Author:

eugene

Message:

skip regions without PSF clump

File:

• trunk/psphot/src/psphotRoughClass.c (modified) (3 diffs)

trunk/psphot/src/psphotRoughClass.c

@@ -28 +28 @@
             psRegion region = psRegionSet (ix*dX, (ix + 1)*dX, iy*dY, (iy + 1)*dY);
             if (!psphotRoughClassRegion (nRegion, &region, sources, recipe, havePSF)) {
-                psError (PSPHOT_ERR_UNKNOWN, false, "failed to determine rough classification for region %d (%f - %f : %f - %f)\n", 
-                         nRegion, region.x0, region.x1, region.y0, region.y1);
-                return false;
+                psLogMsg ("psphot", 4, "Failed to determine rough classification for region %f,%f - %f,%f\n", 
+                         region.x0, region.y0, region.x1, region.y1);
+                continue;
             }
             
@@ -77 +77 @@
     } else {
         // pull FWHM_X,Y from the recipe, use to define psfClump.X,Y
-        psfClump.X  = psMetadataLookupF32 (&status, regionMD, "PSF.CLUMP.X");   CHECK_STATUS (status, "PSF.CLUMP.X");
-        psfClump.Y  = psMetadataLookupF32 (&status, regionMD, "PSF.CLUMP.Y");   CHECK_STATUS (status, "PSF.CLUMP.Y");
-        psfClump.dX = psMetadataLookupF32 (&status, regionMD, "PSF.CLUMP.DX");  CHECK_STATUS (status, "PSF.CLUMP.DX");
-        psfClump.dY = psMetadataLookupF32 (&status, regionMD, "PSF.CLUMP.DY");  CHECK_STATUS (status, "PSF.CLUMP.DY");
+        psfClump.X  = psMetadataLookupF32 (&status, regionMD, "PSF.CLUMP.X"); 
+        if (!status) {
+            psLogMsg ("psphot", 4, "No PSF clump defined for region %f,%f - %f,%f\n", region->x0, region->y0, region->x1, region->y1);
+            return false;
+        }           
+        psfClump.Y  = psMetadataLookupF32 (&status, regionMD, "PSF.CLUMP.Y");   psAssert (status, "missing PSF.CLUMP.Y");
+        psfClump.dX = psMetadataLookupF32 (&status, regionMD, "PSF.CLUMP.DX");  psAssert (status, "missing PSF.CLUMP.DX");
+        psfClump.dY = psMetadataLookupF32 (&status, regionMD, "PSF.CLUMP.DY");  psAssert (status, "missing PSF.CLUMP.DY");
     }
 
@@ -88 +92 @@
     }
     if (!psfClump.X || !psfClump.Y) {
-        psError(PSPHOT_ERR_DATA, true, "Failed to find a valid PSF clump");
+        psLogMsg ("psphot", 4, "Failed to find a valid PSF clump for region %f,%f - %f,%f\n", region->x0, region->y0, region->x1, region->y1);
         return false;
     }