Changeset 28700

Timestamp:

Jul 22, 2010, 4:33:34 PM (16 years ago)

Author:

rhenders

Message:

Fixed problem with flux errors

File:

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

trunk/ippToPsps/src/ippToPspsBatchDetection.c

@@ -17 +17 @@
 
     *flux = powf(10.0, -0.4*magnitude) / exposureTime;
-    if (fluxErr) *fluxErr = (magnitudeErr * *flux)/1.085736;
-//if (fluxErr)    printf("Mag = %03.03f, Flux = %03.03f, Mag err = %03.03f, Flux Err = %03.03f\n", magnitude, *flux, magnitudeErr, *fluxErr);
-    return (!isfinite(*flux) || *flux < 0.000001) ? false : true;
+    if (!isfinite(*flux) || *flux < 0.000001) return false;
+    if (fluxErr) *fluxErr = fabsf((magnitudeErr * *flux)/1.085736);
+    //  if (fluxErr)    printf("Mag = %03.03f, Flux = %03.03f, Mag err = %03.03f, Flux Err = %03.03f\n", magnitude, *flux, magnitudeErr, *fluxErr);
+         
+    return true;
 }
 
@@ -294 +296 @@
                     obsTimes[s] = obsTime;
 
-//                    ippToPsps_getFlux(exposureTime, instMagErr[s], &instFluxErr[s]);
-
                     // calculate flux and flux errors from magnitudes
                     peakFluxOk = ippToPsps_getFlux(exposureTime, peakMag[s], &peakFlux[s], 0.0, NULL);