Changeset 29515 for branches/eam_branches/ipp-20100823/ippToPsps/src/ippToPspsBatchTest.c

Timestamp:

Oct 21, 2010, 2:45:13 PM (16 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20100823/ippToPsps/src/ippToPspsBatchTest.c (modified) (3 diffs)

branches/eam_branches/ipp-20100823/ippToPsps/src/ippToPspsBatchTest.c

@@ -13 +13 @@
 #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;
-}
 
 /**
@@ -55 +45 @@
 
     // FrameMeta values
-//    fits_write_col(this->fitsOut, TLONG, FRAMEMETA_FRAMEID, 1, 1, 1, &this->expId, &status);
+//    fits_write_col(this->fitsOut, TLONG, FRAMEMETA_FRAMEID, 1, 1, 1, &this->id, &status);
 
     int8_t filterID = -1;
@@ -187 +177 @@
 
             // create unique int from 'frameID' (aka exposure ID) and ccd number
-            pspsImageId = (this->expId*100) + pImage->ccdnum;
+            pspsImageId = (this->id*100) + pImage->ccdnum;
 
             // now get DVO detections