Changeset 6621

Timestamp:

Mar 16, 2006, 4:15:36 PM (20 years ago)

Author:

Paul Price

Message:

Moving psRegionIsBad out into psLib.

File:

• branches/rel10_ifa/psModules/src/astrom/pmFPARead.c (modified) (6 diffs)

branches/rel10_ifa/psModules/src/astrom/pmFPARead.c

@@ -7 +7 @@
 #include "pmFPARead.h"
 #include "pmConcepts.h"
+#include "psRegionIsBad.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -137 +138 @@
 #endif
 
-static bool badRegion(const psRegion *region)
-{
-    return isnan(region->x0) || isnan(region->x1) || isnan(region->y0) || isnan(region->y1);
-}
-
 // Carve a readout from the image pixels
 static pmReadout *readoutCarve(pmCell *cell, // Cell into which the new readout will be placed
@@ -152 +148 @@
 
     // The image corresponding to the trim region
-    if (badRegion(trimsec)) {
+    if (psRegionIsBad(*trimsec)) {
         psString regionString = psRegionToString(*trimsec);
         psError(PS_ERR_IO, true, "Invalid trim section: %s\n", regionString);
@@ -165 +161 @@
     psRegion *biassec = NULL;       // A BIASSEC region from the list
     while ((biassec = psListGetAndIncrement(iter))) {
-        if (badRegion(trimsec)) {
+        if (psRegionIsBad(*biassec)) {
             psString regionString = psRegionToString(*biassec);
             psError(PS_ERR_IO, true, "Invalid bias section: %s\n", regionString);
@@ -268 +264 @@
 }
 
+
+#if 0
+// Don't know that we need these
+
 // Read the PHU into the nominated HDU
 static bool readPHU(pmHDU *hdu,         // HDU to read into
@@ -310 +310 @@
     return readPHU(fpa->hdu, fits);
 }
-
+#endif