Changeset 28424

Timestamp:

Jun 22, 2010, 2:01:36 PM (16 years ago)

Author:

rhenders

Message:

Now storing image flags (as taken from DVO) in ImageMeta

File:

• trunk/ippToPsps/src/ippToPspsBatchDetection.c (modified) (6 diffs)

trunk/ippToPsps/src/ippToPspsBatchDetection.c

@@ -98 +98 @@
     int maxDvoDetId = -1;
     int numDvoDetections = -1;
-    Image *pImage = NULL;
+    Image *image = NULL;
 
     // stuff for detections table
@@ -151 +151 @@
     long maxObjID = LONG_MIN; 
     long minObjID = LONG_MAX;
+    uint64_t imageFlags;
     short nOta = 0;
     long i;
@@ -198 +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, 
@@ -207 +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
@@ -219 +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);
@@ -228 +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