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

Timestamp:

Oct 1, 2010, 2:10:00 PM (16 years ago)

Author:

rhenders

Message:

Moved getFlux function to some place more general

File:

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

trunk/ippToPsps/src/ippToPspsBatchDetection.c

@@ -11 +11 @@
 #include "ippToPspsConfig.h"
 #include "ippToPspsDetEnums.h"
-#include "fitsio.h"
-
-// Gets uncalibrated instrumental flux from magnitude
-static __inline bool ippToPsps_getFlux(const float exposureTime, const float magnitude, float* flux, const float magnitudeErr, float* fluxErr) {
-
-    *flux = powf(10.0, -0.4*magnitude) / exposureTime;
-    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;
-}
 
 /**
@@ -37 +25 @@
     int status = 0;
     fitsfile *fitsIn;         
-    int nKeys;
 
     if (fits_open_file(&fitsIn, this->inputFiles[0], READONLY, &status)) {
@@ -46 +33 @@
 
     // get primary header and pull stuff out for later
+    int nKeys;
     fits_get_hdrspace(fitsIn, &nKeys, NULL, &status);