Changeset 28662

Timestamp:

Jul 12, 2010, 4:48:07 PM (16 years ago)

Author:

rhenders

Message:

Added image and detection flags to Jim's test batch

Location:

trunk/ippToPsps

Files:

• config/test/tables.xml (modified) (2 diffs)
• src/ippToPspsBatchTest.c (modified) (7 diffs)
• src/ippToPspsTestEnums.h (modified) (2 diffs)

trunk/ippToPsps/config/test/tables.xml

@@ -61 +61 @@
     <column name="dapResid" type="TFLOAT" default="-999" comment="scatter of aperture corrections"></column>
     <column name="photoZero" type="TFLOAT" default="-999" comment=" local derived photometric zero point (unit = mag)"></column>
+    <column name="qaFlags" type="TLONGLONG" default="-999" comment="Q/A flags for this OTA"></column>
     <column name="ctype1" type="TSTRING" default=" " comment="name of astrometric projection in RA"></column>
     <column name="ctype2" type="TSTRING" default=" " comment="name of astrometric projection in DEC"></column>
@@ -108 +109 @@
     <column name="psfTheta" type="TFLOAT" default="-999" comment=" model PSF orientation angle (unit = deg)"></column>
     <column name="psfCf" type="TFLOAT" default="-999" comment="PSF coverage factor"></column>
+    <column name="infoFlag" type="TLONGLONG" default="-999" comment="flag indicating provenance information"></column>
     <column name="sky" type="TFLOAT" default="-999" comment=" PSF sky level at source (unit = adu)"></column>
     <column name="skyErr" type="TFLOAT" default="-999" comment=" estimated error in sky (unit = adu)"></column>

trunk/ippToPsps/src/ippToPspsBatchTest.c

@@ -107 +107 @@
     float instMagErr[MAXDETECT];
     float peakMag[MAXDETECT];
+    uint64_t flags[MAXDETECT];
     long objID[MAXDETECT];
     long detectID[MAXDETECT];
@@ -130 +131 @@
     long maxObjID = LONG_MIN; 
     long minObjID = LONG_MAX;
+    uint64_t imageFlags;
     short nOta = 0;
     long i;
@@ -142 +144 @@
 
     // loop round all 60 chips
-    for (int x=3; x<4; x++) {
-        for (int y=3; y<4; y++) {
+    for (int x=0; x<8; x++) {
+        for (int y=0; y<8; y++) {
 
             // dodge the corners
@@ -199 +201 @@
             psfFwhm = (fwhmMaj+fwhmMin)/2;
             momentFwhm = (momentMaj+momentMin)/2;
+            imageFlags = (uint64_t)pImage->flags;
             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);
@@ -204 +207 @@
             fits_write_col(this->fitsOut, TFLOAT, IMAGEMETA_PSFFWHM, 1, 1, 1, &psfFwhm, &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
@@ -279 +283 @@
                     ippObjID[s] = (uint64_t)dvoDetections[d].ave.catID*1000000000 + (uint64_t)dvoDetections[d].ave.objID;
                     ippDetectID[s] = dvoDetections[d].meas.detID;
+                    flags[s] = ((uint64_t)dvoDetections[d].meas.dbFlags << 32) | (uint64_t)dvoDetections[d].meas.photFlags;
                     imageID[s] = pspsImageId;
                     obsTimes[s] = obsTime;
@@ -321 +326 @@
             fits_write_col(this->fitsOut, TFLOAT, DETECTION_INSTFLUXERR, 1, 1, nDet, instFluxErr, &status);
             fits_write_col(this->fitsOut, TFLOAT, DETECTION_PEAKADU, 1, 1, nDet, peakFlux, &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);
 

trunk/ippToPsps/src/ippToPspsTestEnums.h

@@ -61 +61 @@
   IMAGEMETA_DAPRESID,
   IMAGEMETA_PHOTOZERO,
+  IMAGEMETA_QAFLAGS,
   IMAGEMETA_CTYPE1,
   IMAGEMETA_CTYPE2,
@@ -107 +108 @@
   DETECTION_PSFTHETA,
   DETECTION_PSFCF,
+  DETECTION_INFOFLAG,
   DETECTION_SKY,
   DETECTION_SKYERR,