Changeset 28164 for branches/czw_branch/20100519/ippToPsps/src/ippToPspsBatchDetection.c

Timestamp:

May 28, 2010, 3:09:59 PM (16 years ago)

Author:

watersc1

Message:

JPEG work should be done. Transitioning to try to pick up stackAssociation concept in this branch as well.

Location:

branches/czw_branch/20100519

Files:

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

branches/czw_branch/20100519/ippToPsps/src/ippToPspsBatchDetection.c

@@ -124 +124 @@
     float instMagErr[MAXDETECT];
     float peakMag[MAXDETECT];
+    uint64_t flags[MAXDETECT];
     long objID[MAXDETECT];
     long detectID[MAXDETECT];
@@ -284 +285 @@
                     ippObjID[s] = (uint64_t)dvoDetections[d].ave.catID*1000000000 + (uint64_t)dvoDetections[d].ave.objID;
                     ippDetectID[s] = dvoDetections[d].meas.detID;
+                    
+                    // the 'photFlags' are the same as those in the 'FLAGS' column of the smf
+                    flags[s] = ((uint64_t)dvoDetections[d].meas.dbFlags << 32) | (uint64_t)dvoDetections[d].meas.photFlags; 
                     imageID[s] = pspsImageId;
                     obsTimes[s] = obsTime;
@@ -330 +334 @@
             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); 
+            fits_write_col(this->fitsOut, TLONGLONG, DETECTION_INFOFLAG, 1, 1, nDet, flags, &status); 
             if (numOfDuplicates||numInvalidFlux) fits_delete_rowlist(this->fitsOut, removeList, numOfDuplicates+numInvalidFlux, &status);