Changeset 28439 for branches/eam_branches/ipp-20100621/ippToPsps/src/ippToPspsBatchDetection.c

Timestamp:

Jun 23, 2010, 2:29:49 PM (16 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20100621/ippToPsps/src/ippToPspsBatchDetection.c (modified) (10 diffs)

branches/eam_branches/ipp-20100621/ippToPsps/src/ippToPspsBatchDetection.c

@@ -13 +13 @@
 #include "fitsio.h"
 
-// Gets flux from magnitude
+// Gets uncalibrated instrumental flux from magnitude
 static __inline bool ippToPsps_getFlux(const float zeroPoint, const float exposureTime, const float magnitude, float* flux) {
 
-    // use uncalibrated instrumental flux
     *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
-    //float flux = 3631 * powf(10.0, -0.4*(magnitude + zeroPoint)) / exposureTime;
-
-    //    printf("mag=%f\texpTime=%f\tzeroPoint=%f\tflux=%f\n", magnitude, exposureTime, zeroPoint, flux);
     return (!isfinite(*flux) || *flux < 0.000001) ? false : true;
 }
@@ -104 +98 @@
     int maxDvoDetId = -1;
     int numDvoDetections = -1;
-    Image *pImage = NULL;
+    Image *image = NULL;
 
     // stuff for detections table
@@ -157 +151 @@
     long maxObjID = LONG_MIN; 
     long minObjID = LONG_MAX;
+    uint64_t imageFlags;
     short nOta = 0;
     long i;
@@ -163 +158 @@
     uint32_t numInvalidFlux;
     long numDetectionsOut;
+    long totalDetectionsOut = 0;
     long removeList[MAXDETECT];
     long thisObjId;
@@ -203 +199 @@
 
             // access DVO database
-            skylist = dvoSkyListByExternID(this->dvoConfig, sourceId, imageId, &pImage);
+            skylist = dvoSkyListByExternID(this->dvoConfig, sourceId, imageId, &image);
             if (skylist == NULL) {
                 psError(PS_ERR_IO, false, 
@@ -212 +208 @@
 
             // create unique int from 'frameID' (aka exposure ID) and ccd number
-            pspsImageId = (this->expId*100) + pImage->ccdnum;
+            pspsImageId = (this->expId*100) + image->ccdnum;
 
             // now get DVO detections
             dvoDetections = NULL;
-            numDvoDetections = dvoGetDetections(skylist, pImage->imageID, &dvoDetections, &maxDvoDetId);
+            numDvoDetections = dvoGetDetections(skylist, image->imageID, &dvoDetections, &maxDvoDetId);
 
             // TODO check nDet < MAXDETECT
@@ -224 +220 @@
             psfFwhm = (fwhmMaj+fwhmMin)/2;
             momentFwhm = (momentMaj+momentMin)/2;
+            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, TSHORT, IMAGEMETA_CCDID, 1, 1, 1, &pImage->ccdnum, &status);
-            fits_write_col(this->fitsOut, TLONG, IMAGEMETA_PHOTOCALID, 1, 1, 1, &pImage->photcode, &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);
             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);
@@ -233 +230 @@
             fits_write_col(this->fitsOut, TFLOAT, IMAGEMETA_MOMENTFWHM, 1, 1, 1, &momentFwhm, &status);
             fits_write_col(this->fitsOut, TFLOAT, IMAGEMETA_PHOTOZERO, 1, 1, 1, &zptObs, &status);
+            fits_write_col(this->fitsOut, TLONGLONG, IMAGEMETA_QAFLAGS, 1, 1, 1, &imageFlags, &status);
 
             // now move BACK to detections table in smf
@@ -365 +363 @@
                     extensionName, nDet, numDetectionsOut, unmatched, numOfDuplicates, numInvalidFlux);
 
+            totalDetectionsOut += numDetectionsOut;
+
             if (dvoDetections!= NULL) dvoFree(dvoDetections);
             SkyListFree(skylist);
         }
     }
+
+    psLogMsg("ippToPsps", PS_LOG_INFO, "Total detections for this exposure = %ld\n", totalDetectionsOut);
 
     for (uint32_t i=0; i<MAXDETECT;i++) free(assocDate[i]);
@@ -390 +392 @@
         if (fprintf(this->resultsFile, "%ld\n", maxObjID) < 1 ) 
             psError(PS_ERR_IO, false, "Unable to write max Object ID to'%s'\n", this->resultsPath);
+        if (fprintf(this->resultsFile, "%ld\n", totalDetectionsOut) < 1 ) 
+            psError(PS_ERR_IO, false, "Unable to write totalDetectionsOut to'%s'\n", this->resultsPath);
     }