Changeset 29294

Timestamp:

Oct 1, 2010, 2:09:14 PM (16 years ago)

Author:

rhenders

Message:

Fixed bug reporting no input files incorrectly; put getFlux function here for general use

File:

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

trunk/ippToPsps/src/ippToPsps.c

@@ -24 +24 @@
 extern int ippToPsps_batchDifference(IppToPsps *data);
 
+// Gets uncalibrated instrumental flux from magnitude
+__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;
+}
+
 // Destructor
 static void ippToPsps_Destructor(IppToPsps* this) {
@@ -55 +66 @@
     // save XML document for results
     if (this->resultsXmlDoc) {
-    
+
         xmlSaveFormatFileEnc(this->resultsPath, this->resultsXmlDoc, "UTF-8", 1);
 
@@ -215 +226 @@
             this->batchType == BATCH_STACK ||
             this->batchType == BATCH_DIFFERENCE ) {
-    
-        if (this->numOfInputFiles < 1) this->exitCode = PS_EXIT_DATA_ERROR;
-        psError(PS_ERR_UNKNOWN, false, "No input files for this batch");
+
+        if (this->numOfInputFiles < 1) {
+
+            this->exitCode = PS_EXIT_DATA_ERROR;
+            psError(PS_ERR_UNKNOWN, false, "No input files for this batch");
+        }
 
     }