Changeset 27804

Timestamp:

Apr 29, 2010, 1:06:18 PM (16 years ago)

Author:

rhenders

Message:

Was STILL not catching 0.0 flux values. Fixed now.

File:

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

trunk/ippToPsps/src/ippToPspsBatchDetection.c

@@ -23 +23 @@
 
     //    printf("mag=%f\texpTime=%f\tzeroPoint=%f\tflux=%f\n", magnitude, exposureTime, zeroPoint, flux);
-    return (isfinite(*flux) && *flux > 0.0) ? true : false;
+    return (!isfinite(*flux) || *flux < 0.000001) ? false : true;
 }
 
@@ -287 +287 @@
                     obsTimes[s] = obsTime;
 
+                    ippToPsps_getFlux(zeroPoint, exposureTime, instMagErr[s], &instFluxErr[s]);
+
                     // check for invalid flux values (if not already labelled as a duplicate)
-                    if ((!ippToPsps_getFlux(zeroPoint, exposureTime, instMagErr[s], &instFluxErr[s]) ||
-                                !ippToPsps_getFlux(zeroPoint, exposureTime, peakMag[s], &peakFlux[s]) ||
+                    if ((!ippToPsps_getFlux(zeroPoint, exposureTime, peakMag[s], &peakFlux[s]) ||
                                 !ippToPsps_getFlux(zeroPoint, exposureTime, instMag[s], &instFlux[s])) && !isDuplicate) {
                         removeList[numOfDuplicates+numInvalidFlux] = s+1;
                         numInvalidFlux++;
-                    } 
+                    }
 
                     // store max/min objID