Changeset 27778 for trunk/ippToPsps/src/ippToPspsBatchDetection.c

Timestamp:

Apr 26, 2010, 3:52:55 PM (16 years ago)

Author:

rhenders

Message:

isnormal already checks for value==0; now filtering out all dodgy flux values

File:

• trunk/ippToPsps/src/ippToPspsBatchDetection.c (modified) (3 diffs)

trunk/ippToPsps/src/ippToPspsBatchDetection.c

@@ -23 +23 @@
 
     //    printf("mag=%f\texpTime=%f\tzeroPoint=%f\tflux=%f\n", magnitude, exposureTime, zeroPoint, flux);
-    return (isnormal(*flux) && *flux > 0.0) ? true : false;
+    return (isnormal(*flux)) ? true : false;
 }
 
@@ -286 +286 @@
                     imageID[s] = pspsImageId;
                     obsTimes[s] = obsTime;
-                    ippToPsps_getFlux(zeroPoint, exposureTime, instMagErr[s], &instFluxErr[s]);
-                    ippToPsps_getFlux(zeroPoint, exposureTime, peakMag[s], &peakFlux[s]);
 
                     // check for invalid flux values (if not already labelled as a duplicate)
-                    if (!ippToPsps_getFlux(zeroPoint, exposureTime, instMag[s], &instFlux[s]) && !isDuplicate) {
+                    if ((!ippToPsps_getFlux(zeroPoint, exposureTime, instMagErr[s], &instFluxErr[s]) ||
+                                !ippToPsps_getFlux(zeroPoint, exposureTime, peakMag[s], &peakFlux[s]) ||
+                                !ippToPsps_getFlux(zeroPoint, exposureTime, instMag[s], &instFlux[s])) && !isDuplicate) {
                         removeList[numOfDuplicates+numInvalidFlux] = s+1;
                         numInvalidFlux++;
@@ -361 +361 @@
     status=0; 
     if (fits_movnam_hdu(this->fitsOut, BINARY_TBL, "FrameMeta", 0, &status))
-            psError(PS_ERR_IO, false, "Can't move back to FrameMeta extension to write number of OTAs\n");
+        psError(PS_ERR_IO, false, "Can't move back to FrameMeta extension to write number of OTAs\n");
     else 
         fits_write_col(this->fitsOut, TSHORT, FRAMEMETA_NOTA, 1, 1, 1, &nOta, &status);