Changeset 29515 for branches/eam_branches/ipp-20100823/ippToPsps/src/ippToPspsBatchDetection.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/ippToPspsBatchDetection.c (modified) (8 diffs)

branches/eam_branches/ipp-20100823/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;
-}
 
 /**
@@ -35 +23 @@
 int ippToPsps_batchDetection(IppToPsps *this) {
 
-    if (this->numOfInputFiles < 1) return PS_EXIT_DATA_ERROR;
-
     int status = 0;
     fitsfile *fitsIn;         
-    int nKeys;
 
     if (fits_open_file(&fitsIn, this->inputFiles[0], READONLY, &status)) {
@@ -48 +33 @@
 
     // get primary header and pull stuff out for later
+    int nKeys;
     fits_get_hdrspace(fitsIn, &nKeys, NULL, &status);
 
@@ -65 +51 @@
 
     // 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);
     fits_write_col(this->fitsOut, TSTRING, FRAMEMETA_FRAMENAME, 1, 1, 1, &this->expName, &status);
 
-    int8_t surveyID = -1;
-    if (!ippToPspsConfig_getSurveyId(this->config, this->surveyType, &surveyID)) {return PS_EXIT_DATA_ERROR;}
-    fits_write_col(this->fitsOut, TBYTE, FRAMEMETA_SURVEYID, 1, 1, 1, &surveyID, &status);
+    fits_write_col(this->fitsOut, TBYTE, FRAMEMETA_SURVEYID, 1, 1, 1, &this->surveyID, &status);
 
     int8_t filterID = -1;
@@ -97 +81 @@
 
     // stuff for detections table
-    time_t now;
-    struct tm *ts;
-    char timeStr[12];
-    now = time(NULL);
-    ts = gmtime(&now); // TODO should be UTC
-    strftime(timeStr, sizeof(timeStr), "%Y-%m-%d", ts);
-
     uint32_t s,d, invalidDvoRows, smfJumps, unmatched, totalDetections = 0;
 
@@ -128 +105 @@
 
         filterIDs[s] = filterID;
-        surveyIDs[s] = surveyID;
-        strcpy(assocDate[s], timeStr);
+        surveyIDs[s] = this->surveyID;
+        strcpy(assocDate[s], this->todaysDate);
     }
 
@@ -192 +169 @@
 
             // create unique int from 'frameID' (aka exposure ID) and ccd number
-            pspsImageId = (this->expId*100) + image->ccdnum;
+            pspsImageId = (this->id*100) + image->ccdnum;
 
             // now get DVO detections
@@ -206 +183 @@
             imageFlags = (uint64_t)image->flags;
             fits_write_col(this->fitsOut, TLONGLONG, IMAGEMETA_IMAGEID, 1, 1, 1, &pspsImageId, &status);
-            fits_write_col(this->fitsOut, TLONG, IMAGEMETA_FRAMEID, 1, 1, 1, &this->expId, &status);
+            fits_write_col(this->fitsOut, TLONG, IMAGEMETA_FRAMEID, 1, 1, 1, &this->id, &status);
             fits_write_col(this->fitsOut, TSHORT, IMAGEMETA_CCDID, 1, 1, 1, &image->ccdnum, &status);
             fits_write_col(this->fitsOut, TLONG, IMAGEMETA_PHOTOCALID, 1, 1, 1, &image->photcode, &status);