Changeset 28003 for branches/pap/ippToPsps/src/ippToPspsBatchDetection.c

Timestamp:

May 18, 2010, 12:49:05 PM (16 years ago)

Author:

eugene

Message:

merging changes from trunk into branches/pap

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippToPsps/src/ippToPspsBatchDetection.c (modified) (12 diffs)

branches/pap/ippToPsps/src/ippToPspsBatchDetection.c

@@ -14 +14 @@
 
 // Gets flux from magnitude
-static __inline float ippToPsps_getFlux(const float zeroPoint, const float exposureTime, const float magnitude) {
+static __inline bool ippToPsps_getFlux(const float zeroPoint, const float exposureTime, const float magnitude, float* flux) {
 
     // use uncalibrated instrumental flux
-    float flux = powf(10.0, -0.4*magnitude) / exposureTime;
+    *flux = powf(10.0, -0.4*magnitude) / exposureTime;
 
     // use calibrated flux in Janskys, where 3631 Jy is the zero point flux for the filter: constant over all filters because we're using AB magnitudes
@@ -23 +23 @@
 
     //    printf("mag=%f\texpTime=%f\tzeroPoint=%f\tflux=%f\n", magnitude, exposureTime, zeroPoint, flux);
-    return isnormal(flux) ? flux : -999.0;
+    return (!isfinite(*flux) || *flux < 0.000001) ? false : true;
 }
 
@@ -151 +151 @@
     short nOta = 0;
     long i;
-    bool duplicate;
+    bool isDuplicate;
     uint32_t numOfDuplicates;
+    uint32_t numInvalidFlux;
     long numDetectionsOut;
-    long duplicateList[MAXDETECT];
+    long removeList[MAXDETECT];
     long thisObjId;
 
@@ -217 +218 @@
             fits_write_col(this->fitsOut, TLONG, IMAGEMETA_FRAMEID, 1, 1, 1, &this->expId, &status);
             fits_write_col(this->fitsOut, TSHORT, IMAGEMETA_CCDID, 1, 1, 1, &pImage->ccdnum, &status);
-            // fits_write_col(this->fitsOut, TLONG, IMAGEMETA_PHOTOCALID, 1, 1, 1, &pImage->photcode, &status); TODO
+            fits_write_col(this->fitsOut, TLONG, IMAGEMETA_PHOTOCALID, 1, 1, 1, &pImage->photcode, &status);
             fits_write_col(this->fitsOut, TBYTE, IMAGEMETA_FILTERID, 1, 1, 1, &filterID, &status);
             fits_write_col(this->fitsOut, TFLOAT, IMAGEMETA_PHOTOSCAT, 1, 1, 1, &zptObs, &status);
@@ -252 +253 @@
             // both DVO detections and smf detections should increment. however, there may be gaps in smf and 'invalid' rows in dvo
             numOfDuplicates = 0;
+            numInvalidFlux = 0;
             for (long s = 0; s<nDet; s++) {
+
+                isDuplicate = false;
 
                 // count jumps in smf file
@@ -266 +270 @@
 
                     // TODO HACK duplicates bug - don't include any duplicates
-                    duplicate = false;
                     thisObjId = dvoDetections[d].ave.extID;
                     for (i=0; i<totalDetections; i++) {
                         if (thisObjId == objID[i]) {
-                            duplicate = true;
-                            duplicateList[numOfDuplicates] = s+1;
+                            removeList[numOfDuplicates+numInvalidFlux] = s+1;
                             numOfDuplicates++;
+                            isDuplicate=true;
                             break;
                         }
@@ -283 +286 @@
                     imageID[s] = pspsImageId;
                     obsTimes[s] = obsTime;
-                    instFlux[s] = ippToPsps_getFlux(zeroPoint, exposureTime, instMag[s]);
-                    instFluxErr[s] = ippToPsps_getFlux(zeroPoint, exposureTime, instMagErr[s]);
-                    peakFlux[s] = ippToPsps_getFlux(zeroPoint, exposureTime, peakMag[s]);
+
+                    ippToPsps_getFlux(zeroPoint, exposureTime, instMagErr[s], &instFluxErr[s]);
+
+                    // check for invalid flux values (if not already labelled as a duplicate)
+                    if ((!ippToPsps_getFlux(zeroPoint, exposureTime, peakMag[s], &peakFlux[s]) ||
+                                !ippToPsps_getFlux(zeroPoint, exposureTime, instMag[s], &instFlux[s])) && !isDuplicate) {
+                        removeList[numOfDuplicates+numInvalidFlux] = s+1;
+                        numInvalidFlux++;
+                    }
 
                     // store max/min objID
@@ -304 +313 @@
 
             // write number of rows (detections) to ImageMeta
-            numDetectionsOut = totalDetections - numOfDuplicates;
-            fits_write_col(this->fitsOut, TLONG, 10, 1, 1, 1, &numDetectionsOut, &status);
+            numDetectionsOut = totalDetections - numOfDuplicates - numInvalidFlux;
+            fits_write_col(this->fitsOut, TLONG, IMAGEMETA_NDETECT, 1, 1, 1, &numDetectionsOut, &status);
 
             // detections
@@ -321 +330 @@
             fits_write_col(this->fitsOut, TFLOAT, DETECTION_PEAKADU, 1, 1, nDet, peakFlux, &status);
             fits_write_col(this->fitsOut, TSTRING, DETECTION_ASSOCDATE, 1, 1, nDet, assocDate, &status); 
-            if (numOfDuplicates) fits_delete_rowlist(this->fitsOut, duplicateList, numOfDuplicates, &status);
+            if (numOfDuplicates||numInvalidFlux) fits_delete_rowlist(this->fitsOut, removeList, numOfDuplicates+numInvalidFlux, &status);
 
             // skinny object
@@ -327 +336 @@
             fits_write_col(this->fitsOut, TLONGLONG, SKINNYOBJECT_OBJID, 1, 1, nDet, objID, &status);
             fits_write_col(this->fitsOut, TLONGLONG, SKINNYOBJECT_IPPOBJID, 1, 1, nDet, ippObjID, &status);
-            if (numOfDuplicates) fits_delete_rowlist(this->fitsOut, duplicateList, numOfDuplicates, &status);
+            if (numOfDuplicates||numInvalidFlux) fits_delete_rowlist(this->fitsOut, removeList, numOfDuplicates+numInvalidFlux, &status);
 
             // object calibration color
@@ -334 +343 @@
             fits_write_col(this->fitsOut, TLONGLONG, OBJECTCALCOLOR_IPPOBJID, 1, 1, nDet, ippObjID, &status);
             fits_write_col(this->fitsOut, TBYTE, OBJECTCALCOLOR_FILTERID, 1, 1, nDet, filterIDs, &status);
-            if (numOfDuplicates) fits_delete_rowlist(this->fitsOut, duplicateList, numOfDuplicates, &status);
+            if (numOfDuplicates||numInvalidFlux) fits_delete_rowlist(this->fitsOut, removeList, numOfDuplicates+numInvalidFlux, &status);
 
             psLogMsg("ippToPsps", PS_LOG_INFO,
-                    " ___________________________________________________________________\n"
-                    "| Extension | Rows in | Rows out | Missing from DVO | Duplicate IDs |\n"
-                    "|  %s |  %5ld  |   %5ld  |      %5d       |    %5d      |\n",
-                    extensionName, nDet, numDetectionsOut, unmatched, numOfDuplicates);
+                    "+-----------+---------+----------+------------------+---------------+--------------+\n"
+                    "| Extension | Rows in | Rows out | Missing from DVO | Duplicate IDs | Invalid Flux |\n"
+                    "|  %s |  %5ld  |   %5ld  |      %5d       |    %5d      |    %5d     |\n",
+                    extensionName, nDet, numDetectionsOut, unmatched, numOfDuplicates, numInvalidFlux);
 
             if (dvoDetections!= NULL) dvoFree(dvoDetections);
@@ -353 +362 @@
     status=0; 
     if (fits_movnam_hdu(this->fitsOut, BINARY_TBL, "FrameMeta", 0, &status))
-            psError(PS_ERR_IO, false, "Can't move back to FrameMeta extension to write number of OTAs\n");
+        psError(PS_ERR_IO, false, "Can't move back to FrameMeta extension to write number of OTAs\n");
     else 
         fits_write_col(this->fitsOut, TSHORT, FRAMEMETA_NOTA, 1, 1, 1, &nOta, &status);